ayatana-commits team mailing list archive

[Rodrigo Moya <rodrigo.moya@xxxxxxxxxxxxx>]

Rodrigo Moya has proposed merging lp:~rodrigo-moya/indicator-datetime/run-gcc-datetime into lp:indicator-datetime.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)
Related bugs:
  Bug #802947 in gnome-control-center (Ubuntu): "Use same 'date/time' preference in indicator-datetime and gnome-control-center"
  https://bugs.launchpad.net/ubuntu/+source/gnome-control-center/+bug/802947

For more details, see:
https://code.launchpad.net/~rodrigo-moya/indicator-datetime/run-gcc-datetime/+merge/66286
-- 
https://code.launchpad.net/~rodrigo-moya/indicator-datetime/run-gcc-datetime/+merge/66286
Your team ayatana-commits is subscribed to branch lp:indicator-datetime.

=== modified file 'src/datetime-service.c'
--- src/datetime-service.c	2011-04-13 19:32:18 +0000
+++ src/datetime-service.c	2011-06-29 12:01:42 +0000
@@ -30,7 +30,7 @@
 #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 @@
 {
 	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 @@
 	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);
 

=== modified file 'src/indicator-datetime.c'
--- src/indicator-datetime.c	2011-06-05 18:45:28 +0000
+++ src/indicator-datetime.c	2011-06-29 12:01:42 +0000
@@ -41,9 +41,9 @@
 #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"