From 9c6c6273c3d53e1581e176d8fe5fe50932ad592c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 17 Jan 2011 11:42:47 -0600 Subject: Switching dbus names and interfaces --- src/datetime-service.xml | 2 +- src/dbus-shared.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/datetime-service.xml b/src/datetime-service.xml index 1207ebb..eda064f 100644 --- a/src/datetime-service.xml +++ b/src/datetime-service.xml @@ -1,6 +1,6 @@ - + diff --git a/src/dbus-shared.h b/src/dbus-shared.h index 357beb5..e6dc241 100644 --- a/src/dbus-shared.h +++ b/src/dbus-shared.h @@ -20,12 +20,12 @@ with this program. If not, see . */ -#define SERVICE_NAME "org.ayatana.indicator.datetime" -#define SERVICE_IFACE "org.ayatana.indicator.datetime.service" -#define SERVICE_OBJ "/org/ayatana/indicator/datetime/service" +#define SERVICE_NAME "com.canonical.indicator.datetime" +#define SERVICE_IFACE "com.canonical.indicator.datetime.service" +#define SERVICE_OBJ "/com/canonical/indicator/datetime/service" #define SERVICE_VERSION 1 -#define MENU_OBJ "/org/ayatana/indicator/datetime/menu" +#define MENU_OBJ "/com/canonical/indicator/datetime/menu" #define DBUSMENU_CALENDAR_MENUITEM_TYPE "x-canonical-calendar-item" -- cgit v1.2.3 From b52833fecbe711340e9854691bbd5af1f0fda46c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 17 Jan 2011 11:48:18 -0600 Subject: Changing the GSettings interface --- src/indicator-datetime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/indicator-datetime.c b/src/indicator-datetime.c index c3b7e4a..377cf17 100644 --- a/src/indicator-datetime.c +++ b/src/indicator-datetime.c @@ -108,7 +108,7 @@ enum { #define PROP_SHOW_DATE_S "show-date" #define PROP_CUSTOM_TIME_FORMAT_S "custom-time-format" -#define SETTINGS_INTERFACE "org.ayatana.indicator.datetime" +#define SETTINGS_INTERFACE "com.canonical.indicator.datetime" #define SETTINGS_TIME_FORMAT_S "time-format" #define SETTINGS_SHOW_SECONDS_S "show-seconds" #define SETTINGS_SHOW_DAY_S "show-day" -- cgit v1.2.3 From 5d546ac1d21e12538076d136b899b92c937cb479 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 17 Jan 2011 11:59:06 -0600 Subject: Adding a log domain --- src/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 5e3625d..7a290c6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,7 +13,8 @@ indicator_datetime_service_CFLAGS = \ -Wall \ -Werror \ $(SERVICE_CFLAGS) \ - -DTIMEZONE_FILE="\"/etc/timezone\"" + -DTIMEZONE_FILE="\"/etc/timezone\"" \ + -DG_LOG_DOMAIN=\"Indicator-Datetime\" indicator_datetime_service_LDADD = \ $(SERVICE_LIBS) @@ -25,7 +26,8 @@ libdatetime_la_SOURCES = \ indicator-datetime.c libdatetime_la_CFLAGS = \ $(INDICATOR_CFLAGS) \ - -Wall -Werror + -Wall -Werror \ + -DG_LOG_DOMAIN=\"Indicator-Datetime\" libdatetime_la_LIBADD = \ $(INDICATOR_LIBS) libdatetime_la_LDFLAGS = \ -- cgit v1.2.3 From 2fdb33981e70fa164dbcb098bad1b7231e9698d8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 27 Jan 2011 16:34:06 -0600 Subject: Fixing type callback prototype and bumping dbusmenu version --- src/indicator-datetime.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/indicator-datetime.c b/src/indicator-datetime.c index 377cf17..c386300 100644 --- a/src/indicator-datetime.c +++ b/src/indicator-datetime.c @@ -1058,7 +1058,8 @@ generate_format_string (IndicatorDatetime * self) static gboolean new_calendar_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, - DbusmenuClient * client) + DbusmenuClient * client, + gpointer user_data) { g_return_val_if_fail(DBUSMENU_IS_MENUITEM(newitem), FALSE); g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), FALSE); -- cgit v1.2.3