From 22add3e02b5fc65a7bf4545f0ed24ad7196c8ebc Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 29 Aug 2006 18:38:59 +0000 Subject: [PATCH] Break when an item is found and activated. (#353449, based on a patch by 2006-08-29 Emmanuele Bassi * gtk/gtkrecentchoosermenu.c (gtk_recent_chooser_menu_set_current_item): Break when an item is found and activated. (#353449, based on a patch by Jan Arne Petersen) --- ChangeLog | 7 +++++++ gtk/gtkrecentchoosermenu.c | 20 +++++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f69e52d68..48dc16b15d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-08-29 Emmanuele Bassi + + * gtk/gtkrecentchoosermenu.c + (gtk_recent_chooser_menu_set_current_item): Break when an item + is found and activated. (#353449, based on a patch by Jan Arne + Petersen) + Fri Jul 14 16:13:37 2006 Tim Janik * gtk/gtkprogressbar.c: introduced ::xspacing and ::yspacing style diff --git a/gtk/gtkrecentchoosermenu.c b/gtk/gtkrecentchoosermenu.c index 0e04b86575..9ad1cb10b4 100644 --- a/gtk/gtkrecentchoosermenu.c +++ b/gtk/gtkrecentchoosermenu.c @@ -411,8 +411,15 @@ gtk_recent_chooser_menu_set_current_uri (GtkRecentChooser *chooser, if (!info) continue; - if (0 == strcmp (uri, gtk_recent_info_get_uri (info))) - found = TRUE; + if (strcmp (uri, gtk_recent_info_get_uri (info)) == 0) + { + gtk_menu_shell_activate_item (GTK_MENU_SHELL (menu), + menu_item, + TRUE); + found = TRUE; + + break; + } } g_list_free (children); @@ -423,14 +430,9 @@ gtk_recent_chooser_menu_set_current_uri (GtkRecentChooser *chooser, GTK_RECENT_CHOOSER_ERROR_NOT_FOUND, _("No recently used resource found with URI `%s'"), uri); - return FALSE; - } - else - { - gtk_menu_shell_activate_item (GTK_MENU_SHELL (menu), menu_item, TRUE); - - return TRUE; } + + return found; } static gchar *