Merge lp:~indicator-applet-developers/indicator-applet/ubuntu into lp:~ubuntu-desktop/indicator-applet/ubuntu

[Ted Gould]

0.4.2

=== modified file 'configure'
--- configure	2010-05-27 20:08:59 +0000
+++ configure	2010-06-04 16:44:23 +0000
@@ -2844,7 +2844,7 @@
 
 # Define the identity of the package.
  PACKAGE=indicator-applet
- VERSION=0.4.1
+ VERSION=0.4.2
 
 
 cat >>confdefs.h <<_ACEOF

=== modified file 'configure.ac'
--- configure.ac	2010-05-27 20:08:59 +0000
+++ configure.ac	2010-06-04 16:44:23 +0000
@@ -4,7 +4,7 @@
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-applet, 0.4.1)
+AM_INIT_AUTOMAKE(indicator-applet, 0.4.2)
 
 AM_MAINTAINER_MODE
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])

=== modified file 'debian/changelog'
--- debian/changelog	2010-05-27 20:53:21 +0000
+++ debian/changelog	2010-06-04 16:44:23 +0000
@@ -1,3 +1,10 @@
+indicator-applet (0.4.2-0ubuntu1~ppa1) lucid; urgency=low
+
+  * New upstream release.
+    * Support hiding of entries if their label and/or image hides
+
+ -- Ted Gould <[e-mail]>  Fri, 04 Jun 2010 11:21:55 -0500
+
 indicator-applet (0.4.1-0ubuntu1) maverick; urgency=low
 
   * New upstream release.
@@ -12,6 +19,22 @@
 
  -- Ted Gould <[e-mail]>  Thu, 27 May 2010 15:09:57 -0500
 
+indicator-applet (0.4.1-0ubuntu1~ppa1) lucid; urgency=low
+
+  * New upstream release.
+    * Fix build of Bonobo server files
+
+ -- Ted Gould <[e-mail]>  Thu, 27 May 2010 15:09:57 -0500
+
+indicator-applet (0.4.0-0ubuntu1~ppa1) lucid; urgency=low
+
+  * New upstream release.
+    * Creating a new binary target indicator-applet-appmenu
+  * debian/control, debian/indicator-applet-appmenu.install: Adding
+    a new binary package for indicator-applet-appmenu
+
+ -- Ted Gould <[e-mail]>  Thu, 27 May 2010 12:32:26 -0500
+
 indicator-applet (0.3.7-0ubuntu1) lucid-proposed; urgency=low
 
   * New upstream release.
@@ -21,12 +44,27 @@
 
  -- Ted Gould <[e-mail]>  Tue, 04 May 2010 19:44:02 +0200
 
+indicator-applet (0.3.6-0ubuntu3~ppa1) lucid; urgency=low
+
+  * Upstream Merge
+    * Compiler cleanups
+    * Support for vertical panels
+
+ -- Ted Gould <[e-mail]>  Tue, 27 Apr 2010 11:57:38 -0500
+
 indicator-applet (0.3.6-0ubuntu2) lucid; urgency=low
 
   * Backport change to fix keyboard grabbing issues (lp: #553918)
 
  -- Sebastien Bacher <[e-mail]>  Fri, 02 Apr 2010 19:35:18 +0200
 
+indicator-applet (0.3.6-0ubuntu2~ppa1) lucid; urgency=low
+
+  * Upstream Merge
+    * Fix active flags for keybinding. (LP: #553918)
+
+ -- Ted Gould <[e-mail]>  Fri, 02 Apr 2010 12:36:55 -0500
+
 indicator-applet (0.3.6-0ubuntu1) lucid; urgency=low
 
   * New upstream release.

=== modified file 'src/applet-main.c'
--- src/applet-main.c	2010-05-27 17:30:14 +0000
+++ src/applet-main.c	2010-06-04 16:44:23 +0000
@@ -192,9 +192,24 @@
 }
 
 static void
+something_shown (GtkWidget * widget, gpointer user_data)
+{
+	GtkWidget * menuitem = GTK_WIDGET(user_data);
+	gtk_widget_show(menuitem);
+}
+
+static void
+something_hidden (GtkWidget * widget, gpointer user_data)
+{
+	GtkWidget * menuitem = GTK_WIDGET(user_data);
+	gtk_widget_hide(menuitem);
+}
+
+static void
 entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, GtkWidget * menubar)
 {
 	g_debug("Signal: Entry Added");
+	gboolean something_visible = FALSE;
 
 	GtkWidget * menuitem = gtk_menu_item_new();
 	GtkWidget * box = (packdirection == GTK_PACK_DIRECTION_LTR) ?
@@ -205,6 +220,12 @@
 
 	if (entry->image != NULL) {
 		gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(entry->image), FALSE, FALSE, 0);
+		if (gtk_widget_get_visible(GTK_WIDGET(entry->image))) {
+			something_visible = TRUE;
+		}
+
+		g_signal_connect(G_OBJECT(entry->image), "show", G_CALLBACK(something_shown), menuitem);
+		g_signal_connect(G_OBJECT(entry->image), "hide", G_CALLBACK(something_hidden), menuitem);
 	}
 	if (entry->label != NULL) {
 		switch(packdirection) {
@@ -220,6 +241,12 @@
 				break;
 		}		
 		gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(entry->label), FALSE, FALSE, 0);
+		if (gtk_widget_get_visible(GTK_WIDGET(entry->label))) {
+			something_visible = TRUE;
+		}
+
+		g_signal_connect(G_OBJECT(entry->label), "show", G_CALLBACK(something_shown), menuitem);
+		g_signal_connect(G_OBJECT(entry->label), "hide", G_CALLBACK(something_hidden), menuitem);
 	}
 	gtk_container_add(GTK_CONTAINER(menuitem), box);
 	gtk_widget_show(box);
@@ -237,7 +264,10 @@
 	gtk_container_foreach(GTK_CONTAINER(menubar), place_in_menu, &position);
 
 	gtk_menu_shell_insert(GTK_MENU_SHELL(menubar), menuitem, position.menupos);
-	gtk_widget_show(menuitem);
+
+	if (something_visible) {
+		gtk_widget_show(menuitem);
+	}
 
 	g_object_set_data(G_OBJECT(menuitem), MENU_DATA_INDICATOR_ENTRY,  entry);
 	g_object_set_data(G_OBJECT(menuitem), MENU_DATA_INDICATOR_OBJECT, io);
@@ -254,6 +284,16 @@
 		return;
 	}
 
+	IndicatorObjectEntry * entry = (IndicatorObjectEntry *)data;
+	if (entry->label != NULL) {
+		g_signal_handlers_disconnect_by_func(G_OBJECT(entry->label), G_CALLBACK(something_shown), widget);
+		g_signal_handlers_disconnect_by_func(G_OBJECT(entry->label), G_CALLBACK(something_hidden), widget);
+	}
+	if (entry->image != NULL) {
+		g_signal_handlers_disconnect_by_func(G_OBJECT(entry->image), G_CALLBACK(something_shown), widget);
+		g_signal_handlers_disconnect_by_func(G_OBJECT(entry->image), G_CALLBACK(something_hidden), widget);
+	}
+
 	gtk_widget_destroy(widget);
 	return;
 }