From 42f6055717e74ea9541c5cf6fd0fc6501bd907fd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Mon, 14 Feb 2011 14:30:49 +0100 Subject: [PATCH] * gtkutil.c (xg_tool_bar_menu_proxy): Handle case when tool bar label is null. --- src/ChangeLog | 5 +++++ src/gtkutil.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 + + * gtkutil.c (xg_tool_bar_menu_proxy): Handle case when tool bar label + is null. + 2011-02-13 Jan Djärv * 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; -- 2.39.5