From c43fda3fa314d662e6ac82a2748e6c1dfd8d2900 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 14 Jan 2011 15:23:01 -0600 Subject: rename the service to match the indicator --- data/indicator-messages.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/indicator-messages.service.in b/data/indicator-messages.service.in index 573a2d6..12e41e6 100644 --- a/data/indicator-messages.service.in +++ b/data/indicator-messages.service.in @@ -1,3 +1,3 @@ [D-BUS Service] -Name=org.ayatana.indicator.messages +Name=com.canonical.indicator.messages Exec=@libexecdir@/indicator-messages-service -- cgit v1.2.3 From 1622e9fa9213d2136bd70f1cc7a0722248163898 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 17 Jan 2011 12:02:17 -0600 Subject: Fixing service file --- data/indicator-messages.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/indicator-messages.service.in b/data/indicator-messages.service.in index 573a2d6..12e41e6 100644 --- a/data/indicator-messages.service.in +++ b/data/indicator-messages.service.in @@ -1,3 +1,3 @@ [D-BUS Service] -Name=org.ayatana.indicator.messages +Name=com.canonical.indicator.messages Exec=@libexecdir@/indicator-messages-service -- cgit v1.2.3 From e659a394b8af69907029c16488be3c010bd7f21d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 17 Jan 2011 12:04:11 -0600 Subject: Adding in log domains --- src/Makefile.am | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index dd09b8a..8597d77 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,7 +12,14 @@ libmessaging_la_SOURCES = \ gen-messages-service.xml.h \ gen-messages-service.xml.c \ dbus-data.h -libmessaging_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed -Werror +libmessaging_la_CFLAGS = \ + $(APPLET_CFLAGS) \ + -Wall \ + -Wl,-Bsymbolic-functions \ + -Wl,-z,defs \ + -Wl,--as-needed \ + -Werror \ + -DG_LOG_DOMAIN=\"Indicator-Messages\" libmessaging_la_LIBADD = $(APPLET_LIBS) libmessaging_la_LDFLAGS = -module -avoid-version @@ -38,7 +45,14 @@ indicator_messages_service_SOURCES = \ seen-db.h \ dirs.h \ dbus-data.h -indicator_messages_service_CFLAGS = $(APPLET_CFLAGS) -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed -Werror +indicator_messages_service_CFLAGS = \ + $(APPLET_CFLAGS) \ + -Wall \ + -Wl,-Bsymbolic-functions \ + -Wl,-z,defs \ + -Wl,--as-needed \ + -Werror \ + -DG_LOG_DOMAIN=\"Indicator-Messages\" indicator_messages_service_LDADD = $(APPLET_LIBS) gen-%.xml.h: %.xml -- cgit v1.2.3 From 87f0afc7d77b105b1def0bc7f1d220b1cf565b4d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 17 Jan 2011 12:05:20 -0600 Subject: Ignoring the generated XML --- .bzrignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.bzrignore b/.bzrignore index 24932b4..f48929a 100644 --- a/.bzrignore +++ b/.bzrignore @@ -23,3 +23,5 @@ src/messages-service-client.h src/messages-service-server.h po/indicator-messages.pot src/libmessaging_la-app-gtk-menu-item.lo +src/gen-messages-service.xml.c +src/gen-messages-service.xml.h -- cgit v1.2.3 From d6519fb4f6cd5ed4eaeeae4a8cceb14787a25695 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 27 Jan 2011 16:57:04 -0600 Subject: Upgrading to new type handler prototype --- configure.ac | 2 +- src/indicator-messages.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index b20fade..762c05d 100644 --- a/configure.ac +++ b/configure.ac @@ -40,7 +40,7 @@ GIO_UNIX_REQUIRED_VERSION=2.18 PANEL_REQUIRED_VERSION=2.0.0 INDICATE_REQUIRED_VERSION=0.4.90 INDICATOR_REQUIRED_VERSION=0.3.5 -DBUSMENUGTK_REQUIRED_VERSION=0.3.90 +DBUSMENUGTK_REQUIRED_VERSION=0.3.94 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION diff --git a/src/indicator-messages.c b/src/indicator-messages.c index 6fd6c5c..8a94a85 100644 --- a/src/indicator-messages.c +++ b/src/indicator-messages.c @@ -489,7 +489,7 @@ numbers_draw_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data) /* Builds a menu item representing a running application in the messaging menu */ static gboolean -new_application_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client) +new_application_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data) { g_debug ("%s (\"%s\")", __func__, dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_NAME)); @@ -597,7 +597,7 @@ indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * value, shifting over and putting the icon in with some right side text that'll be determined by the service. */ static gboolean -new_indicator_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client) +new_indicator_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, 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 0ade6393658510b2af6b83588ddc01d3b4067643 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 27 Jan 2011 16:57:19 -0600 Subject: 0.3.91 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 762c05d..721805e 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT(src/indicator-messages.c) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.3.90) +AM_INIT_AUTOMAKE(indicator-messages, 0.3.91) AM_MAINTAINER_MODE -- cgit v1.2.3 From b50c1299b1da499a0aeea15c9445f37e286f29f7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 27 Jan 2011 17:00:57 -0600 Subject: debian/control: dbusmenu to 0.3.94 --- debian/changelog | 3 ++- debian/control | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index d2052fc..f961df1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ indicator-messages (0.3.91-0ubuntu1~ppa1) UNRELEASED; urgency=low * Fixing the service file * Adding a log domain * Fixing type handler for dbusmenu 0.3.94 + * debian/control: dbusmenu to 0.3.94 - -- Ted Gould Thu, 27 Jan 2011 16:59:36 -0600 + -- Ted Gould Thu, 27 Jan 2011 17:00:42 -0600 indicator-messages (0.3.90-0ubuntu1) natty; urgency=low diff --git a/debian/control b/debian/control index 4e28b59..7029e65 100644 --- a/debian/control +++ b/debian/control @@ -14,8 +14,8 @@ Build-Depends: debhelper (>= 5.0), libindicate-dev (>= 0.4.91), libindicate-gtk-dev (>= 0.4.91), libindicator-dev (>= 0.3.14), - libdbusmenu-gtk-dev (>= 0.3.91), - libdbusmenu-glib-dev (>= 0.3.91) + libdbusmenu-gtk-dev (>= 0.3.94), + libdbusmenu-glib-dev (>= 0.3.94) Standards-Version: 3.8.4 Homepage: https://launchpad.net/indicator-messages Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/indicator-messages/ubuntu -- cgit v1.2.3 From db2f40e817104f0c7711446361c9309cedaff563 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 27 Jan 2011 17:01:36 -0600 Subject: releasing version 0.3.91-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f961df1..fb8f35f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-messages (0.3.91-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-messages (0.3.91-0ubuntu1~ppa1) natty; urgency=low * New upstream release. * Fixing the service file @@ -6,7 +6,7 @@ indicator-messages (0.3.91-0ubuntu1~ppa1) UNRELEASED; urgency=low * Fixing type handler for dbusmenu 0.3.94 * debian/control: dbusmenu to 0.3.94 - -- Ted Gould Thu, 27 Jan 2011 17:00:42 -0600 + -- Ted Gould Thu, 27 Jan 2011 17:01:34 -0600 indicator-messages (0.3.90-0ubuntu1) natty; urgency=low -- cgit v1.2.3