From ca7b6632c336ee7fa991ffaa8b851491d558e70b Mon Sep 17 00:00:00 2001
From: Jasmine Hassan <jasmine.aura@gmail.com>
Date: Tue, 4 Dec 2012 19:03:17 +0200
Subject: [daemon] quick 'n dirty initial review of gsettings port

1. import: Don't choke if there are old plugins laying around
http://git.gnome.org/browse/gnome-settings-daemon/commit/?id=18e57e126ff6a6ab2980c119aebef087227e2a54

2. Alleviate #23 -- no more "g_object_unref: assertion 'G_IS_OBJECT (object)' failed"
when starting m-c-c "Appearance" properties.
---
 plugins/housekeeping/msd-disk-space.c       | 1 -
 plugins/housekeeping/msd-ldsm-trash-empty.c | 1 -
 2 files changed, 2 deletions(-)

(limited to 'plugins/housekeeping')

diff --git a/plugins/housekeeping/msd-disk-space.c b/plugins/housekeeping/msd-disk-space.c
index f419658..3065b39 100644
--- a/plugins/housekeeping/msd-disk-space.c
+++ b/plugins/housekeeping/msd-disk-space.c
@@ -35,7 +35,6 @@
 #include <gio/gunixmounts.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
-#include <gio/gio.h>
 
 #include "msd-disk-space.h"
 #include "msd-ldsm-dialog.h"
diff --git a/plugins/housekeeping/msd-ldsm-trash-empty.c b/plugins/housekeeping/msd-ldsm-trash-empty.c
index e218d6d..af01aa1 100644
--- a/plugins/housekeeping/msd-ldsm-trash-empty.c
+++ b/plugins/housekeeping/msd-ldsm-trash-empty.c
@@ -18,7 +18,6 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <gio/gio.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 
-- 
cgit v1.2.1


From 6e182dc5cdb3451a4ec4bd443b1159df318541c8 Mon Sep 17 00:00:00 2001
From: Jasmine Hassan <jasmine.aura@gmail.com>
Date: Wed, 5 Dec 2012 02:55:27 +0200
Subject: [plugins] cleanup macro magic in plugin.h

And instead, use glib macros (since 2.14)

http://git.gnome.org/browse/gnome-settings-daemon/commit/?id=0dda56c4462e070dabdab68092b6574b5e894181
---
 plugins/housekeeping/msd-housekeeping-plugin.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'plugins/housekeeping')

diff --git a/plugins/housekeeping/msd-housekeeping-plugin.c b/plugins/housekeeping/msd-housekeeping-plugin.c
index 9d5c407..40cd547 100644
--- a/plugins/housekeeping/msd-housekeeping-plugin.c
+++ b/plugins/housekeeping/msd-housekeeping-plugin.c
@@ -102,3 +102,9 @@ msd_housekeeping_plugin_class_init (MsdHousekeepingPluginClass *klass)
 
         g_type_class_add_private (klass, sizeof (MsdHousekeepingPluginPrivate));
 }
+
+static void
+msd_housekeeping_plugin_class_finalize (MsdHousekeepingPluginClass *klass)
+{
+}
+
-- 
cgit v1.2.1