Merge commit 'Dieterbe/experimental' into experimental

Conflicts:
	uzbl.c

6 files changed, 26 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 544bc76..2fef569 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,7 @@ install:
 	cp -ax docs     $(PREFIX)/share/uzbl/
 	cp -ax config.h $(PREFIX)/share/uzbl/docs/
 	cp -ax examples $(PREFIX)/share/uzbl/
+	cp -ax uzbl.png $(PREFIX)/share/uzbl/
 	install -D -m644 AUTHORS $(PREFIX)/share/uzbl/docs
 	install -D -m644 README  $(PREFIX)/share/uzbl/docs
 
diff --git a/examples/configs/sampleconfig b/examples/configs/sampleconfig
index 5daa21c..736b49f 100644
--- a/examples/configs/sampleconfig
+++ b/examples/configs/sampleconfig
@@ -119,6 +119,7 @@ bind    fl* = script /usr/share/uzbl/examples/scripts/follow_Numbers.js %s
 # using strings, not polished yet:
 bind    fL* = script /usr/share/uzbl/examples/scripts/follow_Numbers_Strings.js %s
 
+set icon = /usr/share/uzbl/uzbl.png
 
 # "home" page if you will
 set uri = uzbl.org
diff --git a/examples/configs/sampleconfig-dev b/examples/configs/sampleconfig-dev
index 03310b4..0aa0985 100644
--- a/examples/configs/sampleconfig-dev
+++ b/examples/configs/sampleconfig-dev
@@ -171,5 +171,7 @@ bind    fL* = script ./examples/scripts/follow_Numbers_Strings.js %s
 # you can use this to disable all plugins
 set disable_plugins = 0
 
+set icon = ./uzbl.png
+
 # "home" page if you will
 set uri = uzbl.org
diff --git a/uzbl.c b/uzbl.c
index 3ced48a..a18c7d5 100644
--- a/uzbl.c
+++ b/uzbl.c
@@ -116,6 +116,7 @@ const struct {
     { "command_indicator",   PTR(uzbl.behave.cmd_indicator,       STR,  1,   update_title)},
     { "title_format_long",   PTR(uzbl.behave.title_format_long,   STR,  1,   update_title)},
     { "title_format_short",  PTR(uzbl.behave.title_format_short,  STR,  1,   update_title)},
+    { "icon",                PTR(uzbl.gui.icon,                   STR,  1,   set_icon)},
     { "insert_mode",         PTR(uzbl.behave.insert_mode,         INT,  1,   NULL)},
     { "always_insert_mode",  PTR(uzbl.behave.always_insert_mode,  INT,  1,   cmd_always_insert_mode)},
     { "reset_command_mode",  PTR(uzbl.behave.reset_command_mode,  INT,  1,   NULL)},
@@ -1314,6 +1315,16 @@ set_proxy_url() {
 }
 
 static void
+set_icon() {
+    if(file_exists(uzbl.gui.icon)) {
+        gtk_window_set_icon_from_file (GTK_WINDOW (uzbl.gui.main_window), uzbl.gui.icon, NULL);
+    } else {
+        g_printerr ("Icon \"%s\" not found. ignoring.\n", uzbl.gui.icon);
+    }
+    g_free (uzbl.gui.icon);
+}
+
+static void
 cmd_load_uri() {
     GArray *a = g_array_new (TRUE, FALSE, sizeof(gchar*));
     g_array_append_val (a, uzbl.state.uri);
@@ -2185,8 +2196,7 @@ static gchar*
 get_xdg_var (XDG_Var xdg) {
     const gchar* actual_value = getenv (xdg.environmental);
     const gchar* home         = getenv ("HOME");
-
-    gchar* return_value = str_replace ("~", home, actual_value);
+    gchar* return_value;
 
     if (! actual_value || strcmp (actual_value, "") == 0) {
         if (xdg.default_value) {
@@ -2194,7 +2204,10 @@ get_xdg_var (XDG_Var xdg) {
         } else {
             return_value = NULL;
         }
+    } else {
+        return_value = str_replace("~", home, actual_value);
     }
+
     return return_value;
 }
 
@@ -2361,7 +2374,7 @@ inspector_attach_window_cb (WebKitWebInspector* inspector){
 }
 
 static gboolean
-inspector_dettach_window_cb (WebKitWebInspector* inspector){
+inspector_detach_window_cb (WebKitWebInspector* inspector){
     (void) inspector;
     return FALSE;
 }
@@ -2389,10 +2402,8 @@ set_up_inspector() {
     g_signal_connect (G_OBJECT (g->inspector), "show-window", G_CALLBACK (inspector_show_window_cb), NULL);
     g_signal_connect (G_OBJECT (g->inspector), "close-window", G_CALLBACK (inspector_close_window_cb), NULL);
     g_signal_connect (G_OBJECT (g->inspector), "attach-window", G_CALLBACK (inspector_attach_window_cb), NULL);
-    if (uzbl.gui.main_window) {
-        g_signal_connect (G_OBJECT (g->inspector), "dettach-window", G_CALLBACK (inspector_dettach_window_cb), NULL);
-        g_signal_connect (G_OBJECT (g->inspector), "destroy", G_CALLBACK (inspector_inspector_destroyed_cb), NULL);
-    }
+    g_signal_connect (G_OBJECT (g->inspector), "detach-window", G_CALLBACK (inspector_detach_window_cb), NULL);
+    g_signal_connect (G_OBJECT (g->inspector), "finished", G_CALLBACK (inspector_inspector_destroyed_cb), NULL);
 
     g_signal_connect (G_OBJECT (g->inspector), "notify::inspected-uri", G_CALLBACK (inspector_uri_changed_cb), NULL);
 }
diff --git a/uzbl.h b/uzbl.h
index 419e5a3..27293f9 100644
--- a/uzbl.h
+++ b/uzbl.h
@@ -78,6 +78,7 @@ typedef struct {
     GtkAdjustment* bar_h; // and scrolling position
     WebKitWebView* web_view;
     gchar*         main_title;
+    gchar*         icon;
 
     /* WebInspector */
     GtkWidget *inspector_window;
@@ -466,6 +467,9 @@ static void
 set_proxy_url();
 
 static void
+set_icon();
+
+static void
 cmd_cookie_handler();
 
 static void
diff --git a/uzbl.png b/uzbl.png
new file mode 100644
index 0000000..773ea84
--- /dev/null
+++ b/uzbl.png