From: Jan Djärv <jan.h.d@swipnet.se>
Date: Mon, 14 Feb 2011 13:30:49 +0000 (+0100)
Subject: * gtkutil.c (xg_tool_bar_menu_proxy): Handle case when tool bar label is null.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~882
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=42f6055717e74ea9541c5cf6fd0fc6501bd907fd;p=emacs.git

* gtkutil.c (xg_tool_bar_menu_proxy): Handle case when tool bar label is null.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 5ca0776bd97..721bb93dfda 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-14  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* gtkutil.c (xg_tool_bar_menu_proxy): Handle case when tool bar label
+	is null.
+
 2011-02-13  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* callproc.c (Fcall_process):
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 6367949a649..6ecd5d624af 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -3677,7 +3677,7 @@ xg_tool_bar_menu_proxy (GtkToolItem *toolitem, gpointer user_data)
   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;