diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
| -rw-r--r-- | tests/testicontheme.c | 5 |
5 files changed, 20 insertions, 9 deletions
@@ -1,5 +1,9 @@ 2004-10-25 Matthias Clasen <mclasen@redhat.com> + * tests/testicontheme.c (main): Use gtk_image_new_from_icon_name(). + +2004-10-25 Matthias Clasen <mclasen@redhat.com> + Add a public setting for button ordering (#74669, Owen Taylor) * gtk/gtksettings.c (gtk_settings_class_init): Add a @@ -68,7 +72,7 @@ Sun Oct 24 02:56:43 2004 Jonathan Blandford <jrb@redhat.com> Billy Biggs) Sat Oct 23 16:14:37 2004 Søren Sandmann <sandmann@redhat.com> -tkIconThemeFile + * gtk/gtksequence.c (_gtk_sequence_node_insert_sorted): Remove assertion that can get triggered by broken sort functions. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9a392f0b2d..d88f82cba8 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2004-10-25 Matthias Clasen <mclasen@redhat.com> + * tests/testicontheme.c (main): Use gtk_image_new_from_icon_name(). + +2004-10-25 Matthias Clasen <mclasen@redhat.com> + Add a public setting for button ordering (#74669, Owen Taylor) * gtk/gtksettings.c (gtk_settings_class_init): Add a @@ -68,7 +72,7 @@ Sun Oct 24 02:56:43 2004 Jonathan Blandford <jrb@redhat.com> Billy Biggs) Sat Oct 23 16:14:37 2004 Søren Sandmann <sandmann@redhat.com> -tkIconThemeFile + * gtk/gtksequence.c (_gtk_sequence_node_insert_sorted): Remove assertion that can get triggered by broken sort functions. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9a392f0b2d..d88f82cba8 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,9 @@ 2004-10-25 Matthias Clasen <mclasen@redhat.com> + * tests/testicontheme.c (main): Use gtk_image_new_from_icon_name(). + +2004-10-25 Matthias Clasen <mclasen@redhat.com> + Add a public setting for button ordering (#74669, Owen Taylor) * gtk/gtksettings.c (gtk_settings_class_init): Add a @@ -68,7 +72,7 @@ Sun Oct 24 02:56:43 2004 Jonathan Blandford <jrb@redhat.com> Billy Biggs) Sat Oct 23 16:14:37 2004 Søren Sandmann <sandmann@redhat.com> -tkIconThemeFile + * gtk/gtksequence.c (_gtk_sequence_node_insert_sorted): Remove assertion that can get triggered by broken sort functions. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9a392f0b2d..d88f82cba8 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,9 @@ 2004-10-25 Matthias Clasen <mclasen@redhat.com> + * tests/testicontheme.c (main): Use gtk_image_new_from_icon_name(). + +2004-10-25 Matthias Clasen <mclasen@redhat.com> + Add a public setting for button ordering (#74669, Owen Taylor) * gtk/gtksettings.c (gtk_settings_class_init): Add a @@ -68,7 +72,7 @@ Sun Oct 24 02:56:43 2004 Jonathan Blandford <jrb@redhat.com> Billy Biggs) Sat Oct 23 16:14:37 2004 Søren Sandmann <sandmann@redhat.com> -tkIconThemeFile + * gtk/gtksequence.c (_gtk_sequence_node_insert_sorted): Remove assertion that can get triggered by broken sort functions. diff --git a/tests/testicontheme.c b/tests/testicontheme.c index dafc2ecba9..a28c55ca5e 100644 --- a/tests/testicontheme.c +++ b/tests/testicontheme.c @@ -63,12 +63,7 @@ main (int argc, char *argv[]) size = GTK_ICON_SIZE_BUTTON; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); -#if 1 - pixbuf = gtk_icon_theme_load_icon (icon_theme, argv[3], size, 0, NULL); - image = gtk_image_new_from_pixbuf (pixbuf); -#else image = gtk_image_new_from_icon_name (argv[3], size); -#endif gtk_container_add (GTK_CONTAINER (window), image); gtk_widget_show_all (window); |