summaryrefslogtreecommitdiff
path: root/libcaja-private/caja-directory-background.c
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-09-05 12:36:04 +0200
committerStefano Karapetsas <[email protected]>2012-09-05 12:36:04 +0200
commit6f15dc7cc1be8b98bbc1f5edd963ff89076295ee (patch)
tree04a0b2971e10ce57880360f63147b2d137b84b2a /libcaja-private/caja-directory-background.c
parent373da58a33a4242f3d91771fd304ba8bb3d55e61 (diff)
downloadcaja-6f15dc7cc1be8b98bbc1f5edd963ff89076295ee.tar.bz2
caja-6f15dc7cc1be8b98bbc1f5edd963ff89076295ee.tar.xz
start migration to gsettings
Diffstat (limited to 'libcaja-private/caja-directory-background.c')
-rw-r--r--libcaja-private/caja-directory-background.c89
1 files changed, 43 insertions, 46 deletions
diff --git a/libcaja-private/caja-directory-background.c b/libcaja-private/caja-directory-background.c
index 69c792d6..38927b24 100644
--- a/libcaja-private/caja-directory-background.c
+++ b/libcaja-private/caja-directory-background.c
@@ -48,7 +48,9 @@ static void saved_settings_changed_callback (CajaFile *file,
static void caja_file_background_receive_mateconf_changes (EelBackground *background);
-static void caja_file_background_theme_changed (gpointer user_data);
+static void caja_file_background_theme_changed (GSettings *settings,
+ const gchar *key,
+ gpointer user_data);
void
caja_connect_desktop_background_to_file_metadata (CajaIconContainer *icon_container,
@@ -80,17 +82,16 @@ caja_file_background_get_default_settings (char **color,
{
gboolean background_set;
- background_set = eel_preferences_get_boolean
- (CAJA_PREFERENCES_BACKGROUND_SET);
+ background_set = g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_BACKGROUND_SET);
if (background_set && color)
{
- *color = eel_preferences_get (CAJA_PREFERENCES_BACKGROUND_COLOR);
+ *color = g_settings_get_string (caja_preferences, CAJA_PREFERENCES_BACKGROUND_COLOR);
}
if (background_set && image)
{
- *image = eel_preferences_get (CAJA_PREFERENCES_BACKGROUND_FILENAME);
+ *image = g_settings_get_string (caja_preferences, CAJA_PREFERENCES_BACKGROUND_URI);
}
if (placement)
@@ -449,12 +450,17 @@ background_changed_callback (EelBackground *background,
NULL,
NULL);
- eel_preferences_set
- (CAJA_PREFERENCES_BACKGROUND_COLOR, color ? color : "");
- eel_preferences_set
- (CAJA_PREFERENCES_BACKGROUND_FILENAME, image ? image : "");
- eel_preferences_set_boolean
- (CAJA_PREFERENCES_BACKGROUND_SET, TRUE);
+ g_signal_handlers_block_by_func (caja_preferences, G_CALLBACK (caja_file_background_theme_changed), background);
+
+ g_settings_set_string (caja_preferences,
+ CAJA_PREFERENCES_BACKGROUND_COLOR, color ? color : "");
+ g_settings_set_string (caja_preferences,
+ CAJA_PREFERENCES_BACKGROUND_URI,
+ image ? image : "");
+ g_settings_set_boolean (caja_preferences,
+ CAJA_PREFERENCES_BACKGROUND_SET, TRUE);
+
+ g_signal_handlers_unblock_by_func (caja_preferences, G_CALLBACK (caja_file_background_theme_changed), background);
}
else
{
@@ -545,7 +551,9 @@ saved_settings_changed_callback (CajaFile *file,
/* handle the theme changing */
static void
-caja_file_background_theme_changed (gpointer user_data)
+caja_file_background_theme_changed (GSettings *settings,
+ const gchar *key,
+ gpointer user_data)
{
CajaFile *file;
EelBackground *background;
@@ -588,8 +596,11 @@ background_reset_callback (EelBackground *background,
NULL);
if (!color && !image)
{
- eel_preferences_set_boolean (CAJA_PREFERENCES_BACKGROUND_SET,
- FALSE);
+ g_signal_handlers_block_by_func (caja_preferences, G_CALLBACK (caja_file_background_theme_changed), background);
+ g_settings_set_boolean (caja_preferences,
+ CAJA_PREFERENCES_BACKGROUND_SET,
+ FALSE);
+ g_signal_handlers_unblock_by_func (caja_preferences, G_CALLBACK (caja_file_background_theme_changed), background);
}
else
{
@@ -626,18 +637,9 @@ background_destroyed_callback (EelBackground *background,
(file,
G_CALLBACK (saved_settings_changed_callback), background);
caja_file_monitor_remove (file, background);
- eel_preferences_remove_callback (CAJA_PREFERENCES_THEME,
- caja_file_background_theme_changed,
- background);
- eel_preferences_remove_callback (CAJA_PREFERENCES_BACKGROUND_SET,
- caja_file_background_theme_changed,
- background);
- eel_preferences_remove_callback (CAJA_PREFERENCES_BACKGROUND_COLOR,
- caja_file_background_theme_changed,
- background);
- eel_preferences_remove_callback (CAJA_PREFERENCES_BACKGROUND_FILENAME,
- caja_file_background_theme_changed,
- background);
+ g_signal_handlers_disconnect_by_func (caja_preferences,
+ caja_file_background_theme_changed,
+ background);
}
/* key routine that hooks up a background and location */
@@ -676,18 +678,9 @@ caja_connect_background_to_file_metadata (GtkWidget *widget,
(old_file,
G_CALLBACK (saved_settings_changed_callback), background);
caja_file_monitor_remove (old_file, background);
- eel_preferences_remove_callback (CAJA_PREFERENCES_THEME,
- caja_file_background_theme_changed,
- background);
- eel_preferences_remove_callback (CAJA_PREFERENCES_BACKGROUND_SET,
- caja_file_background_theme_changed,
- background);
- eel_preferences_remove_callback (CAJA_PREFERENCES_BACKGROUND_COLOR,
- caja_file_background_theme_changed,
- background);
- eel_preferences_remove_callback (CAJA_PREFERENCES_BACKGROUND_FILENAME,
- caja_file_background_theme_changed,
- background);
+ g_signal_handlers_disconnect_by_func (caja_preferences,
+ caja_file_background_theme_changed,
+ background);
}
@@ -716,14 +709,18 @@ caja_connect_background_to_file_metadata (GtkWidget *widget,
CAJA_FILE_ATTRIBUTE_INFO);
/* arrange for notification when the theme changes */
- eel_preferences_add_callback (CAJA_PREFERENCES_THEME,
- caja_file_background_theme_changed, background);
- eel_preferences_add_callback (CAJA_PREFERENCES_BACKGROUND_SET,
- caja_file_background_theme_changed, background);
- eel_preferences_add_callback (CAJA_PREFERENCES_BACKGROUND_COLOR,
- caja_file_background_theme_changed, background);
- eel_preferences_add_callback (CAJA_PREFERENCES_BACKGROUND_FILENAME,
- caja_file_background_theme_changed, background);
+ g_signal_connect (caja_preferences,
+ "changed::" CAJA_PREFERENCES_BACKGROUND_SET,
+ G_CALLBACK(caja_file_background_theme_changed),
+ background);
+ g_signal_connect (caja_preferences,
+ "changed::" CAJA_PREFERENCES_BACKGROUND_COLOR,
+ G_CALLBACK(caja_file_background_theme_changed),
+ background);
+ g_signal_connect (caja_preferences,
+ "changed::" CAJA_PREFERENCES_BACKGROUND_URI,
+ G_CALLBACK(caja_file_background_theme_changed),
+ background);
}
/* Update the background based on the file metadata. */
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-27 18:22:25 +0000