From 85fda2788d264b0755da837fa329ebc75269959f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 7 Dec 2005 18:00:20 +0000 Subject: [PATCH] Fix a variable name clash. (#323475, Ross Burton) 2005-12-07 Matthias Clasen * gtk/gtktoolbutton.c (clone_image_menu_size): Fix a variable name clash. (#323475, Ross Burton) --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ gtk/gtktoolbutton.c | 6 +++--- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 218b8bd00b..71782b3438 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-12-07 Matthias Clasen + + * gtk/gtktoolbutton.c (clone_image_menu_size): Fix a + variable name clash. (#323475, Ross Burton) + 2005-12-07 Ross Burton * docs/reference/gtk/tmpl/gtkenums.sgml: @@ -7,6 +12,9 @@ 2005-12-07 Matthias Clasen + * gtk/gtktoolbutton.c (clone_image_menu_size): Fix a + variable name clash. (#323475, Ross Burton) + * gtk/gtktreeview.c (gtk_tree_view_key_press): Use the correct window when synthesizing the key event. (#323077, Sadrul Habib Chowdhury) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 218b8bd00b..71782b3438 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-12-07 Matthias Clasen + + * gtk/gtktoolbutton.c (clone_image_menu_size): Fix a + variable name clash. (#323475, Ross Burton) + 2005-12-07 Ross Burton * docs/reference/gtk/tmpl/gtkenums.sgml: @@ -7,6 +12,9 @@ 2005-12-07 Matthias Clasen + * gtk/gtktoolbutton.c (clone_image_menu_size): Fix a + variable name clash. (#323475, Ross Burton) + * gtk/gtktreeview.c (gtk_tree_view_key_press): Use the correct window when synthesizing the key event. (#323077, Sadrul Habib Chowdhury) diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c index 7c06409f35..fcb7f92f91 100644 --- a/gtk/gtktoolbutton.c +++ b/gtk/gtktoolbutton.c @@ -562,16 +562,16 @@ clone_image_menu_size (GtkImage *image, GtkSettings *settings) &width, &height)) { GdkPixbuf *src_pixbuf, *dest_pixbuf; - GtkWidget *image; + GtkWidget *cloned_image; src_pixbuf = gtk_image_get_pixbuf (image); dest_pixbuf = gdk_pixbuf_scale_simple (src_pixbuf, width, height, GDK_INTERP_BILINEAR); - image = gtk_image_new_from_pixbuf (dest_pixbuf); + cloned_image = gtk_image_new_from_pixbuf (dest_pixbuf); g_object_unref (dest_pixbuf); - return image; + return cloned_image; } }