From 1be34ede800b10ce8187265e296862905e32dcff Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 7 Nov 2004 05:23:31 +0000 Subject: [PATCH] Remove some warnings. 2004-11-07 Matthias Clasen * gtk/gtkmenu.c (menu_change_screen): Remove some warnings. --- ChangeLog | 2 ++ ChangeLog.pre-2-10 | 2 ++ ChangeLog.pre-2-6 | 2 ++ ChangeLog.pre-2-8 | 2 ++ gtk/gtkmenu.c | 4 ++-- 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4324da0c37..0b3868756b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2004-11-07 Matthias Clasen + * gtk/gtkmenu.c (menu_change_screen): Remove some warnings. + Show files in folder modes. (#157013, Nickolay V. Shmyrev) * gtk/gtkfilechooserdefault.c (create_file_list): Use a selection diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4324da0c37..0b3868756b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,7 @@ 2004-11-07 Matthias Clasen + * gtk/gtkmenu.c (menu_change_screen): Remove some warnings. + Show files in folder modes. (#157013, Nickolay V. Shmyrev) * gtk/gtkfilechooserdefault.c (create_file_list): Use a selection diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4324da0c37..0b3868756b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,7 @@ 2004-11-07 Matthias Clasen + * gtk/gtkmenu.c (menu_change_screen): Remove some warnings. + Show files in folder modes. (#157013, Nickolay V. Shmyrev) * gtk/gtkfilechooserdefault.c (create_file_list): Use a selection diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4324da0c37..0b3868756b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,7 @@ 2004-11-07 Matthias Clasen + * gtk/gtkmenu.c (menu_change_screen): Remove some warnings. + Show files in folder modes. (#157013, Nickolay V. Shmyrev) * gtk/gtkfilechooserdefault.c (create_file_list): Use a selection diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 3dd53c8fa8..5e067cd7de 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -980,9 +980,9 @@ menu_change_screen (GtkMenu *menu, { GtkMenuPrivate *private = gtk_menu_get_private (menu); - if (gtk_widget_has_screen (menu)) + if (gtk_widget_has_screen (GTK_WIDGET (menu))) { - if (new_screen == gtk_widget_get_screen (menu)) + if (new_screen == gtk_widget_get_screen (GTK_WIDGET (menu))) return; }