diff options
| author | Stefano Karapetsas <[email protected]> | 2012-12-03 14:20:22 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-12-03 14:20:22 -0800 |
| commit | a7aa069036f960a37cc6149ecdceab917dffa7a0 (patch) | |
| tree | b47b0816e8ed67229eb5c5fb6de5b2178889ed12 /src/caja-application.c | |
| parent | 12908bcb598233adabd7492d92efdda3d2cbc47c (diff) | |
| parent | 2665b684fda835cfa6a485b6e2c8c0a98190facb (diff) | |
| download | caja-a7aa069036f960a37cc6149ecdceab917dffa7a0.tar.bz2 caja-a7aa069036f960a37cc6149ecdceab917dffa7a0.tar.xz | |
Merge pull request #63 from jasmineaura/develop
Bring Caja up to speed, stage2
Diffstat (limited to 'src/caja-application.c')
| -rw-r--r-- | src/caja-application.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/caja-application.c b/src/caja-application.c index 47a956c4..f09e2720 100644 --- a/src/caja-application.c +++ b/src/caja-application.c @@ -74,6 +74,8 @@ #include <libcaja-private/caja-signaller.h> #include <libcaja-extension/caja-menu-provider.h> #include <libcaja-private/caja-autorun.h> +#define MATE_DESKTOP_USE_UNSTABLE_API +#include <libmateui/mate-bg.h> #include "glibcompat.h" /* for g_list_free_full */ @@ -964,7 +966,7 @@ caja_application_startup (CajaApplication *application, char *accel_map_filename; if (!no_desktop && - !g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_SHOW_DESKTOP)) + !g_settings_get_boolean (mate_background_preferences, MATE_BG_KEY_SHOW_DESKTOP)) { no_desktop = TRUE; } @@ -989,7 +991,8 @@ caja_application_startup (CajaApplication *application, } /* Monitor the preference to show or hide the desktop */ - g_signal_connect_swapped (caja_preferences, "changed::" CAJA_PREFERENCES_SHOW_DESKTOP, + g_signal_connect_swapped (mate_background_preferences, + "changed::" MATE_BG_KEY_SHOW_DESKTOP, G_CALLBACK(desktop_changed_callback), G_OBJECT (application)); @@ -1567,7 +1570,7 @@ desktop_changed_callback (gpointer user_data) CajaApplication *application; application = CAJA_APPLICATION (user_data); - if (g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_SHOW_DESKTOP)) + if (g_settings_get_boolean (mate_background_preferences, MATE_BG_KEY_SHOW_DESKTOP)) { caja_application_open_desktop (application); } |