Merge lp:~ted/indicator-session/kill-restart-item into lp:indicator-session/12.10

[Ted Gould]

Remove the custom menu type for the restart entry

Removes the custom menu type that was being used for the restart item as it's no longer required, and made it so the entry didn't show properly in the HUD.

[jenkins (martin-mrazik+qa)]

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

review: Needs Fixing (continuous-integration)

[Lars Karlitski (larsu)]

Looks good.

review: Approve

[Charles Kerr (charlesk)]

I love patches like this one.

review: Approve

=== modified file 'src/indicator-session.c'
--- src/indicator-session.c	2012-09-19 00:10:35 +0000
+++ src/indicator-session.c	2012-09-28 20:54:27 +0000
@@ -80,10 +80,6 @@
                                DbusmenuMenuitem * parent,
                                DbusmenuClient * client,
                                gpointer user_data);
-static gboolean build_restart_item (DbusmenuMenuitem * newitem,
-                                    DbusmenuMenuitem * parent,
-                                    DbusmenuClient * client,
-                                    gpointer user_data);
 static void on_menu_layout_updated (DbusmenuClient * client, IndicatorSession * session);
 static void indicator_session_update_icon_callback (GtkWidget * widget, gpointer callback_data);
 static void indicator_session_update_icon_and_a11y (IndicatorSession * self);
@@ -168,9 +164,6 @@
   dbusmenu_client_add_type_handler (self->menu_client,
                                     USER_ITEM_TYPE,
                                     new_user_item);
-  dbusmenu_client_add_type_handler (self->menu_client,
-                                    RESTART_ITEM_TYPE,
-                                    build_restart_item);
   dbusmenu_gtkclient_set_accel_group (DBUSMENU_GTKCLIENT(self->menu_client),
                                       gtk_accel_group_new());
 }
@@ -316,7 +309,6 @@
   return TRUE;
 }
 
-
 static void
 user_real_name_get_cb (GObject * obj, GAsyncResult * res, gpointer user_data)
 {
@@ -357,64 +349,6 @@
     }
 }
 
-
-
-
-static void
-restart_property_change (DbusmenuMenuitem * item,
-                         const gchar * property,
-                         GVariant * variant,
-                         gpointer user_data)
-{
-	DbusmenuGtkClient * client = DBUSMENU_GTKCLIENT(user_data);
-	GtkMenuItem * gmi = dbusmenu_gtkclient_menuitem_get(client, item);
-
-	if (g_strcmp0(property, RESTART_ITEM_LABEL) == 0) {
-		gtk_menu_item_set_label(gmi, g_variant_get_string(variant, NULL));
-	} else if (g_strcmp0(property, RESTART_ITEM_ICON) == 0) {
-		GtkWidget * image = gtk_image_menu_item_get_image(GTK_IMAGE_MENU_ITEM(gmi));
-
-		GIcon * gicon = g_themed_icon_new_with_default_fallbacks(g_variant_get_string(variant, NULL));
-		if (image == NULL) {
-			image = gtk_image_new_from_gicon(gicon, GTK_ICON_SIZE_MENU);
-			gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(gmi), image);
-		} else {
-			gtk_image_set_from_gicon(GTK_IMAGE(image), gicon, GTK_ICON_SIZE_MENU);
-		}
-		g_object_unref(G_OBJECT(gicon));
-	}
-	return;
-}
-
-static gboolean
-build_restart_item (DbusmenuMenuitem * newitem,
-                    DbusmenuMenuitem * parent,
-                    DbusmenuClient * client,
-                    gpointer user_data)
-{
-	GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_image_menu_item_new());
-	if (gmi == NULL) {
-		return FALSE;
-	}
-
-	dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent);
-
-	g_signal_connect(G_OBJECT(newitem), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(restart_property_change), client);
-
-	GVariant * variant;
-	variant = dbusmenu_menuitem_property_get_variant(newitem, RESTART_ITEM_LABEL);
-	if (variant != NULL) {
-		restart_property_change(newitem, RESTART_ITEM_LABEL, variant, client);
-	}
-
-	variant = dbusmenu_menuitem_property_get_variant(newitem, RESTART_ITEM_ICON);
-	if (variant != NULL) {
-		restart_property_change(newitem, RESTART_ITEM_ICON, variant, client);
-	}
-
-	return TRUE;
-}
-
 static void
 indicator_session_update_users_label (IndicatorSession * self,
                                       const gchar      * name)

=== modified file 'src/session-menu-mgr.c'
--- src/session-menu-mgr.c	2012-09-18 16:09:15 +0000
+++ src/session-menu-mgr.c	2012-09-28 20:54:27 +0000
@@ -491,8 +491,7 @@
   mi_set_label (mgr->shutdown_mi, confirm_needed ? _("Shut Down\342\200\246")
                                                  : _("Shut Down"));
 
-  dbusmenu_menuitem_property_set (mgr->restart_mi, RESTART_ITEM_LABEL,
-                                  confirm_needed ? _("Restart\342\200\246")
+  mi_set_label (mgr->restart_mi, confirm_needed ? _("Restart\342\200\246")
                                                  : _("Restart"));
 }
 
@@ -516,9 +515,7 @@
   g_signal_connect_swapped (mi, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
                             G_CALLBACK(action_func_hibernate), mgr);
 
-  mi = mgr->restart_mi = dbusmenu_menuitem_new ();
-  mi_set_type (mi, RESTART_ITEM_TYPE);
-  dbusmenu_menuitem_property_set (mi, RESTART_ITEM_LABEL, _("Restart\342\200\246"));
+  mi = mgr->restart_mi = mi_new (_("Restart\342\200\246"));
   dbusmenu_menuitem_child_append (mgr->top_mi, mi);
   g_signal_connect_swapped (mi, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
                             G_CALLBACK(action_func_spawn_async), CMD_RESTART);

=== modified file 'src/shared-names.h'
--- src/shared-names.h	2012-08-31 01:33:11 +0000
+++ src/shared-names.h	2012-09-28 20:54:27 +0000
@@ -36,10 +36,6 @@
 #define USER_ITEM_PROP_ICON       "user-item-icon-path"
 #define USER_ITEM_ICON_DEFAULT    "avatar-default"
 
-#define RESTART_ITEM_TYPE         "x-canonical-restart-item"
-#define RESTART_ITEM_LABEL        "restart-label"
-#define RESTART_ITEM_ICON         "restart-icon"
-
 #define ICON_DEFAULT              "system-devices-panel"
 #define ICON_INFO                 "system-devices-panel-information"
 #define ICON_ALERT                "system-devices-panel-alert"