From c3557c823f930bd1a1f36a56673f55e28fd74c72 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 21 Sep 2010 16:14:43 -0500 Subject: Generating Changelog and AUTHORS by make dist --- AUTHORS | 4 ++-- ChangeLog | 2 ++ Makefile.am | 25 +++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index a1771e3..a741f25 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,2 +1,2 @@ -Ted Gould -Cody Russell +# Generated by Makefile + diff --git a/ChangeLog b/ChangeLog index e69de29..a741f25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -0,0 +1,2 @@ +# Generated by Makefile + diff --git a/Makefile.am b/Makefile.am index 39b5cdb..391ff49 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,3 +8,28 @@ EXTRA_DIST = autogen.sh DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall +dist-hook: + @if test -d "$(top_srcdir)/.bzr"; \ + then \ + echo Creating ChangeLog && \ + ( cd "$(top_srcdir)" && \ + echo '# Generated by Makefile. Do not edit.'; echo; \ + $(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \ + && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \ + || (rm -f ChangeLog.tmp; \ + echo Failed to generate ChangeLog >&2 ); \ + else \ + echo Failed to generate ChangeLog: not a branch >&2; \ + fi + @if test -d "$(top_srcdir)/.bzr"; \ + then \ + echo Creating AUTHORS && \ + ( cd "$(top_srcdir)" && \ + echo '# Generated by Makefile. Do not edit.'; echo; \ + $(top_srcdir)/missing --run bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \ + && mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \ + || (rm -f AUTHORS.tmp; \ + echo Failed to generate AUTHORS >&2 ); \ + else \ + echo Failed to generate AUTHORS: not a branch >&2; \ + fi -- cgit v1.2.3 From 0639bc132274bff20210058084b06a1546f69e9a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 17 Jan 2011 11:03:45 -0600 Subject: Changing service files --- data/indicator-session.service.in | 2 +- data/indicator-users.service.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/indicator-session.service.in b/data/indicator-session.service.in index 50d8635..a4d10a1 100644 --- a/data/indicator-session.service.in +++ b/data/indicator-session.service.in @@ -1,3 +1,3 @@ [D-BUS Service] -Name=org.ayatana.indicator.session +Name=com.canonical.indicator.session Exec=@libexecdir@/indicator-session-service diff --git a/data/indicator-users.service.in b/data/indicator-users.service.in index 2dc9062..8bb6819 100644 --- a/data/indicator-users.service.in +++ b/data/indicator-users.service.in @@ -1,3 +1,3 @@ [D-BUS Service] -Name=org.ayatana.indicator.users +Name=com.canonical.indicator.users Exec=@libexecdir@/indicator-users-service -- cgit v1.2.3 From e6737ea3aba4fd1c900ef040f37a73930b487749 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 17 Jan 2011 11:05:13 -0600 Subject: Removing the indicator-users service file as we don't build this anymore. --- data/Makefile.am | 3 +-- data/indicator-users.service.in | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 data/indicator-users.service.in diff --git a/data/Makefile.am b/data/Makefile.am index 70ea880..f452897 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,8 +1,7 @@ SUBDIRS = icons dbus_servicesdir = $(DBUSSERVICEDIR) -service_in_files = indicator-users.service.in \ - indicator-session.service.in +service_in_files = indicator-session.service.in dbus_services_DATA = $(service_in_files:.service.in=.service) %.service: %.service.in diff --git a/data/indicator-users.service.in b/data/indicator-users.service.in deleted file mode 100644 index 8bb6819..0000000 --- a/data/indicator-users.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=com.canonical.indicator.users -Exec=@libexecdir@/indicator-users-service -- cgit v1.2.3 From ca79c8fe3e3fb0aade43005478d692e140b5f9e4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 17 Jan 2011 11:12:35 -0600 Subject: Adding in log domains for messages --- src/Makefile.am | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 190d012..4fa43b9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,7 +15,10 @@ libsession_la_SOURCES = \ dbus-shared-names.h \ dbusmenu-shared.h \ users-service-client.h -libsession_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror +libsession_la_CFLAGS = \ + $(APPLET_CFLAGS) \ + -Wall -Werror \ + -DG_LOG_DOMAIN=\"Indicator-Session\" libsession_la_LIBADD = $(APPLET_LIBS) libsession_la_LDFLAGS = -module -avoid-version @@ -90,8 +93,15 @@ indicator_session_service_SOURCES = \ users-service-dbus.h \ users-service-dbus.c \ users-service-marshal.c -indicator_session_service_CFLAGS = $(SESSIONSERVICE_CFLAGS) $(GCONF_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" -Wall -Werror -indicator_session_service_LDADD = $(SESSIONSERVICE_LIBS) $(GCONF_LIBS) +indicator_session_service_CFLAGS = \ + $(SESSIONSERVICE_CFLAGS) \ + $(GCONF_CFLAGS) \ + -DLIBEXECDIR=\"$(libexecdir)\" \ + -Wall -Werror \ + -DG_LOG_DOMAIN=\"Indicator-Session\" +indicator_session_service_LDADD = \ + $(SESSIONSERVICE_LIBS) \ + $(GCONF_LIBS) ################# # GTK Logout Stuff -- cgit v1.2.3 From 25bde6b5ebe97e12e6c585cb773a3c55f28e275a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 28 Jan 2011 11:14:45 -0600 Subject: Fixing prototypes to match dbusmenu --- src/indicator-session.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/indicator-session.c b/src/indicator-session.c index d2e679c..2104281 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -72,11 +72,11 @@ INDICATOR_SET_TYPE(INDICATOR_SESSION_TYPE) static GtkLabel * get_label (IndicatorObject * io); static GtkImage * get_icon (IndicatorObject * io); static GtkMenu * get_menu (IndicatorObject * io); -static gboolean build_menu_switch (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client); -static gboolean new_user_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client); +static gboolean build_menu_switch (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data); +static gboolean new_user_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data); static void icon_changed (IndicatorSession * session, const gchar * icon_name); static void service_connection_cb (IndicatorServiceManager * sm, gboolean connected, gpointer user_data); -static gboolean build_restart_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client); +static gboolean build_restart_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data); static void receive_signal (GDBusProxy * proxy, gchar * sender_name, gchar * signal_name, GVariant * parameters, gpointer user_data); static void service_proxy_cb (GObject * object, GAsyncResult * res, gpointer user_data); @@ -298,7 +298,7 @@ user_property_change (DbusmenuMenuitem * item, const gchar * property, GVariant /* Builds an item with a hip little logged in icon. */ static gboolean -new_user_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client) +new_user_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data) { GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_menu_item_new()); gint padding = 0; @@ -476,7 +476,7 @@ restart_property_change (DbusmenuMenuitem * item, const gchar * property, GVaria /* Builds the restart item which is a more traditional GTK image menu item that puts the graphic into the gutter. */ static gboolean -build_restart_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client) +build_restart_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data) { GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_image_menu_item_new()); if (gmi == NULL) { @@ -519,7 +519,7 @@ switch_style_set (GtkWidget * widget, GtkStyle * prev_style, gpointer user_data) to not need ellipsing itself, or if, it will get ellipsed by the standard label processor. */ static gboolean -build_menu_switch (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client) +build_menu_switch (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data) { GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_menu_item_new()); if (gmi == NULL) { -- cgit v1.2.3 From 5c4584e8278f37d2e921ad599c55cabeff835a35 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 28 Jan 2011 11:14:53 -0600 Subject: 0.2.12 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index fe2e27f..0fd00e0 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT(src/indicator-session.c) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-session, 0.2.11) +AM_INIT_AUTOMAKE(indicator-session, 0.2.12) AM_MAINTAINER_MODE -- cgit v1.2.3