diff options
| author | rbuj <[email protected]> | 2020-01-30 10:56:12 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2020-02-01 14:58:29 +0100 |
| commit | 6bf49f348d8ce6debc8f645b667422bb9a261a2b (patch) | |
| tree | eab422c9a14238d97cf3bdbca55eb86f58ba6cb0 | |
| parent | ca7cecc5ce724bc91e1a3d0f8dd59ca802180ff4 (diff) | |
| download | caja-6bf49f348d8ce6debc8f645b667422bb9a261a2b.tar.bz2 caja-6bf49f348d8ce6debc8f645b667422bb9a261a2b.tar.xz | |
Fix build using gcc 10 -fno-common flag
| -rw-r--r-- | eel/eel-background.c | 6 | ||||
| -rw-r--r-- | libcaja-private/caja-global-preferences.c | 13 | ||||
| -rw-r--r-- | libcaja-private/caja-global-preferences.h | 24 |
3 files changed, 29 insertions, 14 deletions
diff --git a/eel/eel-background.c b/eel/eel-background.c index 152f1cb3..4d2d1e0c 100644 --- a/eel/eel-background.c +++ b/eel/eel-background.c @@ -32,8 +32,6 @@ #include <math.h> #include <stdio.h> -#include <libcaja-private/caja-global-preferences.h> - #include "eel-background.h" #include "eel-gdk-extensions.h" #include "eel-glib-extensions.h" @@ -431,6 +429,7 @@ set_root_surface (EelBackground *self, static void init_fade (EelBackground *self) { + GSettings *mate_background_preferences; GtkWidget *widget = self->details->widget; gboolean do_fade; @@ -438,8 +437,11 @@ init_fade (EelBackground *self) return; } + mate_background_preferences = g_settings_new ("org.mate.background"); do_fade = g_settings_get_boolean (mate_background_preferences, MATE_BG_KEY_BACKGROUND_FADE); + g_object_unref (mate_background_preferences); + if (!do_fade) { return; } diff --git a/libcaja-private/caja-global-preferences.c b/libcaja-private/caja-global-preferences.c index 2d3c3466..2f1d9088 100644 --- a/libcaja-private/caja-global-preferences.c +++ b/libcaja-private/caja-global-preferences.c @@ -35,6 +35,19 @@ #include "caja-file-utilities.h" #include "caja-file.h" +GSettings *caja_preferences; +GSettings *caja_media_preferences; +GSettings *caja_window_state; +GSettings *caja_icon_view_preferences; +GSettings *caja_desktop_preferences; +GSettings *caja_tree_sidebar_preferences; +GSettings *caja_compact_view_preferences; +GSettings *caja_list_view_preferences; +GSettings *caja_extension_preferences; + +GSettings *mate_background_preferences; +GSettings *mate_lockdown_preferences; + /* * Public functions */ diff --git a/libcaja-private/caja-global-preferences.h b/libcaja-private/caja-global-preferences.h index 2eec02b4..83281157 100644 --- a/libcaja-private/caja-global-preferences.h +++ b/libcaja-private/caja-global-preferences.h @@ -212,18 +212,18 @@ typedef enum void caja_global_preferences_init (void); char *caja_global_preferences_get_default_folder_viewer_preference_as_iid (void); -GSettings *caja_preferences; -GSettings *caja_media_preferences; -GSettings *caja_window_state; -GSettings *caja_icon_view_preferences; -GSettings *caja_desktop_preferences; -GSettings *caja_tree_sidebar_preferences; -GSettings *caja_compact_view_preferences; -GSettings *caja_list_view_preferences; -GSettings *caja_extension_preferences; - -GSettings *mate_background_preferences; -GSettings *mate_lockdown_preferences; +extern GSettings *caja_preferences; +extern GSettings *caja_media_preferences; +extern GSettings *caja_window_state; +extern GSettings *caja_icon_view_preferences; +extern GSettings *caja_desktop_preferences; +extern GSettings *caja_tree_sidebar_preferences; +extern GSettings *caja_compact_view_preferences; +extern GSettings *caja_list_view_preferences; +extern GSettings *caja_extension_preferences; + +extern GSettings *mate_background_preferences; +extern GSettings *mate_lockdown_preferences; G_END_DECLS |