Updated add type handler functions

8 files changed, 20 insertions, 16 deletions

diff --git a/configure.ac b/configure.ac
index 09ea542..cc96999 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
 
-AC_INIT(indicator-datetime, 0.1.90, ted@canonical.com)
+AC_INIT(indicator-datetime, 0.1.91, ted@canonical.com)
 AC_COPYRIGHT([Copyright 2009,2010 Canonical])
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-datetime, 0.1.90)
+AM_INIT_AUTOMAKE(indicator-datetime, 0.1.91)
 
 AM_MAINTAINER_MODE
 
@@ -53,7 +53,7 @@ AC_ARG_WITH([gtk],
 
 INDICATOR_REQUIRED_VERSION=0.3.0
 DBUSMENUGLIB_REQUIRED_VERSION=0.1.1
-DBUSMENUGTK_REQUIRED_VERSION=0.1.1
+DBUSMENUGTK_REQUIRED_VERSION=0.3.94
 GIO_REQUIRED_VERSION=2.25.11
 # Note: the GIO check below also ensures the proper glib with gsettings support is present
 INDICATOR_DISPLAY_OBJECTS=0.1.10
diff --git a/data/Makefile.am b/data/Makefile.am
index 0e8dec3..de417b2 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,7 @@
 #SUBDIRS = icons
 
 gsettings_SCHEMAS = \
-	org.ayatana.indicator.datetime.gschema.xml
+	com.canonical.indicator.datetime.gschema.xml
 @GSETTINGS_RULES@
 
 dbus_servicesdir = $(DBUSSERVICEDIR)
diff --git a/data/org.ayatana.indicator.datetime.gschema.xml b/data/com.canonical.indicator.datetime.gschema.xml
index 4f071c8..fe493f7 100644
--- a/data/org.ayatana.indicator.datetime.gschema.xml
+++ b/data/com.canonical.indicator.datetime.gschema.xml
@@ -5,7 +5,7 @@
 		<value nick="24-hour" value="2" />
 		<value nick="custom" value="3" />
 	</enum>
-	<schema id="org.ayatana.indicator.datetime" path="/apps/indicators/datetime/" gettext-domain="indicator-datetime">
+	<schema id="com.canonical.indicator.datetime" path="/com/canonical/indicator/datetime/" gettext-domain="indicator-datetime">
 		<key name="time-format" enum="time-enum">
 			<default>'locale-default'</default>
 			<summary>What the time format should be</summary>
diff --git a/data/indicator-datetime.service.in b/data/indicator-datetime.service.in
index bcb70e3..e7735ce 100644
--- a/data/indicator-datetime.service.in
+++ b/data/indicator-datetime.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.ayatana.indicator.datetime
+Name=com.canonical.indicator.datetime
 Exec=@libexecdir@/indicator-datetime-service
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 = \
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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
-	<interface name="org.ayatana.indicator.datetime.service">
+	<interface name="com.canonical.indicator.datetime.service">
 
 <!-- Methods -->
 
diff --git a/src/dbus-shared.h b/src/dbus-shared.h
index 1f90ca7..d13cb32 100644
--- a/src/dbus-shared.h
+++ b/src/dbus-shared.h
@@ -20,12 +20,12 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 
-#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"
 
diff --git a/src/indicator-datetime.c b/src/indicator-datetime.c
index 7aef969..e7a448e 100644
--- a/src/indicator-datetime.c
+++ b/src/indicator-datetime.c
@@ -116,7 +116,7 @@ struct _indicator_item_t {
 #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"
@@ -1190,7 +1190,8 @@ new_appointment_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbu
 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);
@@ -1216,7 +1217,8 @@ new_calendar_item (DbusmenuMenuitem * newitem,
 static gboolean
 new_timezone_item(DbusmenuMenuitem * newitem,
 				   DbusmenuMenuitem * parent,
-				   DbusmenuClient   * client)
+				   DbusmenuClient   * client,
+				   gpointer           user_data)
 {
 	// Menu item with a radio button and a right aligned time