Merge lp:~cyphermox/libindicator/revert-indicator-ng into lp:libindicator/13.04

[Mathieu Trudel-Lapierre]

Revert "indicator-ng: allow a dictionary as the root action's state"

This doesn't have a FFe and can't land.

It was initially filed against the 13.10 branch...

[Michael Terry (mterry)]

Approve again then. :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'libindicator/indicator-ng.c'
--- libindicator/indicator-ng.c	2013-03-13 16:32:22 +0000
+++ libindicator/indicator-ng.c	2013-03-20 19:24:27 +0000
@@ -236,10 +236,6 @@
 indicator_ng_update_entry (IndicatorNg *self)
 {
   GVariant *state;
-  const gchar *label = NULL;
-  const gchar *iconstr = NULL;
-  const gchar *accessible_desc = NULL;
-  gboolean visible = TRUE;
 
   g_return_if_fail (self->menu != NULL);
   g_return_if_fail (self->actions != NULL);
@@ -254,25 +250,20 @@
   state = g_action_group_get_action_state (self->actions, self->header_action);
   if (state && g_variant_is_of_type (state, G_VARIANT_TYPE ("(sssb)")))
     {
+      const gchar *label;
+      const gchar *iconstr;
+      const gchar *accessible_desc;
+      gboolean visible;
+
       g_variant_get (state, "(&s&s&sb)", &label, &iconstr, &accessible_desc, &visible);
-    }
-  else if (state && g_variant_is_of_type (state, G_VARIANT_TYPE ("a{sv}")))
-    {
-      g_variant_lookup (state, "label", "&s", &label);
-      g_variant_lookup (state, "icon", "&s", &iconstr);
-      g_variant_lookup (state, "accessible-desc", "&s", &accessible_desc);
-      g_variant_lookup (state, "visible", "b", &visible);
-    }
-  else
-    g_warning ("the action of the indicator menu item must have state with type (sssb) or a{sv}");
 
-  if (label)
-    indicator_ng_set_label (self, label);
-  if (iconstr)
+      indicator_ng_set_label (self, label);
       indicator_ng_set_icon_from_string (self, iconstr);
-  if (accessible_desc)
-    indicator_ng_set_accessible_desc (self, accessible_desc);
-  indicator_object_set_visible (INDICATOR_OBJECT (self), visible);
+      indicator_ng_set_accessible_desc (self, accessible_desc);
+      indicator_object_set_visible (INDICATOR_OBJECT (self), visible);
+    }
+  else
+    g_warning ("the action of the indicator menu item must have state with type (sssb)");
 
   if (state)
     g_variant_unref (state);
 
=== modified file 'tests/indicator-test-service.c'
--- tests/indicator-test-service.c	2013-03-13 16:32:22 +0000
+++ tests/indicator-test-service.c	2013-03-20 19:24:27 +0000
@@ -70,9 +70,7 @@
   GMenuItem *item;
   GMenu *submenu;
   GActionEntry entries[] = {
-    { "_header", NULL, NULL, "{'label': <'Test'>,"
-                             " 'icon': <'indicator-test'>,"
-                             " 'accessible-desc': <'Test indicator'> }", NULL },
+    { "_header", NULL, NULL, "('Test', 'indicator-test', 'Test indicator', true)", NULL },
     { "show", activate_show, NULL, NULL, NULL }
   };
   GMainLoop *loop;