diff options
| author | Stefano Karapetsas <[email protected]> | 2012-10-18 00:41:22 +0200 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-10-18 00:41:22 +0200 |
| commit | 0d19a66abfe03ffcfaca0f2539a9c6758d99a823 (patch) | |
| tree | 57b625468b37127897cfdfd3650fb2f7f05ba091 | |
| parent | 49d65611edf1a28df001fef2fa9896919544729d (diff) | |
| parent | e2acedc27aa5859db9f9450eb09290c366f35d26 (diff) | |
| download | mate-control-center-0d19a66abfe03ffcfaca0f2539a9c6758d99a823.tar.bz2 mate-control-center-0d19a66abfe03ffcfaca0f2539a9c6758d99a823.tar.xz | |
Merge branch 'master' of github.com:mate-desktop/mate-control-center
| -rw-r--r-- | capplets/about-me/mate-about-me.c | 1 | ||||
| -rw-r--r-- | capplets/windows/mate-window-properties.c | 1 | ||||
| -rw-r--r-- | shell/control-center.c | 2 | ||||
| -rw-r--r-- | shell/matecc.desktop.in.in | 2 |
4 files changed, 2 insertions, 4 deletions
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> 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 { 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 |