aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-04-22 23:34:12 -0500
committerTed Gould <ted@canonical.com>2009-04-22 23:34:12 -0500
commita3454f1b48db7cc184e820f1aa13680b9f85e6c1 (patch)
treeaad317d09aa1b1a30e52c2eb94f2bbe6da717029
parenta47e3f40e7d9a485fd169f6b397b178760dfb71e (diff)
parent4ed02eb08d3e8c64660d7f9fe6c93ddc404ff4cb (diff)
downloadayatana-indicator-messages-a3454f1b48db7cc184e820f1aa13680b9f85e6c1.tar.gz
ayatana-indicator-messages-a3454f1b48db7cc184e820f1aa13680b9f85e6c1.tar.bz2
ayatana-indicator-messages-a3454f1b48db7cc184e820f1aa13680b9f85e6c1.zip
Upstream update
-rw-r--r--debian/changelog6
-rw-r--r--src/indicator-messages.c8
2 files changed, 10 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 10a17a8..1434bb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+indicator-messages (0.2.0~bzr119-0ubuntu1) UNRELEASED; urgency=low
+
+ * Upstream update
+
+ -- Ted Gould <ted@ubuntu.com> Wed, 22 Apr 2009 23:33:58 -0500
+
indicator-messages (0.2.0~bzr116-0ubuntu3) jaunty; urgency=low
* debian/rules: Adding a rule to remove the .la/.a clutter
diff --git a/src/indicator-messages.c b/src/indicator-messages.c
index e2140e3..b0aaffd 100644
--- a/src/indicator-messages.c
+++ b/src/indicator-messages.c
@@ -26,6 +26,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#include <libindicator/indicator.h>
INDICATOR_SET_VERSION
+INDICATOR_SET_NAME("messages")
#include "im-menu-item.h"
#include "app-menu-item.h"
@@ -33,7 +34,6 @@ INDICATOR_SET_VERSION
static IndicateListener * listener;
static GList * serverList;
static GtkWidget * main_image;
-static GtkWidget * main_menu;
static void server_count_changed (AppMenuItem * appitem, guint count, gpointer data);
static void server_name_changed (AppMenuItem * appitem, gchar * name, gpointer data);
@@ -162,7 +162,7 @@ server_added (IndicateListener * listener, IndicateListenerServer * server, gcha
gtk_menu_shell_prepend(menushell, GTK_WIDGET(menuitem));
gtk_widget_show(GTK_WIDGET(menuitem));
- gtk_widget_show(GTK_WIDGET(main_menu));
+ gtk_widget_show(GTK_WIDGET(main_image));
reconsile_list_and_menu(serverList, menushell);
@@ -262,7 +262,7 @@ server_removed (IndicateListener * listener, IndicateListenerServer * server, gc
g_free(sltp);
if (g_list_length(serverList) == 0) {
- gtk_widget_hide(main_menu);
+ gtk_widget_hide(main_image);
} else {
/* Simulate a server saying zero to recalculate icon */
server_count_changed(NULL, 0, NULL);
@@ -491,7 +491,7 @@ get_icon (void)
GtkMenu *
get_menu (void)
{
- listener = indicate_listener_new();
+ listener = indicate_listener_ref_default();
serverList = NULL;
GtkWidget * submenu = gtk_menu_new();