|
Line 0
Link Here
|
|
|
1 |
From 6bf49f348d8ce6debc8f645b667422bb9a261a2b Mon Sep 17 00:00:00 2001 |
| 2 |
From: rbuj <robert.buj@gmail.com> |
| 3 |
Date: Thu, 30 Jan 2020 10:56:12 +0100 |
| 4 |
Subject: [PATCH] Fix build using gcc 10 -fno-common flag |
| 5 |
|
| 6 |
--- eel/eel-background.c.orig 2019-12-23 17:17:34 UTC |
| 7 |
+++ eel/eel-background.c |
| 8 |
@@ -36,7 +36,6 @@ |
| 9 |
#include <gio/gio.h> |
| 10 |
#include <math.h> |
| 11 |
#include <stdio.h> |
| 12 |
-#include <libcaja-private/caja-global-preferences.h> |
| 13 |
|
| 14 |
enum |
| 15 |
{ |
| 16 |
@@ -427,6 +426,7 @@ set_root_surface (EelBackground *self, |
| 17 |
static void |
| 18 |
init_fade (EelBackground *self) |
| 19 |
{ |
| 20 |
+ GSettings *mate_background_preferences; |
| 21 |
GtkWidget *widget = self->details->widget; |
| 22 |
gboolean do_fade; |
| 23 |
|
| 24 |
@@ -434,8 +434,11 @@ init_fade (EelBackground *self) |
| 25 |
return; |
| 26 |
} |
| 27 |
|
| 28 |
+ mate_background_preferences = g_settings_new ("org.mate.background"); |
| 29 |
do_fade = g_settings_get_boolean (mate_background_preferences, |
| 30 |
MATE_BG_KEY_BACKGROUND_FADE); |
| 31 |
+ g_object_unref (mate_background_preferences); |
| 32 |
+ |
| 33 |
if (!do_fade) { |
| 34 |
return; |
| 35 |
} |
| 36 |
eel/eel-background.c | 6 ++++-- |
| 37 |
libcaja-private/caja-global-preferences.c | 13 ++++++++++++ |
| 38 |
libcaja-private/caja-global-preferences.h | 24 +++++++++++------------ |
| 39 |
3 files changed, 29 insertions(+), 14 deletions(-) |
| 40 |
|
| 41 |
--- libcaja-private/caja-global-preferences.c.orig 2019-12-23 17:17:34 UTC |
| 42 |
+++ libcaja-private/caja-global-preferences.c |
| 43 |
@@ -34,6 +34,19 @@ |
| 44 |
#include <eel/eel-string.h> |
| 45 |
#include <glib/gi18n.h> |
| 46 |
|
| 47 |
+GSettings *caja_preferences; |
| 48 |
+GSettings *caja_media_preferences; |
| 49 |
+GSettings *caja_window_state; |
| 50 |
+GSettings *caja_icon_view_preferences; |
| 51 |
+GSettings *caja_desktop_preferences; |
| 52 |
+GSettings *caja_tree_sidebar_preferences; |
| 53 |
+GSettings *caja_compact_view_preferences; |
| 54 |
+GSettings *caja_list_view_preferences; |
| 55 |
+GSettings *caja_extension_preferences; |
| 56 |
+ |
| 57 |
+GSettings *mate_background_preferences; |
| 58 |
+GSettings *mate_lockdown_preferences; |
| 59 |
+ |
| 60 |
/* |
| 61 |
* Public functions |
| 62 |
*/ |
| 63 |
--- libcaja-private/caja-global-preferences.h.orig 2019-12-23 17:17:34 UTC |
| 64 |
+++ libcaja-private/caja-global-preferences.h |
| 65 |
@@ -211,18 +211,18 @@ typedef enum |
| 66 |
void caja_global_preferences_init (void); |
| 67 |
char *caja_global_preferences_get_default_folder_viewer_preference_as_iid (void); |
| 68 |
|
| 69 |
-GSettings *caja_preferences; |
| 70 |
-GSettings *caja_media_preferences; |
| 71 |
-GSettings *caja_window_state; |
| 72 |
-GSettings *caja_icon_view_preferences; |
| 73 |
-GSettings *caja_desktop_preferences; |
| 74 |
-GSettings *caja_tree_sidebar_preferences; |
| 75 |
-GSettings *caja_compact_view_preferences; |
| 76 |
-GSettings *caja_list_view_preferences; |
| 77 |
-GSettings *caja_extension_preferences; |
| 78 |
+extern GSettings *caja_preferences; |
| 79 |
+extern GSettings *caja_media_preferences; |
| 80 |
+extern GSettings *caja_window_state; |
| 81 |
+extern GSettings *caja_icon_view_preferences; |
| 82 |
+extern GSettings *caja_desktop_preferences; |
| 83 |
+extern GSettings *caja_tree_sidebar_preferences; |
| 84 |
+extern GSettings *caja_compact_view_preferences; |
| 85 |
+extern GSettings *caja_list_view_preferences; |
| 86 |
+extern GSettings *caja_extension_preferences; |
| 87 |
|
| 88 |
-GSettings *mate_background_preferences; |
| 89 |
-GSettings *mate_lockdown_preferences; |
| 90 |
+extern GSettings *mate_background_preferences; |
| 91 |
+extern GSettings *mate_lockdown_preferences; |
| 92 |
|
| 93 |
G_END_DECLS |
| 94 |
|