From f1e5569348a935def97ed99708864aa6b8096d5e Mon Sep 17 00:00:00 2001 From: David Barth Date: Thu, 22 Jul 2010 21:13:36 +0200 Subject: add a calendar widget to the menu --- src/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index fe3db2e..330f09d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,6 +2,8 @@ libexec_PROGRAMS = indicator-datetime-service indicator_datetime_service_SOURCES = \ + calendar-menu-item.c \ + calendar-menu-item.h \ datetime-service.c \ dbus-shared.h indicator_datetime_service_CFLAGS = \ -- cgit v1.2.3 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(-) (limited to 'src/Makefile.am') 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 (limited to 'src/Makefile.am') 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 (limited to 'src/Makefile.am') 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 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(-) (limited to 'src/Makefile.am') 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