releasing version 0.3.91-0ubuntu1

9 files changed, 85 insertions, 12 deletions

diff --git a/AUTHORS b/AUTHORS
index 4f272a2..f00e868 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,6 +5,7 @@
  David Barth 
  James Westby 
  Kees Cook 
+ Ken VanDine 
  Michael Terry 
  Sebstien Bacher 
  Ted Gould 
diff --git a/ChangeLog b/ChangeLog
index d15094c..d01c3a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,37 @@
 # Generated by Makefile. Do not edit.
 
+2011-01-27  Ted Gould  <ted@gould.cx>
+
+	0.3.91
+
+2011-01-27  Ted Gould  <ted@gould.cx>
+
+	Upgrading to new type handler prototype
+
+2011-01-26  Ted Gould  <ted@gould.cx>
+
+	Grabbing Ken's branch too! 
+
+2011-01-14  Ken VanDine  <ken.vandine@canonical.com>
+
+	rename the service to match the indicator
+
+2011-01-18  Ted Gould  <ted@gould.cx>
+
+	Adding a log domain and fixing service file.
+
+2011-01-17  Ted Gould  <ted@gould.cx>
+
+	Ignoring the generated XML
+
+2011-01-17  Ted Gould  <ted@gould.cx>
+
+	Adding in log domains
+
+2011-01-17  Ted Gould  <ted@gould.cx>
+
+	Fixing service file
+
 2011-01-14  Ted Gould  <ted@gould.cx>
 
 	0.3.90
diff --git a/configure b/configure
index f756aaf..cc58d3a 100755
--- a/configure
+++ b/configure
@@ -2845,7 +2845,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=indicator-messages
- VERSION=0.3.90
+ VERSION=0.3.91
 
 
 cat >>confdefs.h <<_ACEOF
@@ -11959,7 +11959,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
 
 
 
diff --git a/configure.ac b/configure.ac
index b20fade..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
 
@@ -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/debian/changelog b/debian/changelog
index 9afd5d7..f9d6c0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+indicator-messages (0.3.91-0ubuntu1) natty; urgency=low
+
+  * New upstream release.
+    * 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 <ted@ubuntu.com>  Thu, 27 Jan 2011 17:01:34 -0600
+
 indicator-messages (0.3.90-0ubuntu1) natty; urgency=low
 
   [ Ted Gould ]
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
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
diff --git a/src/Makefile.in b/src/Makefile.in
index acc459e..c1ca548 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -289,7 +289,15 @@ libmessaging_la_SOURCES = \
 	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
 
@@ -315,7 +323,15 @@ indicator_messages_service_SOURCES = \
 	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)
 BUILT_SOURCES = \
 	gen-messages-service.xml.h \
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);