applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

background: Avoid re-querying the GFileInfo

Browse source 
If we already have it from enumerating the Pictures directory. Saves
us from doing sync queries in certain cases.
This commit is contained in:
Bastien Nocera 2010-12-13 15:30:22 +00:00
parent a1fa500dc5
commit 9580be8d17
6 changed files with 29 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
panels/background/bg-pictures-source.c
View file

@ -172,6 +172,7 @@ file_info_async_ready (GObject *source,
/* create a new GnomeWpItem */ /* create a new GnomeWpItem */
item = gnome_wp_item_new (filename, NULL, item = gnome_wp_item_new (filename, NULL,
info,
priv->thumb_factory); priv->thumb_factory);
if (!item) if (!item)
@ -181,11 +182,10 @@ file_info_async_ready (GObject *source,
continue; continue;
} }
/* insert the item into the liststore */ /* insert the item into the liststore */
pixbuf = gdk_pixbuf_new_from_file_at_scale (filename, THUMBNAIL_WIDTH, pixbuf = gdk_pixbuf_new_from_file_at_scale (filename,
THUMBNAIL_HEIGHT, TRUE, THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT,
TRUE,
NULL); NULL);
gtk_list_store_insert_with_values (store, &iter, 0, gtk_list_store_insert_with_values (store, &iter, 0,
0, pixbuf, 0, pixbuf,

11
panels/background/gnome-wp-info.c
View file

@ -25,11 +25,15 @@
#include "gnome-wp-info.h" #include "gnome-wp-info.h"
GnomeWPInfo * gnome_wp_info_new (const gchar * uri, GnomeWPInfo * gnome_wp_info_new (const gchar * uri,
GFileInfo * file_info,
GnomeDesktopThumbnailFactory * thumbs) { GnomeDesktopThumbnailFactory * thumbs) {
GnomeWPInfo *wp; GnomeWPInfo *wp;
GFile *file;
GFileInfo *info; GFileInfo *info;
if (file_info == NULL)
{
GFile *file;
file = g_file_new_for_commandline_arg (uri); file = g_file_new_for_commandline_arg (uri);
info = g_file_query_info (file, info = g_file_query_info (file,
@ -40,6 +44,11 @@ GnomeWPInfo * gnome_wp_info_new (const gchar * uri,
G_FILE_QUERY_INFO_NONE, G_FILE_QUERY_INFO_NONE,
NULL, NULL); NULL, NULL);
g_object_unref (file); g_object_unref (file);
}
else
{
info = g_object_ref (file_info);
}
if (info == NULL || g_file_info_get_content_type (info) == NULL) { if (info == NULL || g_file_info_get_content_type (info) == NULL) {
if (!strcmp (uri, "(none)")) { if (!strcmp (uri, "(none)")) {

1
panels/background/gnome-wp-info.h
View file

@ -38,6 +38,7 @@ struct _GnomeWPInfo {
}; };
GnomeWPInfo * gnome_wp_info_new (const gchar * uri, GnomeWPInfo * gnome_wp_info_new (const gchar * uri,
GFileInfo * file_info,
GnomeDesktopThumbnailFactory * thumbs); GnomeDesktopThumbnailFactory * thumbs);
void gnome_wp_info_free (GnomeWPInfo * info); void gnome_wp_info_free (GnomeWPInfo * info);

3
panels/background/gnome-wp-item.c
View file

@ -155,11 +155,12 @@ void gnome_wp_item_update (GnomeWPItem *item) {
GnomeWPItem * gnome_wp_item_new (const gchar * filename, GnomeWPItem * gnome_wp_item_new (const gchar * filename,
GHashTable * wallpapers, GHashTable * wallpapers,
GFileInfo * file_info,
GnomeDesktopThumbnailFactory * thumbnails) { GnomeDesktopThumbnailFactory * thumbnails) {
GnomeWPItem *item = g_new0 (GnomeWPItem, 1); GnomeWPItem *item = g_new0 (GnomeWPItem, 1);
item->filename = g_strdup (filename); item->filename = g_strdup (filename);
item->fileinfo = gnome_wp_info_new (filename, thumbnails); item->fileinfo = gnome_wp_info_new (filename, file_info, thumbnails);
if (item->fileinfo != NULL && item->fileinfo->mime_type != NULL && if (item->fileinfo != NULL && item->fileinfo->mime_type != NULL &&
(g_str_has_prefix (item->fileinfo->mime_type, "image/") || (g_str_has_prefix (item->fileinfo->mime_type, "image/") ||

1
panels/background/gnome-wp-item.h
View file

@ -69,6 +69,7 @@ struct _GnomeWPItem {
GnomeWPItem * gnome_wp_item_new (const gchar *filename, GnomeWPItem * gnome_wp_item_new (const gchar *filename,
GHashTable *wallpapers, GHashTable *wallpapers,
GFileInfo *file_info,
GnomeDesktopThumbnailFactory *thumbnails); GnomeDesktopThumbnailFactory *thumbnails);
void gnome_wp_item_free (GnomeWPItem *item); void gnome_wp_item_free (GnomeWPItem *item);

5
panels/background/gnome-wp-xml.c
View file

@ -83,7 +83,7 @@ static void gnome_wp_load_legacy (GnomeWpXml *data) {
continue; continue;
} }
item = gnome_wp_item_new (foo, data->wp_hash, data->thumb_factory); item = gnome_wp_item_new (foo, data->wp_hash, NULL, data->thumb_factory);
if (item != NULL && item->fileinfo == NULL) { if (item != NULL && item->fileinfo == NULL) {
gnome_wp_item_free (item); gnome_wp_item_free (item);
} }
@ -118,7 +118,6 @@ static void gnome_wp_xml_load_xml (GnomeWpXml *data,
if (!strcmp ((gchar *)list->name, "wallpaper")) { if (!strcmp ((gchar *)list->name, "wallpaper")) {
GnomeWPItem * wp; GnomeWPItem * wp;
gchar *pcolor = NULL, *scolor = NULL; gchar *pcolor = NULL, *scolor = NULL;
gchar *s;
gboolean have_scale = FALSE, have_shade = FALSE; gboolean have_scale = FALSE, have_shade = FALSE;
wp = g_new0 (GnomeWPItem, 1); wp = g_new0 (GnomeWPItem, 1);
@ -224,7 +223,7 @@ static void gnome_wp_xml_load_xml (GnomeWpXml *data,
if ((wp->filename != NULL && if ((wp->filename != NULL &&
g_file_test (wp->filename, G_FILE_TEST_EXISTS)) || g_file_test (wp->filename, G_FILE_TEST_EXISTS)) ||
!strcmp (wp->filename, "(none)")) { !strcmp (wp->filename, "(none)")) {
wp->fileinfo = gnome_wp_info_new (wp->filename, data->thumb_factory); wp->fileinfo = gnome_wp_info_new (wp->filename, NULL, data->thumb_factory);
if (wp->name == NULL || !strcmp (wp->filename, "(none)")) { if (wp->name == NULL || !strcmp (wp->filename, "(none)")) {
g_free (wp->name); g_free (wp->name);