From 4ce75a73f8a69f906a784a7704be7891e7519d81 Mon Sep 17 00:00:00 2001 From: Stefano Karapetsas Date: Wed, 5 Sep 2012 19:50:04 +0200 Subject: convert desktop preferences to gsettings --- libcaja-private/caja-desktop-link.c | 86 +++++++++++++++++++++++-------------- 1 file changed, 54 insertions(+), 32 deletions(-) (limited to 'libcaja-private/caja-desktop-link.c') diff --git a/libcaja-private/caja-desktop-link.c b/libcaja-private/caja-desktop-link.c index 502d6ef0..7ac505a3 100644 --- a/libcaja-private/caja-desktop-link.c +++ b/libcaja-private/caja-desktop-link.c @@ -118,7 +118,21 @@ home_name_changed (gpointer callback_data) g_assert (link->details->type == CAJA_DESKTOP_LINK_HOME); g_free (link->details->display_name); - link->details->display_name = eel_preferences_get (CAJA_PREFERENCES_DESKTOP_HOME_NAME); + + link->details->display_name = g_settings_get_string (caja_desktop_preferences, + CAJA_PREFERENCES_DESKTOP_HOME_NAME); + if (link->details->display_name[0] == 0) { + g_free (link->details->display_name); + /* Note to translators: If it's hard to compose a good home + * icon name from the user name, you can use a string without + * an "%s" here, in which case the home icon name will not + * include the user's name, which should be fine. To avoid a + * warning, put "%.0s" somewhere in the string, which will + * match the user name string passed by the C code, but not + * put the user name in the final string. + */ + link->details->display_name = g_strdup_printf (_("%s's Home"), g_get_user_name ()); + } caja_desktop_link_changed (link); } @@ -132,7 +146,7 @@ computer_name_changed (gpointer callback_data) g_assert (link->details->type == CAJA_DESKTOP_LINK_COMPUTER); g_free (link->details->display_name); - link->details->display_name = eel_preferences_get (CAJA_PREFERENCES_DESKTOP_COMPUTER_NAME); + link->details->display_name = g_settings_get_string (caja_desktop_preferences, CAJA_PREFERENCES_DESKTOP_COMPUTER_NAME); caja_desktop_link_changed (link); } @@ -146,7 +160,7 @@ trash_name_changed (gpointer callback_data) g_assert (link->details->type == CAJA_DESKTOP_LINK_TRASH); g_free (link->details->display_name); - link->details->display_name = eel_preferences_get (CAJA_PREFERENCES_DESKTOP_TRASH_NAME); + link->details->display_name = g_settings_get_string (caja_desktop_preferences, CAJA_PREFERENCES_DESKTOP_TRASH_NAME); caja_desktop_link_changed (link); } @@ -159,7 +173,7 @@ network_name_changed (gpointer callback_data) g_assert (link->details->type == CAJA_DESKTOP_LINK_NETWORK); g_free (link->details->display_name); - link->details->display_name = eel_preferences_get (CAJA_PREFERENCES_DESKTOP_NETWORK_NAME); + link->details->display_name = g_settings_get_string (caja_desktop_preferences, CAJA_PREFERENCES_DESKTOP_NETWORK_NAME); caja_desktop_link_changed (link); } @@ -175,38 +189,41 @@ caja_desktop_link_new (CajaDesktopLinkType type) { case CAJA_DESKTOP_LINK_HOME: link->details->filename = g_strdup ("home"); - link->details->display_name = eel_preferences_get (CAJA_PREFERENCES_DESKTOP_HOME_NAME); + link->details->display_name = g_settings_get_string (caja_desktop_preferences, CAJA_PREFERENCES_DESKTOP_HOME_NAME); link->details->activation_location = g_file_new_for_path (g_get_home_dir ()); link->details->icon = g_themed_icon_new (CAJA_ICON_HOME); - eel_preferences_add_callback (CAJA_PREFERENCES_DESKTOP_HOME_NAME, - home_name_changed, - link); + g_signal_connect_swapped (caja_desktop_preferences, + "changed::" CAJA_PREFERENCES_DESKTOP_HOME_NAME, + G_CALLBACK (home_name_changed), + link); break; case CAJA_DESKTOP_LINK_COMPUTER: link->details->filename = g_strdup ("computer"); - link->details->display_name = eel_preferences_get (CAJA_PREFERENCES_DESKTOP_COMPUTER_NAME); + link->details->display_name = g_settings_get_string (caja_desktop_preferences, CAJA_PREFERENCES_DESKTOP_COMPUTER_NAME); link->details->activation_location = g_file_new_for_uri ("computer:///"); /* TODO: This might need a different icon: */ link->details->icon = g_themed_icon_new (CAJA_ICON_COMPUTER); - eel_preferences_add_callback (CAJA_PREFERENCES_DESKTOP_COMPUTER_NAME, - computer_name_changed, - link); + g_signal_connect_swapped (caja_desktop_preferences, + "changed::" CAJA_PREFERENCES_DESKTOP_COMPUTER_NAME, + G_CALLBACK (computer_name_changed), + link); break; case CAJA_DESKTOP_LINK_TRASH: link->details->filename = g_strdup ("trash"); - link->details->display_name = eel_preferences_get (CAJA_PREFERENCES_DESKTOP_TRASH_NAME); + link->details->display_name = g_settings_get_string (caja_desktop_preferences, CAJA_PREFERENCES_DESKTOP_TRASH_NAME); link->details->activation_location = g_file_new_for_uri (EEL_TRASH_URI); link->details->icon = caja_trash_monitor_get_icon (); - eel_preferences_add_callback (CAJA_PREFERENCES_DESKTOP_TRASH_NAME, - trash_name_changed, - link); + g_signal_connect_swapped (caja_desktop_preferences, + "changed::" CAJA_PREFERENCES_DESKTOP_TRASH_NAME, + G_CALLBACK (trash_name_changed), + link); link->details->signal_handler_obj = G_OBJECT (caja_trash_monitor_get ()); link->details->signal_handler = g_signal_connect_object (caja_trash_monitor_get (), "trash_state_changed", @@ -215,13 +232,14 @@ caja_desktop_link_new (CajaDesktopLinkType type) case CAJA_DESKTOP_LINK_NETWORK: link->details->filename = g_strdup ("network"); - link->details->display_name = eel_preferences_get (CAJA_PREFERENCES_DESKTOP_NETWORK_NAME); + link->details->display_name = g_settings_get_string (caja_desktop_preferences, CAJA_PREFERENCES_DESKTOP_NETWORK_NAME); link->details->activation_location = g_file_new_for_uri ("network:///"); link->details->icon = g_themed_icon_new (CAJA_ICON_NETWORK); - eel_preferences_add_callback (CAJA_PREFERENCES_DESKTOP_NETWORK_NAME, - network_name_changed, - link); + g_signal_connect_swapped (caja_desktop_preferences, + "changed::" CAJA_PREFERENCES_DESKTOP_NETWORK_NAME, + G_CALLBACK (network_name_changed), + link); break; default: @@ -366,20 +384,24 @@ caja_desktop_link_rename (CajaDesktopLink *link, switch (link->details->type) { case CAJA_DESKTOP_LINK_HOME: - eel_preferences_set (CAJA_PREFERENCES_DESKTOP_HOME_NAME, - name); + g_settings_set_string (caja_desktop_preferences, + CAJA_PREFERENCES_DESKTOP_HOME_NAME, + name); break; case CAJA_DESKTOP_LINK_COMPUTER: - eel_preferences_set (CAJA_PREFERENCES_DESKTOP_COMPUTER_NAME, - name); + g_settings_set_string (caja_desktop_preferences, + CAJA_PREFERENCES_DESKTOP_COMPUTER_NAME, + name); break; case CAJA_DESKTOP_LINK_TRASH: - eel_preferences_set (CAJA_PREFERENCES_DESKTOP_TRASH_NAME, - name); + g_settings_set_string (caja_desktop_preferences, + CAJA_PREFERENCES_DESKTOP_TRASH_NAME, + name); break; case CAJA_DESKTOP_LINK_NETWORK: - eel_preferences_set (CAJA_PREFERENCES_DESKTOP_NETWORK_NAME, - name); + g_settings_set_string (caja_desktop_preferences, + CAJA_PREFERENCES_DESKTOP_NETWORK_NAME, + name); break; default: g_assert_not_reached (); @@ -421,28 +443,28 @@ desktop_link_finalize (GObject *object) if (link->details->type == CAJA_DESKTOP_LINK_HOME) { - eel_preferences_remove_callback (CAJA_PREFERENCES_DESKTOP_HOME_NAME, + g_signal_handlers_disconnect_by_func (caja_desktop_preferences, home_name_changed, link); } if (link->details->type == CAJA_DESKTOP_LINK_COMPUTER) { - eel_preferences_remove_callback (CAJA_PREFERENCES_DESKTOP_COMPUTER_NAME, + g_signal_handlers_disconnect_by_func (caja_desktop_preferences, computer_name_changed, link); } if (link->details->type == CAJA_DESKTOP_LINK_TRASH) { - eel_preferences_remove_callback (CAJA_PREFERENCES_DESKTOP_TRASH_NAME, + g_signal_handlers_disconnect_by_func (caja_desktop_preferences, trash_name_changed, link); } if (link->details->type == CAJA_DESKTOP_LINK_NETWORK) { - eel_preferences_remove_callback (CAJA_PREFERENCES_DESKTOP_NETWORK_NAME, + g_signal_handlers_disconnect_by_func (caja_desktop_preferences, network_name_changed, link); } -- cgit v1.2.1