Merge lp:~larsu/indicator-messages/show-separators into lp:indicator-messages/12.10

[Lars Karlitski]

Show menu separators between sections

Previously, gtk didn't support changing the menu model on an already-created
GtkMenu. Since IndicatorObject doesn't allow changing the GtkMenu it exports
to the panel, IndicatorMessages created a menu with a single section, into
which the menu from the service was inserted (and removed when the service
died). This led to seperators not being shown, because separators are only
shown between top-level sections.

Gtk now has gtk_menu_shell_bind_model, which allows us to get rid of top-level
wrapper section.

Show menu separators between sections. Depends on a gtk+ patch [1] which will land in gtk+ very soon.

[1] https://bugzilla.gnome.org/show_bug.cgi?id=682831

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:313
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/16/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/./label=quantal/16/console

review: Needs Fixing (continuous-integration)

[Lars Karlitski (larsu)]

Jenkins failed here because the patch relies on an unreleased gtk+.

[lp:~larsu/indicator-messages/show-separators]

314. By Lars Karlitski on 2012-09-14

messages-services: don't call g_object_unref with NULL

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:314
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/17/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/./label=quantal/17/console

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

I haven't read the GTK+ patch, but if it behaves as described here then this patch looks fine.

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2012-08-31 17:49:26 +0000
+++ configure.ac	2012-09-14 07:02:18 +0000
@@ -38,7 +38,7 @@
 # Dependencies 
 ###########################
 
-GTK_REQUIRED_VERSION=3.5.12
+GTK_REQUIRED_VERSION=3.5.17
 GIO_UNIX_REQUIRED_VERSION=2.33.10
 INDICATOR_REQUIRED_VERSION=0.3.19
 GLIB_REQUIRED_VERSION=2.33.10
 
=== modified file 'src/indicator-messages.c'
--- src/indicator-messages.c	2012-09-05 19:04:04 +0000
+++ src/indicator-messages.c	2012-09-14 07:02:18 +0000
@@ -58,7 +58,6 @@
 	IndicatorObject parent;
 	IndicatorServiceManager * service;
 	GActionGroup *actions;
-	GMenu *menu_wrapper;
 	GMenuModel *menu;
 	GtkWidget *image;
 	GtkWidget *gtkmenu;
@@ -121,8 +120,7 @@
 	g_signal_connect (self->service, "connection-change",
 			  G_CALLBACK (service_connection_changed), self);
 
-	self->menu_wrapper = g_menu_new ();
-	self->gtkmenu = gtk_menu_new_from_model (G_MENU_MODEL (self->menu_wrapper));
+	self->gtkmenu = gtk_menu_new ();
 	g_object_ref_sink (self->gtkmenu);
 
 	self->image = g_object_ref_sink (gtk_image_new ());
@@ -142,7 +140,6 @@
 	g_return_if_fail(self != NULL);
 
 	g_clear_object (&self->service);
-	g_clear_object (&self->menu_wrapper);
 	g_clear_object (&self->actions);
 	g_clear_object (&self->menu);
 	g_clear_object (&self->gtkmenu);
@@ -184,8 +181,7 @@
 		g_signal_handlers_disconnect_by_func (self->menu, menu_items_changed, self);
 		g_clear_object (&self->menu);
 	}
-	if (g_menu_model_get_n_items (G_MENU_MODEL (self->menu_wrapper)) == 1)
-		g_menu_remove (self->menu_wrapper, 0);
+	gtk_menu_shell_bind_model (GTK_MENU_SHELL (self->gtkmenu), NULL, NULL, FALSE);
 
 	if (connected == FALSE)
 		return;
@@ -308,14 +304,11 @@
 
 	popup = g_menu_model_get_item_link (self->menu, 0, G_MENU_LINK_SUBMENU);
 	if (popup) {
-		GMenuItem *item;
-
-		item = g_menu_item_new_section (NULL, popup);
-		g_menu_item_set_attribute (item, "action-namespace",
-					   "s", get_name_hint (INDICATOR_OBJECT (self)));
-		g_menu_append_item (self->menu_wrapper, item);
-
-		g_object_unref (item);
+		gtk_menu_shell_bind_model (GTK_MENU_SHELL (self->gtkmenu),
+					   popup,
+					   get_name_hint (INDICATOR_OBJECT (self)),
+					   TRUE);
+
 		g_object_unref (popup);
 	}
 }
@@ -331,13 +324,10 @@
 
 	g_return_if_fail (position == 0);
 
-	if (added == 1) {
+	if (added == 1)
 		indicator_messages_add_toplevel_menu (self);
-	}
-	else if (removed == 1) {
-		g_menu_remove (self->menu_wrapper, 0);
+	else if (removed == 1)
 		indicator_object_set_visible (INDICATOR_OBJECT (self), FALSE);
-	}
 }
 
 static void
 
=== modified file 'src/messages-service.c'
--- src/messages-service.c	2012-09-06 13:14:00 +0000
+++ src/messages-service.c	2012-09-14 07:02:18 +0000
@@ -132,7 +132,8 @@
 			g_menu_insert_section (menu, 0, NULL, chat_section);
 	}
 
-	g_object_unref (first_section);
+	if (first_section != NULL)
+		g_object_unref (first_section);
 }
 
 static void