AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-12 21:40:19 +00:00
Code Issues Projects Releases Wiki Activity

fix #136202 (gtk_toolbar_insert_stock crashes if stock lookup fails)

Browse Source
This commit is contained in:
Gustavo J. A. M. Carneiro 2004-03-06 12:46:25 +00:00
parent c0dfbacbc9
commit 64cac40d2c
6 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2004-03-05 Federico Mena Quintero <federico@ximian.com>
* gdk/linux-fb/gdkglobals-fb.c: Make <config.h> the very first * gdk/linux-fb/gdkglobals-fb.c: Make <config.h> the very first

6
ChangeLog.pre-2-10
View File

@ -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> 2004-03-05 Federico Mena Quintero <federico@ximian.com>
* gdk/linux-fb/gdkglobals-fb.c: Make <config.h> the very first * gdk/linux-fb/gdkglobals-fb.c: Make <config.h> the very first

6
ChangeLog.pre-2-4
View File

@ -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> 2004-03-05 Federico Mena Quintero <federico@ximian.com>
* gdk/linux-fb/gdkglobals-fb.c: Make <config.h> the very first * gdk/linux-fb/gdkglobals-fb.c: Make <config.h> the very first

6
ChangeLog.pre-2-6
View File

@ -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> 2004-03-05 Federico Mena Quintero <federico@ximian.com>
* gdk/linux-fb/gdkglobals-fb.c: Make <config.h> the very first * gdk/linux-fb/gdkglobals-fb.c: Make <config.h> the very first

6
ChangeLog.pre-2-8
View File

@ -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> 2004-03-05 Federico Mena Quintero <federico@ximian.com>
* gdk/linux-fb/gdkglobals-fb.c: Make <config.h> the very first * gdk/linux-fb/gdkglobals-fb.c: Make <config.h> the very first

11
gtk/gtktoolbar.c
View File

@ -3636,12 +3636,13 @@ internal_insert_element (GtkToolbar *toolbar,
if (text && use_stock) if (text && use_stock)
{ {
GtkStockItem stock_item; GtkStockItem stock_item;
gtk_stock_lookup (text, &stock_item); if (gtk_stock_lookup (text, &stock_item))
{
if (!icon)
icon = gtk_image_new_from_stock (text, toolbar->icon_size);
if (!icon) text = free_me = _gtk_toolbar_elide_underscores (stock_item.label);
icon = gtk_image_new_from_stock (text, toolbar->icon_size); }
text = free_me = _gtk_toolbar_elide_underscores (stock_item.label);
} }
if (text) if (text)