Backport from HEAD

2006-08-29  Emmanuele Bassi  <ebassi@gnome.org>

	Backport from HEAD

	* gtk/gtkrecentchoosermenu.c
	(gtk_recent_chooser_menu_set_current_uri): Break when an item
	is found and activated. (#353449, based on a patch from Jan Arne
	Petersen)
This commit is contained in:
Emmanuele Bassi
2006-08-29 18:48:46 +00:00
committed by Emmanuele Bassi
parent aa3340afa1
commit e0e8a51964
2 changed files with 21 additions and 10 deletions

View File

@@ -1,3 +1,12 @@
2006-08-29 Emmanuele Bassi <ebassi@gnome.org>
Backport from HEAD
* gtk/gtkrecentchoosermenu.c
(gtk_recent_chooser_menu_set_current_uri): Break when an item
is found and activated. (#353449, based on a patch from Jan Arne
Petersen)
2006-08-29 Paolo Borelli <pborelli@katamail.com>
* tests/autotestfilesystem.c: add this file from HEAD to fix

View File

@@ -411,26 +411,28 @@ 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);
if (!found)
if (!found)
{
g_set_error (error, GTK_RECENT_CHOOSER_ERROR,
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 *