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

background: Port to GSettings

Browse source
This commit is contained in:
Rodrigo Moya 2010-10-14 13:01:31 +02:00
parent a533ac968c
commit 2b5a938d26
2 changed files with 29 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

58
panels/background/cc-background-panel.c
View file

@ -61,7 +61,7 @@ struct _CcBackgroundPanelPrivate
BgFlickrSource *flickr_source; BgFlickrSource *flickr_source;
#endif #endif
GConfClient *client; GSettings *settings;
GnomeDesktopThumbnailFactory *thumb_factory; GnomeDesktopThumbnailFactory *thumb_factory;
@ -154,10 +154,10 @@ cc_background_panel_dispose (GObject *object)
} }
#endif #endif
if (priv->client) if (priv->settings)
{ {
g_object_unref (priv->client); g_object_unref (priv->settings);
priv->client = NULL; priv->settings = NULL;
} }
if (priv->copy_cancellable) if (priv->copy_cancellable)
@ -338,7 +338,6 @@ backgrounds_changed_cb (GtkIconView *icon_view,
GList *list; GList *list;
GtkTreeModel *model; GtkTreeModel *model;
GnomeWPItem *item; GnomeWPItem *item;
GConfChangeSet *cs;
gchar *pcolor, *scolor; gchar *pcolor, *scolor;
CcBackgroundPanelPrivate *priv = panel->priv; CcBackgroundPanelPrivate *priv = panel->priv;
gboolean draw_preview = TRUE; gboolean draw_preview = TRUE;
@ -365,12 +364,13 @@ backgrounds_changed_cb (GtkIconView *icon_view,
gtk_tree_model_get (model, &iter, 1, &item, -1); gtk_tree_model_get (model, &iter, 1, &item, -1);
cs = gconf_change_set_new (); /* Do all changes in one 'transaction' */
g_settings_delay (priv->settings);
if (!g_strcmp0 (item->filename, "(none)")) if (!g_strcmp0 (item->filename, "(none)"))
{ {
gconf_change_set_set_string (cs, WP_OPTIONS_KEY, "none"); g_settings_set_string (priv->settings, WP_OPTIONS_KEY, "none");
gconf_change_set_set_string (cs, WP_FILE_KEY, ""); g_settings_set_string (priv->settings, WP_FILE_KEY, "");
} }
else if (item->source_url) else if (item->source_url)
{ {
@ -419,10 +419,8 @@ backgrounds_changed_cb (GtkIconView *icon_view,
NULL, NULL, NULL, NULL,
copy_finished_cb, panel); copy_finished_cb, panel);
gconf_change_set_set_string (cs, WP_FILE_KEY, g_settings_set_string (priv->settings, WP_FILE_KEY, cache_path);
cache_path); g_settings_set_string (priv->settings, WP_OPTIONS_KEY, wp_item_option_to_string (item->options));
gconf_change_set_set_string (cs, WP_OPTIONS_KEY,
wp_item_option_to_string (item->options));
g_free (item->filename); g_free (item->filename);
item->filename = cache_path; item->filename = cache_path;
@ -445,27 +443,24 @@ backgrounds_changed_cb (GtkIconView *icon_view,
} }
else else
{ {
gconf_change_set_set_string (cs, WP_FILE_KEY, uri); g_settings_set_string (priv->settings, WP_FILE_KEY, uri);
g_free (uri); g_free (uri);
} }
gconf_change_set_set_string (cs, WP_OPTIONS_KEY, g_settings_set_string (priv->settings, WP_OPTIONS_KEY, wp_item_option_to_string (item->options));
wp_item_option_to_string (item->options));
} }
gconf_change_set_set_string (cs, WP_SHADING_KEY, g_settings_set_string (priv->settings, WP_SHADING_KEY,
wp_item_shading_to_string (item->shade_type)); wp_item_shading_to_string (item->shade_type));
pcolor = gdk_color_to_string (item->pcolor); pcolor = gdk_color_to_string (item->pcolor);
scolor = gdk_color_to_string (item->scolor); scolor = gdk_color_to_string (item->scolor);
gconf_change_set_set_string (cs, WP_PCOLOR_KEY, pcolor); g_settings_set_string (priv->settings, WP_PCOLOR_KEY, pcolor);
gconf_change_set_set_string (cs, WP_SCOLOR_KEY, scolor); g_settings_set_string (priv->settings, WP_SCOLOR_KEY, scolor);
g_free (pcolor); g_free (pcolor);
g_free (scolor); g_free (scolor);
gconf_client_commit_change_set (priv->client, cs, TRUE, NULL); g_settings_apply (priv->settings);
gconf_change_set_unref (cs);
/* update the preview information */ /* update the preview information */
update_preview (priv, item, draw_preview); update_preview (priv, item, draw_preview);
@ -557,9 +552,7 @@ style_changed_cb (GtkComboBox *box,
gtk_tree_model_get (model, &iter, 1, &value, -1); gtk_tree_model_get (model, &iter, 1, &value, -1);
gconf_client_set_string (priv->client, g_settings_set_string (priv->settings, WP_OPTIONS_KEY, value);
"/desktop/gnome/background/picture_options",
value, NULL);
g_free (value); g_free (value);
@ -584,13 +577,8 @@ color_changed_cb (GtkColorButton *button,
value = gdk_color_to_string (&color); value = gdk_color_to_string (&color);
gconf_client_set_string (priv->client, g_settings_set_string (priv->settings, WP_PCOLOR_KEY, value);
"/desktop/gnome/background/primary_color", g_settings_set_string (priv->settings, WP_SCOLOR_KEY, value);
value, NULL);
gconf_client_set_string (priv->client,
"/desktop/gnome/background/secondary_color",
value, NULL);
g_free (value); g_free (value);
@ -623,7 +611,7 @@ cc_background_panel_init (CcBackgroundPanel *self)
return; return;
} }
priv->client = gconf_client_get_default (); priv->settings = g_settings_new (WP_PATH_ID);
store = (GtkListStore*) gtk_builder_get_object (priv->builder, store = (GtkListStore*) gtk_builder_get_object (priv->builder,
"sources-liststore"); "sources-liststore");
@ -704,8 +692,8 @@ cc_background_panel_init (CcBackgroundPanel *self)
priv->thumb_factory = gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL); priv->thumb_factory = gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL);
/* initalise the current background information from gconf */ /* initalise the current background information from settings */
filename = gconf_client_get_string (priv->client, WP_FILE_KEY, NULL); filename = g_settings_get_string (priv->settings, WP_FILE_KEY);
if (!filename || !g_strcmp0 (filename, "")) if (!filename || !g_strcmp0 (filename, ""))
{ {
g_free (filename); g_free (filename);

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

@ -29,12 +29,12 @@
#ifndef _GNOME_WP_ITEM_H_ #ifndef _GNOME_WP_ITEM_H_
#define _GNOME_WP_ITEM_H_ #define _GNOME_WP_ITEM_H_
#define WP_PATH_KEY "/desktop/gnome/background" #define WP_PATH_ID "org.gnome.desktop.background"
#define WP_FILE_KEY WP_PATH_KEY "/picture_filename" #define WP_FILE_KEY "picture-filename"
#define WP_OPTIONS_KEY WP_PATH_KEY "/picture_options" #define WP_OPTIONS_KEY "picture-options"
#define WP_SHADING_KEY WP_PATH_KEY "/color_shading_type" #define WP_SHADING_KEY "color-shading-type"
#define WP_PCOLOR_KEY WP_PATH_KEY "/primary_color" #define WP_PCOLOR_KEY "primary-color"
#define WP_SCOLOR_KEY WP_PATH_KEY "/secondary_color" #define WP_SCOLOR_KEY "secondary-color"
typedef struct _GnomeWPItem GnomeWPItem; typedef struct _GnomeWPItem GnomeWPItem;