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

background: load wallpapers in an idle

Browse source 
So we don't block the construction.
This commit is contained in:
William Jon McCann 2010-11-21 22:06:26 -05:00
parent 4c06652dfc
commit d5642cf221
1 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

36
panels/background/bg-wallpapers-source.c
View file

@ -38,6 +38,7 @@ struct _BgWallpapersSourcePrivate
{ {
GtkListStore *store; GtkListStore *store;
GnomeDesktopThumbnailFactory *thumb_factory; GnomeDesktopThumbnailFactory *thumb_factory;
guint reload_id;
}; };
@ -78,6 +79,12 @@ bg_wallpapers_source_dispose (GObject *object)
priv->thumb_factory = NULL; priv->thumb_factory = NULL;
} }
if (priv->reload_id != 0)
{
g_source_remove (priv->reload_id);
priv->reload_id = 0;
}
G_OBJECT_CLASS (bg_wallpapers_source_parent_class)->dispose (object); G_OBJECT_CLASS (bg_wallpapers_source_parent_class)->dispose (object);
} }
@ -187,16 +194,10 @@ load_wallpapers (gchar *key,
gtk_tree_path_free (path); gtk_tree_path_free (path);
} }
static void static gboolean
bg_wallpapers_source_init (BgWallpapersSource *self) reload_wallpapers (BgWallpapersSource *self)
{ {
GnomeWpXml *wp_xml; GnomeWpXml *wp_xml;
BgWallpapersSourcePrivate *priv;
priv = self->priv = WALLPAPERS_SOURCE_PRIVATE (self);
priv->thumb_factory =
gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL);
/* set up wallpaper source */ /* set up wallpaper source */
wp_xml = g_new0 (GnomeWpXml, 1); wp_xml = g_new0 (GnomeWpXml, 1);
@ -205,7 +206,7 @@ bg_wallpapers_source_init (BgWallpapersSource *self)
wp_xml->wp_model = bg_source_get_liststore (BG_SOURCE (self)); wp_xml->wp_model = bg_source_get_liststore (BG_SOURCE (self));
wp_xml->thumb_width = THUMBNAIL_WIDTH; wp_xml->thumb_width = THUMBNAIL_WIDTH;
wp_xml->thumb_height = THUMBNAIL_HEIGHT; wp_xml->thumb_height = THUMBNAIL_HEIGHT;
wp_xml->thumb_factory = priv->thumb_factory; wp_xml->thumb_factory = self->priv->thumb_factory;
gnome_wp_xml_load_list (wp_xml); gnome_wp_xml_load_list (wp_xml);
g_hash_table_foreach (wp_xml->wp_hash, g_hash_table_foreach (wp_xml->wp_hash,
@ -215,6 +216,23 @@ bg_wallpapers_source_init (BgWallpapersSource *self)
g_hash_table_destroy (wp_xml->wp_hash); g_hash_table_destroy (wp_xml->wp_hash);
g_object_unref (wp_xml->settings); g_object_unref (wp_xml->settings);
g_free (wp_xml); g_free (wp_xml);
self->priv->reload_id = 0;
return FALSE;
}
static void
bg_wallpapers_source_init (BgWallpapersSource *self)
{
BgWallpapersSourcePrivate *priv;
priv = self->priv = WALLPAPERS_SOURCE_PRIVATE (self);
priv->thumb_factory =
gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL);
priv->reload_id = g_idle_add ((GSourceFunc)reload_wallpapers, self);
} }
BgWallpapersSource * BgWallpapersSource *