diff options
| author | Evgeni Golov <evgeni@debian.org> | 2010-06-17 11:38:14 +0200 |
|---|---|---|
| committer | Evgeni Golov <evgeni@debian.org> | 2010-06-17 11:38:14 +0200 |
| commit | c3eb6f364cb2dc6a5d48a656f0d9fc1e671052b5 (patch) | |
| tree | 82be2bac853232744a43391466b9046f3066024b | |
| parent | 754355032bfee6bb059d8b23cac8b4f77eb369ef (diff) | |
| parent | 13f4d0f33e86204dfa6eee1b90a5c0540f875ea3 (diff) | |
| download | ayatana-indicator-messages-c3eb6f364cb2dc6a5d48a656f0d9fc1e671052b5.tar.gz ayatana-indicator-messages-c3eb6f364cb2dc6a5d48a656f0d9fc1e671052b5.tar.bz2 ayatana-indicator-messages-c3eb6f364cb2dc6a5d48a656f0d9fc1e671052b5.zip | |
Merge 0.3.7-0ubuntu1~ppa1 from lp:~indicator-applet-developers/indicator-messages/ubuntu
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rw-r--r-- | src/messages-service-server.h | 4 | ||||
| -rw-r--r-- | src/messages-service.c | 4 |
5 files changed, 18 insertions, 6 deletions
@@ -2827,7 +2827,7 @@ fi # Define the identity of the package. PACKAGE=indicator-messages - VERSION=0.3.6 + VERSION=0.3.7 cat >>confdefs.h <<_ACEOF diff --git a/configure.ac b/configure.ac index 1e3ba01..2f95071 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.6) +AM_INIT_AUTOMAKE(indicator-messages, 0.3.7) AM_MAINTAINER_MODE diff --git a/debian/changelog b/debian/changelog index 2aa5c0b..2b7c7f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +indicator-messages (0.3.7-0ubuntu1~ppa1) lucid; urgency=low + + * New upstream release. + * When loading desktop files check to see if they've + already been eclipsed by an app. (LP: #549096) + * Track better application shortcuts and ensure that they + get removed when the application is. (LP: #539167) + * Track blacklisted apps to ensure that the messaging menu + hides when there is no app. (LP: #533021) + + -- Ted Gould <ted@ubuntu.com> Fri, 21 May 2010 15:02:16 -0500 + indicator-messages (0.3.6-0ubuntu2) lucid; urgency=low * Upstream Merge diff --git a/src/messages-service-server.h b/src/messages-service-server.h index 5b862f6..61921f9 100644 --- a/src/messages-service-server.h +++ b/src/messages-service-server.h @@ -53,11 +53,11 @@ G_BEGIN_DECLS #endif /* !G_ENABLE_DEBUG */ -/* NONE:POINTER (/tmp/dbus-binding-tool-c-marshallers.CACX2U:1) */ +/* NONE:POINTER */ #define dbus_glib_marshal__messages_service_server_VOID__POINTER g_cclosure_marshal_VOID__POINTER #define dbus_glib_marshal__messages_service_server_NONE__POINTER dbus_glib_marshal__messages_service_server_VOID__POINTER -/* BOOLEAN:POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.CACX2U:2) */ +/* BOOLEAN:POINTER,POINTER */ extern void dbus_glib_marshal__messages_service_server_BOOLEAN__POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, diff --git a/src/messages-service.c b/src/messages-service.c index 54b4055..0783d91 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -315,7 +315,7 @@ desktop_file_from_keyfile (const gchar * definition_file) } /* Add a definition file into the black list and eclipse - and launchers that have the same file. */ + any launchers that have the same file. */ static gboolean blacklist_add (gpointer udata) { @@ -359,7 +359,7 @@ blacklist_add_core (gchar * desktop, gchar * definition) } /* Actually blacklist this thing */ - g_hash_table_insert(blacklist, desktop, definition); + g_hash_table_insert(blacklist, g_strdup(desktop), g_strdup(definition)); g_debug("Adding Blacklist item '%s' for desktop '%s'", definition, desktop); /* Go through and eclipse folks */ |