diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | ChangeLog | 32 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | data/indicator-messages.service.in | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 18 | ||||
| -rw-r--r-- | src/Makefile.in | 20 | ||||
| -rw-r--r-- | src/indicator-messages.c | 4 |
8 files changed, 74 insertions, 11 deletions
@@ -5,6 +5,7 @@ David Barth James Westby Kees Cook + Ken VanDine Michael Terry Sebstien Bacher Ted Gould @@ -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 @@ -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/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 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); |