Indicator Date and Time

Merge lp:~rodrigo-moya/indicator-datetime/run-gcc-datetime into lp:indicator-datetime/0.3

  1. run-gcc-datetime
  2. Merge into trunk
Proposed by Rodrigo Moya
Status: Merged
Merged at revision: 115
Proposed branch: lp:~rodrigo-moya/indicator-datetime/run-gcc-datetime
Merge into: lp:indicator-datetime/0.3
Diff against target: 54 lines (+7/-7)
2 files modified
src/datetime-service.c (+5/-5)
src/indicator-datetime.c (+2/-2)
To merge this branch: bzr merge lp:~rodrigo-moya/indicator-datetime/run-gcc-datetime
Reviewer Review Type Date Requested Status
Indicator Applet Developers Pending
Review via email: mp+66286@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/datetime-service.c'
2--- src/datetime-service.c 2011-04-13 19:32:18 +0000
3+++ src/datetime-service.c 2011-06-29 12:01:42 +0000
4@@ -30,7 +30,7 @@
5 #include <math.h>
6 #include <gconf/gconf-client.h>
7
8-#include <libdbusmenu-gtk/menuitem.h>
9+#include <libdbusmenu-gtk3/menuitem.h>
10 #include <libdbusmenu-glib/server.h>
11 #include <libdbusmenu-glib/client.h>
12 #include <libdbusmenu-glib/menuitem.h>
13@@ -1040,13 +1040,13 @@
14 {
15 g_return_val_if_fail (settings != NULL, FALSE);
16
17- gchar * timeadmin = g_find_program_in_path("indicator-datetime-preferences");
18+ gchar * timeadmin = g_find_program_in_path("gnome-control-center");
19 if (timeadmin != NULL) {
20- g_debug("Found the indicator-datetime-preferences application: %s", timeadmin);
21+ g_debug("Found the gnome-control-center application: %s", timeadmin);
22 dbusmenu_menuitem_property_set_bool(settings, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
23 g_free(timeadmin);
24 } else {
25- g_debug("Unable to find indicator-datetime-preferences app.");
26+ g_debug("Unable to find gnome-control-center app.");
27 dbusmenu_menuitem_property_set_bool(settings, DBUSMENU_MENUITEM_PROP_ENABLED, FALSE);
28 }
29
30@@ -1129,7 +1129,7 @@
31 dbusmenu_menuitem_property_set (settings, DBUSMENU_MENUITEM_PROP_LABEL, _("Time & Date Settings..."));
32 /* insensitive until we check for available apps */
33 dbusmenu_menuitem_property_set_bool(settings, DBUSMENU_MENUITEM_PROP_ENABLED, FALSE);
34- g_signal_connect(G_OBJECT(settings), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), "indicator-datetime-preferences");
35+ g_signal_connect(G_OBJECT(settings), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), "gnome-control-center datetime");
36 dbusmenu_menuitem_child_append(root, settings);
37 g_idle_add(check_for_timeadmin, NULL);
38
39
40=== modified file 'src/indicator-datetime.c'
41--- src/indicator-datetime.c 2011-06-05 18:45:28 +0000
42+++ src/indicator-datetime.c 2011-06-29 12:01:42 +0000
43@@ -41,9 +41,9 @@
44 #include <libindicator/indicator-service-manager.h>
45
46 /* DBusMenu */
47-#include <libdbusmenu-gtk/menu.h>
48+#include <libdbusmenu-gtk3/menu.h>
49 #include <libido/libido.h>
50-#include <libdbusmenu-gtk/menuitem.h>
51+#include <libdbusmenu-gtk3/menuitem.h>
52
53 #include "utils.h"
54 #include "dbus-shared.h"

Subscribers

People subscribed via source and target branches