From 4ae29f6925f0ad9e367c30a1659f3bb74fb14dff Mon Sep 17 00:00:00 2001
From: Stefano Karapetsas <stefano@karapetsas.com>
Date: Sun, 14 Oct 2012 00:35:32 +0200
Subject: remove unused mateconf include

---
 capplets/windows/mate-window-properties.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/capplets/windows/mate-window-properties.c b/capplets/windows/mate-window-properties.c
index 7912ee0f..d63789e9 100644
--- a/capplets/windows/mate-window-properties.c
+++ b/capplets/windows/mate-window-properties.c
@@ -33,7 +33,6 @@
 #include <mate-wm-manager.h>
 
 #include "capplet-util.h"
-#include "mateconf-property-editor.h"
 
 typedef struct
 {
-- 
cgit v1.2.1


From 0bd454ddfeb6020b0631781326db897a2dd11c22 Mon Sep 17 00:00:00 2001
From: Stefano Karapetsas <stefano@karapetsas.com>
Date: Sun, 14 Oct 2012 00:38:10 +0200
Subject: remove unused mateconf include

---
 capplets/about-me/mate-about-me.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/capplets/about-me/mate-about-me.c b/capplets/about-me/mate-about-me.c
index 7e55d0ec..0ef9156f 100644
--- a/capplets/about-me/mate-about-me.c
+++ b/capplets/about-me/mate-about-me.c
@@ -25,7 +25,6 @@
 
 #include <glib/gstdio.h>
 #include <gio/gio.h>
-#include <mateconf/mateconf-client.h>
 #include <unistd.h>
 #include <libebook/e-book.h>
 #include <dbus/dbus-glib-bindings.h>
-- 
cgit v1.2.1


From e2acedc27aa5859db9f9450eb09290c366f35d26 Mon Sep 17 00:00:00 2001
From: Stefano Karapetsas <stefano@karapetsas.com>
Date: Wed, 17 Oct 2012 16:21:23 +0200
Subject: control-center: use a generic icon supported by all themes

---
 shell/control-center.c     | 2 +-
 shell/matecc.desktop.in.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/shell/control-center.c b/shell/control-center.c
index 2670c6ea..b25f42d7 100644
--- a/shell/control-center.c
+++ b/shell/control-center.c
@@ -188,7 +188,7 @@ int main(int argc, char* argv[])
 	actions = get_actions_list();
 	layout_shell(app_data, _("Filter"), _("Groups"), _("Common Tasks"), actions, handle_static_action_clicked);
 
-	create_main_window(app_data, "MyControlCenter", _("Control Center"), "mate-control-center", 975, 600, hidden);
+	create_main_window(app_data, "MyControlCenter", _("Control Center"), "preferences-desktop", 975, 600, hidden);
 
 	unique_app_watch_window(unique_app, GTK_WINDOW(app_data->main_app));
 	g_signal_connect(unique_app, "message-received", G_CALLBACK(message_received_cb), app_data);
diff --git a/shell/matecc.desktop.in.in b/shell/matecc.desktop.in.in
index c26b27dd..8f0f3331 100644
--- a/shell/matecc.desktop.in.in
+++ b/shell/matecc.desktop.in.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 _Name=Control Center
 _GenericName=The MATE configuration tool
-Icon=mate-control-center
+Icon=preferences-desktop
 Exec=mate-control-center
 Terminal=false
 Type=Application
-- 
cgit v1.2.1