summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrbuj <[email protected]>2020-01-29 17:10:12 +0100
committermonsta <[email protected]>2020-03-04 13:12:42 +0300
commit68c7e9230d4b1e4afa89e7cd758588b075183568 (patch)
treefc6c4aa70243e95362518d182dd26a61ad376793
parent3cc694a1060a2816c0edbee1ddc9581ad9bfe57b (diff)
downloadmate-applets-68c7e9230d4b1e4afa89e7cd758588b075183568.tar.bz2
mate-applets-68c7e9230d4b1e4afa89e7cd758588b075183568.tar.xz
Fix build using gcc 10 -fno-common flag
-rw-r--r--drivemount/drive-list.c4
-rw-r--r--drivemount/drive-list.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/drivemount/drive-list.c b/drivemount/drive-list.c
index a20e1329..1b3679b3 100644
--- a/drivemount/drive-list.c
+++ b/drivemount/drive-list.c
@@ -32,6 +32,8 @@
G_DEFINE_TYPE (DriveList, drive_list, GTK_TYPE_GRID);
+GSettings *settings;
+
static GVolumeMonitor *volume_monitor = NULL;
static void drive_list_finalize (GObject *object);
@@ -153,6 +155,8 @@ drive_list_finalize (GObject *object)
g_hash_table_destroy (self->volumes);
g_hash_table_destroy (self->mounts);
+ g_object_unref (settings);
+
if (G_OBJECT_CLASS (drive_list_parent_class)->finalize)
(* G_OBJECT_CLASS (drive_list_parent_class)->finalize) (object);
}
diff --git a/drivemount/drive-list.h b/drivemount/drive-list.h
index c7e844dd..ea55b908 100644
--- a/drivemount/drive-list.h
+++ b/drivemount/drive-list.h
@@ -65,7 +65,7 @@ void drive_list_set_panel_size (DriveList *list,
int panel_size);
void drive_list_set_transparent (DriveList *self,
gboolean transparent);
-GSettings *settings;
+extern GSettings *settings;
void drive_list_redraw (DriveList *self);
void settings_color_changed (GSettings *settings, gchar *key, DriveList *drive_list);