diff options
| author | karl-qdh <karl@qdh.org.uk> | 2011-01-31 10:32:24 +0000 |
|---|---|---|
| committer | karl-qdh <karl@qdh.org.uk> | 2011-01-31 10:32:24 +0000 |
| commit | 12f38653661221531efa57287f1ef7410ae68935 (patch) | |
| tree | c34811312305081e1cceaa233de8e1461decc19b /src | |
| parent | 93a2d0e1f1b238e2c77eaa2ceb0070d92c72b317 (diff) | |
| parent | aaae5863299681153898d4e701f44aed85c780e9 (diff) | |
| download | ayatana-indicator-datetime-12f38653661221531efa57287f1ef7410ae68935.tar.gz ayatana-indicator-datetime-12f38653661221531efa57287f1ef7410ae68935.tar.bz2 ayatana-indicator-datetime-12f38653661221531efa57287f1ef7410ae68935.zip | |
Updated add type handler functions
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/datetime-service.xml | 2 | ||||
| -rw-r--r-- | src/dbus-shared.h | 8 | ||||
| -rw-r--r-- | src/indicator-datetime.c | 8 |
4 files changed, 14 insertions, 10 deletions
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 |