From bec8488e5f30b2b1db7f424ca34bdcc408f3b3d8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 17 Jan 2011 11:41:28 -0600 Subject: Switching service to canonical.com --- data/indicator-datetime.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 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(-) 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(-) 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 bb1438668097fc3dabd6d5ead99ac126707dd6fb Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 17 Jan 2011 11:49:13 -0600 Subject: Changing the interface and path for the settings --- data/org.ayatana.indicator.datetime.gschema.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/org.ayatana.indicator.datetime.gschema.xml b/data/org.ayatana.indicator.datetime.gschema.xml index 4f071c8..b0538f1 100644 --- a/data/org.ayatana.indicator.datetime.gschema.xml +++ b/data/org.ayatana.indicator.datetime.gschema.xml @@ -5,7 +5,7 @@ - + 'locale-default' What the time format should be -- cgit v1.2.3 From f70786825403f3209c4d2d9010f1d65a22f654b3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 17 Jan 2011 11:50:14 -0600 Subject: Switching the file name around --- data/Makefile.am | 2 +- data/com.canonical.indicator.datetime.gschema.xml | 61 +++++++++++++++++++++++ data/org.ayatana.indicator.datetime.gschema.xml | 61 ----------------------- 3 files changed, 62 insertions(+), 62 deletions(-) create mode 100644 data/com.canonical.indicator.datetime.gschema.xml delete mode 100644 data/org.ayatana.indicator.datetime.gschema.xml 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/com.canonical.indicator.datetime.gschema.xml b/data/com.canonical.indicator.datetime.gschema.xml new file mode 100644 index 0000000..fe493f7 --- /dev/null +++ b/data/com.canonical.indicator.datetime.gschema.xml @@ -0,0 +1,61 @@ + + + + + + + + + + 'locale-default' + What the time format should be + + Controls the time format that is displayed in the indicator. For almost + all users this should be the default for their locale. If you think the + setting is wrong for your locale please join or talk to the translation + team for your language. If you just want something different you can + adjust this to be either 12 or 24 time. Or, you can use a custom format + string and set the custom-time-format setting. + + + + false + Show the number of seconds in the indicator + + Makes the datetime indicator show the number of seconds in the indicator. + It's important to note that this will cause additional battery drain as + the time will update 60 times as often, so it is not recommended. Also, + this setting will be ignored if the time-format value is set to custom. + + + + false + Show the day of the week in the indicator + + Puts the day of the week on the panel along with the time and/or date + depending on settings. This setting will be ignored if the time-format + value is set to custom. + + + + false + Show the month and date in the indicator + + Puts the month and the date in the panel along with the time and/or day + of the week depending on settings. This setting will be ignored if the + time-format value is set to custom. + + + + "%l:%M %p" + The format string passed to strftime + + The format of the time and/or date that is visible on the panel when using + the indicator. For most users this will be a set of predefined values as + determined by the configuration utility, but advanced users can change it + to anything strftime can accept. Look at the man page on strftime for + more information. + + + + diff --git a/data/org.ayatana.indicator.datetime.gschema.xml b/data/org.ayatana.indicator.datetime.gschema.xml deleted file mode 100644 index b0538f1..0000000 --- a/data/org.ayatana.indicator.datetime.gschema.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - 'locale-default' - What the time format should be - - Controls the time format that is displayed in the indicator. For almost - all users this should be the default for their locale. If you think the - setting is wrong for your locale please join or talk to the translation - team for your language. If you just want something different you can - adjust this to be either 12 or 24 time. Or, you can use a custom format - string and set the custom-time-format setting. - - - - false - Show the number of seconds in the indicator - - Makes the datetime indicator show the number of seconds in the indicator. - It's important to note that this will cause additional battery drain as - the time will update 60 times as often, so it is not recommended. Also, - this setting will be ignored if the time-format value is set to custom. - - - - false - Show the day of the week in the indicator - - Puts the day of the week on the panel along with the time and/or date - depending on settings. This setting will be ignored if the time-format - value is set to custom. - - - - false - Show the month and date in the indicator - - Puts the month and the date in the panel along with the time and/or day - of the week depending on settings. This setting will be ignored if the - time-format value is set to custom. - - - - "%l:%M %p" - The format string passed to strftime - - The format of the time and/or date that is visible on the panel when using - the indicator. For most users this will be a set of predefined values as - determined by the configuration utility, but advanced users can change it - to anything strftime can accept. Look at the man page on strftime for - more information. - - - - -- 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(-) 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 --- configure.ac | 2 +- src/indicator-datetime.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index a57d91e..5be861e 100644 --- a/configure.ac +++ b/configure.ac @@ -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/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 From aaae5863299681153898d4e701f44aed85c780e9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 27 Jan 2011 16:34:24 -0600 Subject: 0.1.91 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 5be861e..9118db8 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 -- cgit v1.2.3