diff options
| author | Rodrigo Moya <rodrigo.moya@canonical.com> | 2011-06-29 13:57:36 +0200 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo.moya@canonical.com> | 2011-06-29 13:57:36 +0200 |
| commit | 6cc4cde622ebdc0c00426c8c77f059f7a973b723 (patch) | |
| tree | 6f2696c43a38bb08d6c9b6f7ed116bf6e3cd80cd | |
| parent | 3c5f6a06ff0e44945f788254c44ede18f4061724 (diff) | |
| download | ayatana-indicator-datetime-6cc4cde622ebdc0c00426c8c77f059f7a973b723.tar.gz ayatana-indicator-datetime-6cc4cde622ebdc0c00426c8c77f059f7a973b723.tar.bz2 ayatana-indicator-datetime-6cc4cde622ebdc0c00426c8c77f059f7a973b723.zip | |
Use gnome-control-center datetime panel for settings
| -rw-r--r-- | src/datetime-service.c | 10 | ||||
| -rw-r--r-- | src/indicator-datetime.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/datetime-service.c b/src/datetime-service.c index 08ff9ad..ff4306e 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -30,7 +30,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <math.h> #include <gconf/gconf-client.h> -#include <libdbusmenu-gtk/menuitem.h> +#include <libdbusmenu-gtk3/menuitem.h> #include <libdbusmenu-glib/server.h> #include <libdbusmenu-glib/client.h> #include <libdbusmenu-glib/menuitem.h> @@ -1040,13 +1040,13 @@ check_for_timeadmin (gpointer user_data) { g_return_val_if_fail (settings != NULL, FALSE); - gchar * timeadmin = g_find_program_in_path("indicator-datetime-preferences"); + gchar * timeadmin = g_find_program_in_path("gnome-control-center"); if (timeadmin != NULL) { - g_debug("Found the indicator-datetime-preferences application: %s", timeadmin); + g_debug("Found the gnome-control-center application: %s", timeadmin); dbusmenu_menuitem_property_set_bool(settings, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE); g_free(timeadmin); } else { - g_debug("Unable to find indicator-datetime-preferences app."); + g_debug("Unable to find gnome-control-center app."); dbusmenu_menuitem_property_set_bool(settings, DBUSMENU_MENUITEM_PROP_ENABLED, FALSE); } @@ -1129,7 +1129,7 @@ build_menus (DbusmenuMenuitem * root) dbusmenu_menuitem_property_set (settings, DBUSMENU_MENUITEM_PROP_LABEL, _("Time & Date Settings...")); /* insensitive until we check for available apps */ dbusmenu_menuitem_property_set_bool(settings, DBUSMENU_MENUITEM_PROP_ENABLED, FALSE); - g_signal_connect(G_OBJECT(settings), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), "indicator-datetime-preferences"); + g_signal_connect(G_OBJECT(settings), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), "gnome-control-center datetime"); dbusmenu_menuitem_child_append(root, settings); g_idle_add(check_for_timeadmin, NULL); diff --git a/src/indicator-datetime.c b/src/indicator-datetime.c index 800fa87..19f0010 100644 --- a/src/indicator-datetime.c +++ b/src/indicator-datetime.c @@ -41,9 +41,9 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <libindicator/indicator-service-manager.h> /* DBusMenu */ -#include <libdbusmenu-gtk/menu.h> +#include <libdbusmenu-gtk3/menu.h> #include <libido/libido.h> -#include <libdbusmenu-gtk/menuitem.h> +#include <libdbusmenu-gtk3/menuitem.h> #include "utils.h" #include "dbus-shared.h" |