fix #136202 (gtk_toolbar_insert_stock crashes if stock lookup fails)

diff --git a/ChangeLog b/ChangeLog
index 602dabc58b96ffff5ea292335c06dfbcd14670d2..6861a16c2100c05b881f06eaaaf3f0725144b552 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-06  Gustavo J. A. M. Carneiro  <gustavo@users.sourceforge.net>
+
+       * gtk/gtktoolbar.c (internal_insert_element): Check return value
+       of gtk_stock_lookup; if stock lookup fails, just use stock_id as
+       label, instead of crashing. Fixes #136202.
+
 2004-03-05  Federico Mena Quintero  <federico@ximian.com>
 
        * gdk/linux-fb/gdkglobals-fb.c: Make <config.h> the very first

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 602dabc58b96ffff5ea292335c06dfbcd14670d2..6861a16c2100c05b881f06eaaaf3f0725144b552 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-03-06  Gustavo J. A. M. Carneiro  <gustavo@users.sourceforge.net>
+
+       * gtk/gtktoolbar.c (internal_insert_element): Check return value
+       of gtk_stock_lookup; if stock lookup fails, just use stock_id as
+       label, instead of crashing. Fixes #136202.
+
 2004-03-05  Federico Mena Quintero  <federico@ximian.com>
 
        * gdk/linux-fb/gdkglobals-fb.c: Make <config.h> the very first

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 602dabc58b96ffff5ea292335c06dfbcd14670d2..6861a16c2100c05b881f06eaaaf3f0725144b552 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2004-03-06  Gustavo J. A. M. Carneiro  <gustavo@users.sourceforge.net>
+
+       * gtk/gtktoolbar.c (internal_insert_element): Check return value
+       of gtk_stock_lookup; if stock lookup fails, just use stock_id as
+       label, instead of crashing. Fixes #136202.
+
 2004-03-05  Federico Mena Quintero  <federico@ximian.com>
 
        * gdk/linux-fb/gdkglobals-fb.c: Make <config.h> the very first

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 602dabc58b96ffff5ea292335c06dfbcd14670d2..6861a16c2100c05b881f06eaaaf3f0725144b552 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-03-06  Gustavo J. A. M. Carneiro  <gustavo@users.sourceforge.net>
+
+       * gtk/gtktoolbar.c (internal_insert_element): Check return value
+       of gtk_stock_lookup; if stock lookup fails, just use stock_id as
+       label, instead of crashing. Fixes #136202.
+
 2004-03-05  Federico Mena Quintero  <federico@ximian.com>
 
        * gdk/linux-fb/gdkglobals-fb.c: Make <config.h> the very first

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 602dabc58b96ffff5ea292335c06dfbcd14670d2..6861a16c2100c05b881f06eaaaf3f0725144b552 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-03-06  Gustavo J. A. M. Carneiro  <gustavo@users.sourceforge.net>
+
+       * gtk/gtktoolbar.c (internal_insert_element): Check return value
+       of gtk_stock_lookup; if stock lookup fails, just use stock_id as
+       label, instead of crashing. Fixes #136202.
+
 2004-03-05  Federico Mena Quintero  <federico@ximian.com>
 
        * gdk/linux-fb/gdkglobals-fb.c: Make <config.h> the very first

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 51d8180b99e120df9da9446f232682879cb1dcc1..91e7e24d512ca3c0359164e6a1256881eeac37ee 100644 (file)
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -3636,12 +3636,13 @@ internal_insert_element (GtkToolbar          *toolbar,
       if (text && use_stock)
        {
          GtkStockItem stock_item;
-         gtk_stock_lookup (text, &stock_item);
-         
-         if (!icon)
-           icon = gtk_image_new_from_stock (text, toolbar->icon_size);
+         if (gtk_stock_lookup (text, &stock_item))
+           {
+             if (!icon)
+               icon = gtk_image_new_from_stock (text, toolbar->icon_size);
          
-         text = free_me = _gtk_toolbar_elide_underscores (stock_item.label);
+             text = free_me = _gtk_toolbar_elide_underscores (stock_item.label);
+           }
        }
       
       if (text)