Merge commit 'Dieterbe/experimental' into experimental

[uzbl-mobile] / uzbl.h

diff --git a/uzbl.h b/uzbl.h
index 2e7ccf9..27293f9 100644 (file)
--- a/uzbl.h
+++ b/uzbl.h
@@ -67,6 +67,7 @@ typedef struct {
 /* gui elements */
 typedef struct {
     GtkWidget*     main_window;
+    GtkPlug*       plug;
     GtkWidget*     scrolled_win;
     GtkWidget*     vbox;
     GtkWidget*     mainbar;
@@ -102,7 +103,8 @@ typedef struct {
 typedef struct {
     gchar    *uri;
     gchar    *config_file;
-    char    *instance_name;
+    int      socket_id;
+    char     *instance_name;
     gchar    *selected_url;
     gchar    *executable_path;
     GString* keycmd;
@@ -386,6 +388,9 @@ create_mainbar ();
 static
 GtkWidget* create_window ();
 
+static
+GtkPlug* create_plug ();
+
 static void
 run_handler (const gchar *act, const gchar *args);