diff options
| author | Ted Gould <ted@canonical.com> | 2009-04-03 15:26:36 -0500 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-04-03 15:26:36 -0500 |
| commit | 06c50baeaf0736a2cc929cbc3d1dbe05a5871ec3 (patch) | |
| tree | 91c7fa06b141a05767808c58d589da2837e7c2e5 | |
| parent | c51645bc6c052945571ae33fcbeb05107871613e (diff) | |
| parent | 1a4df93becd5b029bb10d8d6caa2bd59499e4209 (diff) | |
| download | ayatana-indicator-messages-06c50baeaf0736a2cc929cbc3d1dbe05a5871ec3.tar.gz ayatana-indicator-messages-06c50baeaf0736a2cc929cbc3d1dbe05a5871ec3.tar.bz2 ayatana-indicator-messages-06c50baeaf0736a2cc929cbc3d1dbe05a5871ec3.zip | |
Merging from upstream
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/app-menu-item.c | 8 | ||||
| -rw-r--r-- | src/indicator-messages.c | 8 |
3 files changed, 13 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 7aabc33..d4d51c7 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.1.4) +AM_INIT_AUTOMAKE(indicator-messages, 0.1.5) AM_MAINTAINER_MODE diff --git a/src/app-menu-item.c b/src/app-menu-item.c index 4fe3298..f6afa02 100644 --- a/src/app-menu-item.c +++ b/src/app-menu-item.c @@ -160,6 +160,9 @@ app_menu_item_new (IndicateListener * listener, IndicateListenerServer * server) g_signal_connect(G_OBJECT(self), "activate", G_CALLBACK(activate_cb), NULL); + indicate_listener_server_show_interest(listener, server, INDICATE_INTEREST_SERVER_DISPLAY); + indicate_listener_server_show_interest(listener, server, INDICATE_INTEREST_SERVER_SIGNAL); + return self; } @@ -179,6 +182,11 @@ type_cb (IndicateListener * listener, IndicateListenerServer * server, gchar * v /* For IM and Microblogging we want the individual items, not a count */ priv->count_on_label = TRUE; update_label(self); + + indicate_listener_server_show_interest(listener, server, INDICATE_INTEREST_INDICATOR_COUNT); + } else { + indicate_listener_server_show_interest(listener, server, INDICATE_INTEREST_INDICATOR_DISPLAY); + indicate_listener_server_show_interest(listener, server, INDICATE_INTEREST_INDICATOR_SIGNAL); } return; diff --git a/src/indicator-messages.c b/src/indicator-messages.c index e8fed5b..83520ff 100644 --- a/src/indicator-messages.c +++ b/src/indicator-messages.c @@ -55,8 +55,8 @@ serverList_equal (gconstpointer a, gconstpointer b) pa = (serverList_t *)a; pb = (serverList_t *)b; - gchar * pas = INDICATE_LISTENER_SERVER_DBUS_NAME(pa->server); - gchar * pbs = INDICATE_LISTENER_SERVER_DBUS_NAME(pb->server); + const gchar * pas = INDICATE_LISTENER_SERVER_DBUS_NAME(pa->server); + const gchar * pbs = INDICATE_LISTENER_SERVER_DBUS_NAME(pb->server); return g_strcmp0(pas, pbs); } @@ -90,8 +90,8 @@ imList_equal (gconstpointer a, gconstpointer b) pa = (imList_t *)a; pb = (imList_t *)b; - gchar * pas = INDICATE_LISTENER_SERVER_DBUS_NAME(pa->server); - gchar * pbs = INDICATE_LISTENER_SERVER_DBUS_NAME(pb->server); + const gchar * pas = INDICATE_LISTENER_SERVER_DBUS_NAME(pa->server); + const gchar * pbs = INDICATE_LISTENER_SERVER_DBUS_NAME(pb->server); guint pai = INDICATE_LISTENER_INDICATOR_ID(pa->indicator); guint pbi = INDICATE_LISTENER_INDICATOR_ID(pb->indicator); |