From 6ca39e515389c77e563cdd0e480a69b2b3c0efda Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 30 Aug 2010 13:39:52 -0500 Subject: Putting the timezone file into the build line --- src/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index fe3db2e..984ad3d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,7 +7,8 @@ indicator_datetime_service_SOURCES = \ indicator_datetime_service_CFLAGS = \ -Wall \ -Werror \ - $(INDICATOR_CFLAGS) + $(INDICATOR_CFLAGS) \ + -DTIMEZONE_FILE="\"/etc/timezone\"" indicator_datetime_service_LDADD = \ $(INDICATOR_LIBS) -- cgit v1.2.3 From 60d66c4e975f0d8939fc5bf70954002eae16b1d5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 30 Aug 2010 13:44:15 -0500 Subject: Adding in a dbus interface file. --- .bzrignore | 2 ++ src/Makefile.am | 26 +++++++++++++++++++++++++- src/datetime-service.xml | 11 +++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 src/datetime-service.xml diff --git a/.bzrignore b/.bzrignore index 79f4fe1..82ba294 100644 --- a/.bzrignore +++ b/.bzrignore @@ -7,3 +7,5 @@ po/indicator-datetime.pot indicator-datetime-[0-9].[0-9].[0-9].tar.gz data/indicator-datetime.service data/org.ayatana.indicator.datetime.gschema.valid +src/datetime-service-client.h +src/datetime-service-server.h diff --git a/src/Makefile.am b/src/Makefile.am index 984ad3d..8bfac3d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,6 +2,7 @@ libexec_PROGRAMS = indicator-datetime-service indicator_datetime_service_SOURCES = \ + datetime-server.h \ datetime-service.c \ dbus-shared.h indicator_datetime_service_CFLAGS = \ @@ -15,6 +16,7 @@ indicator_datetime_service_LDADD = \ datetimelibdir = $(INDICATORDIR) datetimelib_LTLIBRARIES = libdatetime.la libdatetime_la_SOURCES = \ + datetime-client.h \ dbus-shared.h \ indicator-datetime.c libdatetime_la_CFLAGS = \ @@ -26,4 +28,26 @@ libdatetime_la_LDFLAGS = \ -module \ -avoid-version -EXTRA_DIST = $(libdatetime_la_SOURCES) +datetime-service-client.h: $(srcdir)/datetime-service.xml + dbus-binding-tool \ + --prefix=_datetime_service_client \ + --mode=glib-client \ + --output=datetime-service-client.h \ + $(srcdir)/datetime-service.xml + +datetime-service-server.h: $(srcdir)/datetime-service.xml + dbus-binding-tool \ + --prefix=_datetime_service_server \ + --mode=glib-server \ + --output=datetime-service-server.h \ + $(srcdir)/datetime-service.xml + +BUILT_SOURCES = \ + datetime-service-client.h \ + datetime-service-server.h + +CLEANFILES = \ + $(BUILT_SOURCES) + +EXTRA_DIST = \ + datetime-service.xml diff --git a/src/datetime-service.xml b/src/datetime-service.xml new file mode 100644 index 0000000..1207ebb --- /dev/null +++ b/src/datetime-service.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + -- cgit v1.2.3 From 088f7d086c0a95bd18cc094da185059357ce93ec Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 30 Aug 2010 13:59:10 -0500 Subject: Adding an object to be the interface object for dbus --- src/Makefile.am | 2 ++ src/datetime-interface.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ src/datetime-interface.h | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 src/datetime-interface.c create mode 100644 src/datetime-interface.h diff --git a/src/Makefile.am b/src/Makefile.am index 8bfac3d..aadc182 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,6 +2,8 @@ libexec_PROGRAMS = indicator-datetime-service indicator_datetime_service_SOURCES = \ + datetime-interface.c \ + datetime-interface.h \ datetime-server.h \ datetime-service.c \ dbus-shared.h diff --git a/src/datetime-interface.c b/src/datetime-interface.c new file mode 100644 index 0000000..3ea5106 --- /dev/null +++ b/src/datetime-interface.c @@ -0,0 +1,46 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "datetime-interface.h" + +static void datetime_interface_class_init (DatetimeInterfaceClass *klass); +static void datetime_interface_init (DatetimeInterface *self); +static void datetime_interface_dispose (GObject *object); +static void datetime_interface_finalize (GObject *object); + +G_DEFINE_TYPE (DatetimeInterface, datetime_interface, G_TYPE_OBJECT); + +static void +datetime_interface_class_init (DatetimeInterfaceClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->dispose = datetime_interface_dispose; + object_class->finalize = datetime_interface_finalize; + + return; +} + +static void +datetime_interface_init (DatetimeInterface *self) +{ + + return; +} + +static void +datetime_interface_dispose (GObject *object) +{ + + G_OBJECT_CLASS (datetime_interface_parent_class)->dispose (object); + return; +} + +static void +datetime_interface_finalize (GObject *object) +{ + + G_OBJECT_CLASS (datetime_interface_parent_class)->finalize (object); + return; +} diff --git a/src/datetime-interface.h b/src/datetime-interface.h new file mode 100644 index 0000000..f7ddcf1 --- /dev/null +++ b/src/datetime-interface.h @@ -0,0 +1,33 @@ +#ifndef __DATETIME_INTERFACE_H__ +#define __DATETIME_INTERFACE_H__ + +#include +#include + +G_BEGIN_DECLS + +#define DATETIME_INTERFACE_TYPE (datetime_interface_get_type ()) +#define DATETIME_INTERFACE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DATETIME_INTERFACE_TYPE, DatetimeInterface)) +#define DATETIME_INTERFACE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DATETIME_INTERFACE_TYPE, DatetimeInterfaceClass)) +#define IS_DATETIME_INTERFACE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DATETIME_INTERFACE_TYPE)) +#define IS_DATETIME_INTERFACE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DATETIME_INTERFACE_TYPE)) +#define DATETIME_INTERFACE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DATETIME_INTERFACE_TYPE, DatetimeInterfaceClass)) + +typedef struct _DatetimeInterface DatetimeInterface; +typedef struct _DatetimeInterfaceClass DatetimeInterfaceClass; + +struct _DatetimeInterfaceClass { + GObjectClass parent_class; + + void (*update_time) (void); +}; + +struct _DatetimeInterface { + GObject parent; +}; + +GType datetime_interface_get_type (void); + +G_END_DECLS + +#endif -- cgit v1.2.3 From 1b7857c96f4419028092fe9ae823b08fc55c30b5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 30 Aug 2010 14:23:10 -0500 Subject: Whitespace cleanup --- src/dbus-shared.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dbus-shared.h b/src/dbus-shared.h index aa6d933..198f795 100644 --- a/src/dbus-shared.h +++ b/src/dbus-shared.h @@ -20,9 +20,9 @@ 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 "org.ayatana.indicator.datetime" +#define SERVICE_IFACE "org.ayatana.indicator.datetime.service" +#define SERVICE_OBJ "/org/ayatana/indicator/datetime/service" #define SERVICE_VERSION 1 #define MENU_OBJ "/org/ayatana/indicator/datetime/menu" -- cgit v1.2.3 From ffe6f9fb45bf8ab898246dc79cfc2e09463ea6de Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 30 Aug 2010 14:23:27 -0500 Subject: Connecting onto the dbus --- src/datetime-interface.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/datetime-interface.c b/src/datetime-interface.c index 3ea5106..a500354 100644 --- a/src/datetime-interface.c +++ b/src/datetime-interface.c @@ -3,6 +3,8 @@ #endif #include "datetime-interface.h" +#include "datetime-service-server.h" +#include "dbus-shared.h" static void datetime_interface_class_init (DatetimeInterfaceClass *klass); static void datetime_interface_init (DatetimeInterface *self); @@ -19,12 +21,18 @@ datetime_interface_class_init (DatetimeInterfaceClass *klass) object_class->dispose = datetime_interface_dispose; object_class->finalize = datetime_interface_finalize; + dbus_g_object_type_install_info(DATETIME_INTERFACE_TYPE, &dbus_glib__datetime_service_server_object_info); + return; } static void datetime_interface_init (DatetimeInterface *self) { + DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL); + dbus_g_connection_register_g_object(connection, + SERVICE_OBJ, + G_OBJECT(self)); return; } -- cgit v1.2.3 From b798978db017df8d08e35a38cfa1e88fe3890f90 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 30 Aug 2010 14:34:16 -0500 Subject: Building us a dbus interface --- src/datetime-service.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/datetime-service.c b/src/datetime-service.c index 2137065..e6a5fc3 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -28,12 +28,14 @@ with this program. If not, see . #include #include +#include "datetime-interface.h" #include "dbus-shared.h" static IndicatorService * service = NULL; static GMainLoop * mainloop = NULL; static DbusmenuServer * server = NULL; static DbusmenuMenuitem * root = NULL; +static DatetimeInterface * dbus = NULL; /* Global Items */ static DbusmenuMenuitem * date = NULL; @@ -198,6 +200,8 @@ main (int argc, char ** argv) dbusmenu_server_set_root(server, root); build_menus(root); + dbus = g_object_new(DATETIME_INTERFACE_TYPE, NULL); + mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); -- cgit v1.2.3 From 9a852c72209e4c5c5292553a3abbc61911a27027 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 30 Aug 2010 14:55:47 -0500 Subject: Adding in the update time signal --- src/datetime-interface.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/datetime-interface.c b/src/datetime-interface.c index a500354..d70d53a 100644 --- a/src/datetime-interface.c +++ b/src/datetime-interface.c @@ -6,6 +6,13 @@ #include "datetime-service-server.h" #include "dbus-shared.h" +enum { + UPDATE_TIME, + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL] = { 0 }; + static void datetime_interface_class_init (DatetimeInterfaceClass *klass); static void datetime_interface_init (DatetimeInterface *self); static void datetime_interface_dispose (GObject *object); @@ -21,6 +28,14 @@ datetime_interface_class_init (DatetimeInterfaceClass *klass) object_class->dispose = datetime_interface_dispose; object_class->finalize = datetime_interface_finalize; + signals[UPDATE_TIME] = g_signal_new("update-time", + G_TYPE_FROM_CLASS(klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (DatetimeInterfaceClass, update_time), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0, G_TYPE_NONE); + dbus_g_object_type_install_info(DATETIME_INTERFACE_TYPE, &dbus_glib__datetime_service_server_object_info); return; -- cgit v1.2.3 From 48830abd993c31546bad23cc30684a537c31332c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 30 Aug 2010 14:58:40 -0500 Subject: Adding a way to emit the signal --- src/datetime-interface.c | 8 ++++++++ src/datetime-interface.h | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/datetime-interface.c b/src/datetime-interface.c index d70d53a..246fcb3 100644 --- a/src/datetime-interface.c +++ b/src/datetime-interface.c @@ -67,3 +67,11 @@ datetime_interface_finalize (GObject *object) G_OBJECT_CLASS (datetime_interface_parent_class)->finalize (object); return; } + +void +datetime_interface_update (DatetimeInterface *self) +{ + g_return_if_fail(IS_DATETIME_INTERFACE(self)); + g_signal_emit(G_OBJECT(self), signals[UPDATE_TIME], 0, TRUE); + return; +} diff --git a/src/datetime-interface.h b/src/datetime-interface.h index f7ddcf1..c422b2a 100644 --- a/src/datetime-interface.h +++ b/src/datetime-interface.h @@ -26,7 +26,8 @@ struct _DatetimeInterface { GObject parent; }; -GType datetime_interface_get_type (void); +GType datetime_interface_get_type (void); +void datetime_interface_update (DatetimeInterface *self); G_END_DECLS -- cgit v1.2.3 From 3e00412e0950f6c4e0d27c5f046120017c38738c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 30 Aug 2010 16:18:29 -0500 Subject: Watching the timezone file and updating based on it --- src/datetime-service.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/datetime-service.c b/src/datetime-service.c index e6a5fc3..18dd073 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -23,6 +23,7 @@ with this program. If not, see . #include #include +#include #include #include @@ -168,6 +169,30 @@ build_menus (DbusmenuMenuitem * root) return; } +/* Run when the timezone file changes */ +static void +timezone_changed (GFileMonitor * monitor, GFile * file, GFile * otherfile, GFileMonitorEvent event, gpointer user_data) +{ + datetime_interface_update(DATETIME_INTERFACE(user_data)); + update_datetime(NULL); + return; +} + +/* Set up monitoring the timezone file */ +static void +build_timezone (DatetimeInterface * dbus) +{ + GFile * timezonefile = g_file_new_for_path(TIMEZONE_FILE); + GFileMonitor * monitor = g_file_monitor_file(timezonefile, G_FILE_MONITOR_NONE, NULL, NULL); + if (monitor != NULL) { + g_signal_connect(G_OBJECT(monitor), "changed", G_CALLBACK(timezone_changed), dbus); + g_debug("Monitoring timezone file: '" TIMEZONE_FILE "'"); + } else { + g_warning("Unable to monitor timezone file: '" TIMEZONE_FILE "'"); + } + return; +} + /* Repsonds to the service object saying it's time to shutdown. It stops the mainloop. */ static void @@ -200,8 +225,12 @@ main (int argc, char ** argv) dbusmenu_server_set_root(server, root); build_menus(root); + /* Setup dbus interface */ dbus = g_object_new(DATETIME_INTERFACE_TYPE, NULL); + /* Setup timezone watch */ + build_timezone(dbus); + mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); -- cgit v1.2.3 From e156eaea70d4e06dc3935a067223587de71e2d71 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 30 Aug 2010 16:55:36 -0500 Subject: Create the service proxy and give it a lifecycle --- src/indicator-datetime.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/indicator-datetime.c b/src/indicator-datetime.c index 7034fb8..a72fe6f 100644 --- a/src/indicator-datetime.c +++ b/src/indicator-datetime.c @@ -29,6 +29,9 @@ with this program. If not, see . #include #include +/* DBus Stuff */ +#include + /* Indicator Stuff */ #include #include @@ -78,6 +81,8 @@ struct _IndicatorDatetimePrivate { IndicatorServiceManager * sm; DbusmenuGtkMenu * menu; + DBusGProxy * service_proxy; + GSettings * settings; }; @@ -220,6 +225,8 @@ indicator_datetime_init (IndicatorDatetime *self) self->priv->show_day = FALSE; self->priv->custom_string = g_strdup(DEFAULT_TIME_FORMAT); + self->priv->service_proxy = NULL; + self->priv->sm = NULL; self->priv->menu = NULL; @@ -259,6 +266,16 @@ indicator_datetime_init (IndicatorDatetime *self) self->priv->sm = indicator_service_manager_new_version(SERVICE_NAME, SERVICE_VERSION); + DBusGConnection * session = dbus_g_bus_get(DBUS_BUS_SESSION, NULL); + if (session != NULL) { + self->priv->service_proxy = dbus_g_proxy_new_for_name(session, + SERVICE_NAME, + SERVICE_OBJ, + SERVICE_IFACE); + + /* TODO: Add signal handler */ + } + return; } @@ -297,6 +314,11 @@ indicator_datetime_dispose (GObject *object) self->priv->settings = NULL; } + if (self->priv->service_proxy != NULL) { + g_object_unref(self->priv->service_proxy); + self->priv->service_proxy = NULL; + } + G_OBJECT_CLASS (indicator_datetime_parent_class)->dispose (object); return; } -- cgit v1.2.3 From 7890c71cf87b7bc95a34d1203db3fba81fa267b2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 30 Aug 2010 21:42:37 -0500 Subject: Add in a signal handler for the update time signal --- src/indicator-datetime.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/indicator-datetime.c b/src/indicator-datetime.c index a72fe6f..10d1329 100644 --- a/src/indicator-datetime.c +++ b/src/indicator-datetime.c @@ -140,6 +140,7 @@ static gchar * generate_format_string (IndicatorDatetime * self); static struct tm * update_label (IndicatorDatetime * io); static void guess_label_size (IndicatorDatetime * self); static void setup_timer (IndicatorDatetime * self, struct tm * ltime); +static void update_time (DBusGProxy * proxy, gpointer user_data); /* Indicator Module Config */ INDICATOR_SET_VERSION @@ -273,7 +274,12 @@ indicator_datetime_init (IndicatorDatetime *self) SERVICE_OBJ, SERVICE_IFACE); - /* TODO: Add signal handler */ + dbus_g_proxy_add_signal(self->priv->service_proxy, "UpdateTime", G_TYPE_INVALID); + dbus_g_proxy_connect_signal(self->priv->service_proxy, + "UpdateTime", + G_CALLBACK(update_time), + self, + NULL); } return; @@ -556,6 +562,17 @@ update_label (IndicatorDatetime * io) return ltime; } +/* Recieves the signal from the service that we should update + the time right now. Usually from a timezone switch. */ +static void +update_time (DBusGProxy * proxy, gpointer user_data) +{ + IndicatorDatetime * self = INDICATOR_DATETIME(user_data); + struct tm * ltime = update_label(self); + setup_timer(self, ltime); + return; +} + /* Runs every minute and updates the time */ gboolean timer_func (gpointer user_data) -- cgit v1.2.3 From 94264e502d32ebff60ec8213dc2887ec569152ad Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 30 Aug 2010 22:00:43 -0500 Subject: Set a timer to update the date once a day. --- src/datetime-service.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/src/datetime-service.c b/src/datetime-service.c index 18dd073..5444c61 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -32,6 +32,8 @@ with this program. If not, see . #include "datetime-interface.h" #include "dbus-shared.h" +static void setup_timer (void); + static IndicatorService * service = NULL; static GMainLoop * mainloop = NULL; static DbusmenuServer * server = NULL; @@ -139,7 +141,6 @@ build_menus (DbusmenuMenuitem * root) dbusmenu_menuitem_child_append(root, date); g_idle_add(update_datetime, NULL); - /* TODO: Set up updating daily */ } if (calendar == NULL) { @@ -193,6 +194,43 @@ build_timezone (DatetimeInterface * dbus) return; } +/* Source ID for the timer */ +static guint timer = 0; + +/* Execute at a given time, update and setup a new + timer to go again. */ +static gboolean +timer_func (gpointer user_data) +{ + timer = 0; + /* Reset up each time to reduce error */ + setup_timer(); + update_datetime(NULL); + return FALSE; +} + +/* Sets up the time to launch the timer to update the + date in the datetime entry */ +static void +setup_timer (void) +{ + if (timer != 0) { + g_source_remove(timer); + timer = 0; + } + + time_t t; + t = time(NULL); + struct tm * ltime = localtime(&t); + + timer = g_timeout_add_seconds(((23 - ltime->tm_hour) * 60 * 60) + + ((59 - ltime->tm_min) * 60) + + ((60 - ltime->tm_sec)) + 60 /* one minute past */, + timer_func, NULL); + + return; +} + /* Repsonds to the service object saying it's time to shutdown. It stops the mainloop. */ static void @@ -231,9 +269,13 @@ main (int argc, char ** argv) /* Setup timezone watch */ build_timezone(dbus); + /* Setup the timer */ + setup_timer(); + mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); + g_object_unref(G_OBJECT(dbus)); g_object_unref(G_OBJECT(service)); g_object_unref(G_OBJECT(server)); g_object_unref(G_OBJECT(root)); -- cgit v1.2.3 From e22fcc15f62ec03acc0250152281f921e51a0a1b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 30 Aug 2010 22:01:22 -0500 Subject: If the timezone changes we need to setup a different timer. --- src/datetime-service.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/datetime-service.c b/src/datetime-service.c index 5444c61..8c881f7 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -176,6 +176,7 @@ timezone_changed (GFileMonitor * monitor, GFile * file, GFile * otherfile, GFile { datetime_interface_update(DATETIME_INTERFACE(user_data)); update_datetime(NULL); + setup_timer(); return; } -- cgit v1.2.3 From 5c882ecc2474d48fbe7675b76cb23f9875905483 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 30 Aug 2010 22:11:36 -0500 Subject: Copyright stuffs --- src/datetime-interface.c | 21 +++++++++++++++++++++ src/datetime-interface.h | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/src/datetime-interface.c b/src/datetime-interface.c index 246fcb3..c58c5af 100644 --- a/src/datetime-interface.c +++ b/src/datetime-interface.c @@ -1,3 +1,24 @@ +/* +An indicator to time and date related information in the menubar. + +Copyright 2010 Canonical Ltd. + +Authors: + Ted Gould + +This program is free software: you can redistribute it and/or modify it +under the terms of the GNU General Public License version 3, as published +by the Free Software Foundation. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranties of +MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR +PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program. If not, see . +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/datetime-interface.h b/src/datetime-interface.h index c422b2a..60ead1b 100644 --- a/src/datetime-interface.h +++ b/src/datetime-interface.h @@ -1,3 +1,24 @@ +/* +An indicator to time and date related information in the menubar. + +Copyright 2010 Canonical Ltd. + +Authors: + Ted Gould + +This program is free software: you can redistribute it and/or modify it +under the terms of the GNU General Public License version 3, as published +by the Free Software Foundation. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranties of +MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR +PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program. If not, see . +*/ + #ifndef __DATETIME_INTERFACE_H__ #define __DATETIME_INTERFACE_H__ -- cgit v1.2.3 From 5e369fb12b320b56fb2598fe32a180e4741856fe Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 7 Sep 2010 12:44:33 -0500 Subject: Fix for make dist --- src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = \ -- cgit v1.2.3 From de2c8ed006362d66bcf30d3d15fdae809532cecc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 7 Sep 2010 12:56:02 -0500 Subject: Distributing the schema XML --- data/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3 From d79e2326db9b80d2f32574b3cf7a1fd94d4e3e72 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 9 Sep 2010 12:43:03 -0500 Subject: 0.0.6 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 726fe16..74b9e70 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(indicator-datetime, 0.0.5, ted@canonical.com) +AC_INIT(indicator-datetime, 0.0.6, ted@canonical.com) AC_COPYRIGHT([Copyright 2009,2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-datetime, 0.0.5) +AM_INIT_AUTOMAKE(indicator-datetime, 0.0.6) AM_MAINTAINER_MODE -- cgit v1.2.3