From: Dieter Plaetinck <dieter@plaetinck.be>
Date: Sun, 7 Jun 2009 18:05:21 +0000 (+0200)
Subject: merge in some fixes + basic uzbl icon from uranther
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=d1bbcb3d7e6285f48424df299f2330fdcf440f37;hp=-c;p=uzbl-mobile

merge in some fixes + basic uzbl icon from uranther
---

d1bbcb3d7e6285f48424df299f2330fdcf440f37
diff --combined Makefile
index 544bc76,c22370b..2fef569
--- a/Makefile
+++ b/Makefile
@@@ -5,14 -5,14 +5,14 @@@ all: uzbl uzblctr
  PREFIX?=$(DESTDIR)/usr
  
  test: uzbl
 -	./uzbl --uri http://www.uzbl.org
 +	./uzbl --uri http://www.uzbl.org --verbose
  
  test-config: uzbl
 -	./uzbl --uri http://www.uzbl.org < examples/configs/sampleconfig-dev
 +	./uzbl --uri http://www.uzbl.org --config examples/configs/sampleconfig-dev --verbose
  
  test-config-real: uzbl
 -	./uzbl --uri http://www.uzbl.org < /usr/share/uzbl/examples/configs/sampleconfig
 -
 +	./uzbl --uri http://www.uzbl.org --config /usr/share/uzbl/examples/configs/sampleconfig --verbose
 +	
  clean:
  	rm -f uzbl
  	rm -f uzblctrl
@@@ -26,6 -26,7 +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 --combined uzbl.c
index 9abcaa1,41ec84e..35a50fc
--- a/uzbl.c
+++ b/uzbl.c
@@@ -1370,7 -1370,7 +1370,7 @@@ cmd_font_size() 
                        uzbl.behave.font_size, NULL);
      }
  }
 - 
 +
  static void
  cmd_zoom_level() {
      webkit_web_view_set_zoom_level (uzbl.gui.web_view, uzbl.behave.zoom_level);
@@@ -2038,11 -2038,15 +2038,15 @@@ create_mainbar () 
  static
  GtkWidget* create_window () {
      GtkWidget* window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+     gchar* uzbl_icon = find_xdg_file(1, "/uzbl/uzbl.png");
      gtk_window_set_default_size (GTK_WINDOW (window), 800, 600);
      gtk_widget_set_name (window, "Uzbl browser");
+     gtk_window_set_icon_from_file (GTK_WINDOW (window), uzbl_icon, NULL);
      g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (destroy_cb), NULL);
      g_signal_connect (G_OBJECT (window), "key-press-event", G_CALLBACK (key_press_cb), NULL);
  
+     g_free (uzbl_icon);
+ 
      return window;
  }
  
@@@ -2170,8 -2174,7 +2174,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) {
@@@ -2179,7 -2182,10 +2182,10 @@@
          } else {
              return_value = NULL;
          }
+     } else {
+         return_value = str_replace("~", home, actual_value);
      }
+ 
      return return_value;
  }
  
@@@ -2346,7 -2352,7 +2352,7 @@@ inspector_attach_window_cb (WebKitWebIn
  }
  
  static gboolean
- inspector_dettach_window_cb (WebKitWebInspector* inspector){
+ inspector_detach_window_cb (WebKitWebInspector* inspector){
      (void) inspector;
      return FALSE;
  }
@@@ -2374,8 -2380,8 +2380,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);
-     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);
  }