diff options
| author | Stefano Karapetsas <[email protected]> | 2012-09-05 20:48:07 +0200 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-09-05 20:48:07 +0200 |
| commit | e4a0de637eb7c3ae3bbbcbe323c3f858161487e9 (patch) | |
| tree | 0ac2f5f4fb42027b1eecb8bea5c0b9618bfa29c7 | |
| parent | e13142565949e577ae589c0e93527b6698614281 (diff) | |
| download | caja-e4a0de637eb7c3ae3bbbcbe323c3f858161487e9.tar.bz2 caja-e4a0de637eb7c3ae3bbbcbe323c3f858161487e9.tar.xz | |
move desktop-font preference to desktop settings
| -rw-r--r-- | libcaja-private/caja-global-preferences.h | 2 | ||||
| -rw-r--r-- | libcaja-private/org.mate.caja.gschema.xml.in | 10 | ||||
| -rw-r--r-- | src/file-manager/fm-desktop-icon-view.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/libcaja-private/caja-global-preferences.h b/libcaja-private/caja-global-preferences.h index a05bc049..ab961cb9 100644 --- a/libcaja-private/caja-global-preferences.h +++ b/libcaja-private/caja-global-preferences.h @@ -61,7 +61,6 @@ G_BEGIN_DECLS /* Desktop options */ #define CAJA_PREFERENCES_SHOW_DESKTOP "show-desktop" #define CAJA_PREFERENCES_DESKTOP_IS_HOME_DIR "desktop-is-home-dir" -#define CAJA_PREFERENCES_DESKTOP_FONT "desktop-font" /* Display */ #define CAJA_PREFERENCES_SHOW_HIDDEN_FILES "show-hidden-files" @@ -195,6 +194,7 @@ G_BEGIN_DECLS CAJA_SIMPLE_SEARCH_BAR } CajaSearchBarMode; +#define CAJA_PREFERENCES_DESKTOP_FONT "font" #define CAJA_PREFERENCES_DESKTOP_HOME_VISIBLE "home-icon-visible" #define CAJA_PREFERENCES_DESKTOP_HOME_NAME "home-icon-name" #define CAJA_PREFERENCES_DESKTOP_COMPUTER_VISIBLE "computer-icon-visible" diff --git a/libcaja-private/org.mate.caja.gschema.xml.in b/libcaja-private/org.mate.caja.gschema.xml.in index f0357242..1885fdea 100644 --- a/libcaja-private/org.mate.caja.gschema.xml.in +++ b/libcaja-private/org.mate.caja.gschema.xml.in @@ -186,11 +186,6 @@ <_summary>Caja handles drawing the desktop</_summary> <_description>If set to true, then Caja will draw the icons on the desktop.</_description> </key> - <key name="desktop-font" type="s"> - <default l10n="messages" context="desktop-font">''</default> - <_summary>Desktop font</_summary> - <_description>The font _description used for the icons on the desktop.</_description> - </key> <key name="desktop-is-home-dir" type="b"> <default>false</default> <_summary>Caja uses the users home folder as the desktop</_summary> @@ -347,6 +342,11 @@ </schema> <schema id="org.mate.caja.desktop" path="/apps/caja/desktop/" gettext-domain="caja"> + <key name="font" type="s"> + <default l10n="messages" context="desktop-font">''</default> + <_summary>Desktop font</_summary> + <_description>The font _description used for the icons on the desktop.</_description> + </key> <key name="home-icon-visible" type="b"> <default>true</default> <_summary>Home icon visible on desktop</_summary> diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c index fe339316..3972b343 100644 --- a/src/file-manager/fm-desktop-icon-view.c +++ b/src/file-manager/fm-desktop-icon-view.c @@ -540,7 +540,7 @@ fm_desktop_icon_view_update_icon_container_fonts (FMDesktopIconView *icon_view) icon_container = get_icon_container (icon_view); g_assert (icon_container != NULL); - font = g_settings_get_string (caja_preferences, CAJA_PREFERENCES_DESKTOP_FONT); + font = g_settings_get_string (caja_desktop_preferences, CAJA_PREFERENCES_DESKTOP_FONT); caja_icon_container_set_font (icon_container, font); @@ -625,7 +625,7 @@ fm_desktop_icon_view_init (FMDesktopIconView *desktop_icon_view) G_CALLBACK (default_zoom_level_changed), desktop_icon_view); - g_signal_connect_swapped (caja_preferences, + g_signal_connect_swapped (caja_desktop_preferences, "changed::" CAJA_PREFERENCES_DESKTOP_FONT, G_CALLBACK (font_changed_callback), desktop_icon_view); |