callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

building a GtkRecentInfo can never fail.

Browse Source 
2007-06-25  Emmanuele Bassi  <ebassi@gnome.org>

	* gtk/gtkrecentmanager.c:
	(build_recent_info): building a GtkRecentInfo can never fail.

	(gtk_recent_manager_get_items): Clamp the list while building
	it so we don't need to traverse it more than once. (#446532,
	Philip Withnall)

svn path=/trunk/; revision=18228
This commit is contained in:
Emmanuele Bassi 2007-06-25 16:15:21 +00:00 committed by Emmanuele Bassi
parent 64923390c5
commit 970988756e
2 changed files with 16 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2007-06-25 Emmanuele Bassi <ebassi@gnome.org>
* gtk/gtkrecentmanager.c:
(build_recent_info): building a GtkRecentInfo can never fail.
(gtk_recent_manager_get_items): Clamp the list while building
it so we don't need to traverse it more than once. (#446532,
Philip Withnall)
2007-06-25 Tor Lillqvist <tml@novell.com> 2007-06-25 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Revert my * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Revert my

48
gtk/gtkrecentmanager.c
View File

@ -1077,7 +1077,7 @@ gtk_recent_manager_has_item (GtkRecentManager *manager,
return g_bookmark_file_has_item (priv->recent_items, uri); return g_bookmark_file_has_item (priv->recent_items, uri);
} }
static gboolean static void
build_recent_info (GBookmarkFile *bookmarks, build_recent_info (GBookmarkFile *bookmarks,
GtkRecentInfo *info) GtkRecentInfo *info)
{ {
@ -1137,8 +1137,6 @@ build_recent_info (GBookmarkFile *bookmarks,
} }
g_strfreev (apps); g_strfreev (apps);
return TRUE;
} }
/** /**
@ -1165,7 +1163,6 @@ gtk_recent_manager_lookup_item (GtkRecentManager *manager,
{ {
GtkRecentManagerPrivate *priv; GtkRecentManagerPrivate *priv;
GtkRecentInfo *info = NULL; GtkRecentInfo *info = NULL;
gboolean res;
g_return_val_if_fail (GTK_IS_RECENT_MANAGER (manager), NULL); g_return_val_if_fail (GTK_IS_RECENT_MANAGER (manager), NULL);
g_return_val_if_fail (uri != NULL, NULL); g_return_val_if_fail (uri != NULL, NULL);
@ -1200,14 +1197,8 @@ gtk_recent_manager_lookup_item (GtkRecentManager *manager,
/* fill the RecentInfo structure with the data retrieved by our /* fill the RecentInfo structure with the data retrieved by our
* parser object from the storage file * parser object from the storage file
*/ */
res = build_recent_info (priv->recent_items, info); build_recent_info (priv->recent_items, info);
if (!res)
{
gtk_recent_info_free (info);
return NULL;
}
return info; return info;
} }
@ -1303,42 +1294,17 @@ gtk_recent_manager_get_items (GtkRecentManager *manager)
for (i = 0; i < uris_len; i++) for (i = 0; i < uris_len; i++)
{ {
GtkRecentInfo *info; GtkRecentInfo *info;
gboolean res;
if (priv->limit != -1 && i == priv->limit)
break;
info = gtk_recent_info_new (uris[i]); info = gtk_recent_info_new (uris[i]);
res = build_recent_info (priv->recent_items, info); build_recent_info (priv->recent_items, info);
if (!res)
{
g_warning ("Unable to create a RecentInfo object for "
"item with URI `%s'",
uris[i]);
gtk_recent_info_free (info);
continue;
}
retval = g_list_prepend (retval, info); retval = g_list_prepend (retval, info);
} }
g_strfreev (uris); g_strfreev (uris);
/* clamp the list, if a limit is present */
if ((priv->limit != -1) &&
(g_list_length (retval) > priv->limit))
{
GList *clamp, *l;
clamp = g_list_nth (retval, priv->limit - 1);
if (!clamp)
return retval;
l = clamp->next;
clamp->next = NULL;
g_list_foreach (l, (GFunc) gtk_recent_info_free, NULL);
g_list_free (l);
}
return retval; return retval;
} }