diff options
| author |  keis <keijser@gmail.com> | 2011-01-17 20:50:20 +0100 |
|---|---|---|
| committer | keis <keijser@gmail.com> | 2011-01-17 21:08:06 +0100 |
| commit | e8814adcd1835d6faa0ad166ba1bf2aaf64bb5e0 (patch) | |
| tree | 1d491e1b7ea11738dc757eaff751abbbe9312a1b /src/uzbl-core.h | |
| parent | 15c83d8a85a150f46e80f7fc97041f10a43a96df (diff) | |
| parent | 835f5d8d09b429a4776192dbe00be5ae20704b16 (diff) | |
Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into intcookies
Conflicts:
Makefile
Diffstat (limited to 'src/uzbl-core.h')
| -rw-r--r-- | src/uzbl-core.h | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/uzbl-core.h b/src/uzbl-core.h index 14f03a6..b94b2b0 100644 --- a/src/uzbl-core.h +++ b/src/uzbl-core.h @@ -51,8 +51,12 @@ typedef struct { GtkPlug* plug; GtkWidget* scrolled_win; GtkWidget* vbox; + + /* Mainbar */ GtkWidget* mainbar; - GtkWidget* mainbar_label; + GtkWidget* mainbar_label_left; + GtkWidget* mainbar_label_right; + GtkScrollbar* scbar_v; // Horizontal and Vertical Scrollbar GtkScrollbar* scbar_h; // (These are still hidden) GtkAdjustment* bar_v; // Information about document length @@ -111,6 +115,7 @@ typedef struct { SoupLogger *soup_logger; char *proxy_url; char *useragent; + char *accept_languages; gint max_conns; gint max_conns_host; } Network; @@ -118,10 +123,15 @@ typedef struct { /* behaviour */ typedef struct { + /* Status bar */ gchar* status_format; + gchar* status_format_right; + gchar* status_background; + + /* Window title */ gchar* title_format_short; gchar* title_format_long; - gchar* status_background; + gchar* fifo_dir; gchar* socket_dir; gchar* authentication_handler; @@ -259,8 +269,8 @@ void close_uzbl (WebKitWebView *page, GArray *argv, GString *result); gboolean -run_command(const gchar *command, const guint npre, - const gchar **args, const gboolean sync, char **output_stdout); +run_command(const gchar *command, const gchar **args, const gboolean sync, + char **output_stdout); void spawn_async(WebKitWebView *web_view, GArray *argv, GString *result); @@ -397,6 +407,9 @@ void retrieve_geometry(); void +set_webview_scroll_adjustments(); + +void event(WebKitWebView *page, GArray *argv, GString *result); void |