AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a variable name clash. (#323475, Ross Burton)

Browse Source 
2005-12-07  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktoolbutton.c (clone_image_menu_size): Fix a
	variable name clash.  (#323475, Ross Burton)
This commit is contained in:
Matthias Clasen 2005-12-07 18:00:20 +00:00 committed by Matthias Clasen
parent b22c707741
commit 85fda2788d
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,8 @@
2005-12-07 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktoolbutton.c (clone_image_menu_size): Fix a
variable name clash. (#323475, Ross Burton)
2005-12-07 Ross Burton <ross@burtonini.com>
* docs/reference/gtk/tmpl/gtkenums.sgml:
@ -7,6 +12,9 @@
2005-12-07 Matthias Clasen <mclasen@redhat.com>
* 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)

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
2005-12-07 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktoolbutton.c (clone_image_menu_size): Fix a
variable name clash. (#323475, Ross Burton)
2005-12-07 Ross Burton <ross@burtonini.com>
* docs/reference/gtk/tmpl/gtkenums.sgml:
@ -7,6 +12,9 @@
2005-12-07 Matthias Clasen <mclasen@redhat.com>
* 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)

6
gtk/gtktoolbutton.c
View File

@ -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;
}
}