* Fixing distcheck

* Autogen

5 files changed, 75 insertions, 5 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 2e6900c..0e8dec3 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -10,6 +10,8 @@ dbus_services_DATA = indicator-datetime.service
 %.service: %.service.in
 	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
-EXTRA_DIST = indicator-datetime.service.in
+EXTRA_DIST = \
+	$(gsettings_SCHEMAS) \
+	indicator-datetime.service.in
 
 CLEANFILES = indicator-datetime.service
diff --git a/data/Makefile.in b/data/Makefile.in
index 30b114c..11dd75a 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -164,6 +164,8 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POFILES = @POFILES@
 POSUB = @POSUB@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
@@ -234,7 +236,10 @@ gsettings_SCHEMAS = \
 
 dbus_servicesdir = $(DBUSSERVICEDIR)
 dbus_services_DATA = indicator-datetime.service
-EXTRA_DIST = indicator-datetime.service.in
+EXTRA_DIST = \
+	$(gsettings_SCHEMAS) \
+	indicator-datetime.service.in
+
 CLEANFILES = indicator-datetime.service
 all: all-am
 
diff --git a/data/org.ayatana.indicator.datetime.gschema.xml b/data/org.ayatana.indicator.datetime.gschema.xml
new file mode 100644
index 0000000..c794d83
--- /dev/null
+++ b/data/org.ayatana.indicator.datetime.gschema.xml
@@ -0,0 +1,61 @@
+<schemalist>
+	<enum id="time-enum">
+		<value nick="locale-default" value="0" />
+		<value nick="12-hour" value="1" />
+		<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">
+		<key name="time-format" enum="time-enum">
+			<default>'locale-default'</default>
+			<summary>What the time format should be</summary>
+			<description>
+			  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 langauge.  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.
+			</description>
+		</key>
+		<key name="show-seconds" type="b">
+			<default>false</default>
+			<summary>Show the number of seconds in the indicator</summary>
+			<description>
+			  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.
+			</description>
+		</key>
+		<key name="show-day" type="b">
+			<default>false</default>
+			<summary>Show the day of the week in the indicator</summary>
+			<description>
+			  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.
+			</description>
+		</key>
+		<key name="show-date" type="b">
+			<default>false</default>
+			<summary>Show the month and date in the indicator</summary>
+			<description>
+			  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.
+			</description>
+		</key>
+		<key name="custom-time-format" type="s">
+			<default>"%l:%M %p"</default>
+			<summary>The format string passed to strftime</summary>
+			<description>
+			  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.
+			</description>
+		</key>
+	</schema>
+</schemalist>
diff --git a/debian/changelog b/debian/changelog
index 87b0be3..3d55785 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ indicator-datetime (0.0.5-0ubuntu3~ppa1) UNRELEASED; urgency=low
   * Upstream Merge
     * Refresh times on timezone change
     * Update the date daily (lp: #614529)
+    * Fixing distcheck
+  * Autogen
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 07 Sep 2010 12:48:44 -0500
+ -- Ted Gould <ted@ubuntu.com>  Tue, 07 Sep 2010 12:59:13 -0500
 
 indicator-datetime (0.0.5-0ubuntu2) maverick; urgency=low
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 46cff1c..98d4733 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ libexec_PROGRAMS = indicator-datetime-service
 indicator_datetime_service_SOURCES = \
 	datetime-interface.c \
 	datetime-interface.h \
-	datetime-server.h \
+	datetime-service-server.h \
 	calendar-menu-item.c \
 	calendar-menu-item.h \
 	datetime-service.c \
@@ -20,7 +20,7 @@ indicator_datetime_service_LDADD = \
 datetimelibdir = $(INDICATORDIR)
 datetimelib_LTLIBRARIES = libdatetime.la
 libdatetime_la_SOURCES = \
-	datetime-client.h \
+	datetime-service-client.h \
 	dbus-shared.h \
 	indicator-datetime.c
 libdatetime_la_CFLAGS = \