[Emacs-diffs] /srv/bzr/emacs/trunk r103272: * gtkutil.c (xg_tool_bar_menu_proxy): Handle case when tool bar label is null.

[Jan D.]

------------------------------------------------------------
revno: 103272
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Mon 2011-02-14 14:30:49 +0100
message:
  * gtkutil.c (xg_tool_bar_menu_proxy): Handle case when tool bar label is null.
modified:
  src/ChangeLog
  src/gtkutil.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-02-13 11:28:42 +0000
+++ b/src/ChangeLog     2011-02-14 13:30:49 +0000
@@ -1,3 +1,8 @@
+2011-02-14  Jan Djärv  <address@hidden>
+
+       * gtkutil.c (xg_tool_bar_menu_proxy): Handle case when tool bar label
+       is null.
+
 2011-02-13  Jan Djärv  <address@hidden>
 
        * callproc.c (Fcall_process):

=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c     2011-01-26 08:36:39 +0000
+++ b/src/gtkutil.c     2011-02-14 13:30:49 +0000
@@ -3677,7 +3677,7 @@
   GtkLabel *wlbl = GTK_LABEL (xg_get_tool_bar_widgets (vb, &c1));
   GtkImage *wimage = GTK_IMAGE (c1);
   GtkWidget *wmenuitem = gtk_image_menu_item_new_with_label
-    (gtk_label_get_text (wlbl));
+    (wlbl ? gtk_label_get_text (wlbl) : "");
   GtkWidget *wmenuimage;