Merge lp:~desrt/indicator-appmenu/hud-rewrite-wip into lp:indicator-appmenu/0.4

[Allison Karlitskaya]

add back support for icons

also, remove some comments that no longer apply

[lp:~desrt/indicator-appmenu/hud-rewrite-wip]

241. By Allison Karlitskaya on 2012-03-26

hud-gtk: close query if we have the empty string

242. By Allison Karlitskaya on 2012-03-26

hud: don't send duplicate OPENED events on property changes

[Charles Kerr (charlesk)]

Looks good.

review: Approve

=== modified file 'src/hudappindicatorsource.c'
--- src/hudappindicatorsource.c	2012-03-15 18:26:35 +0000
+++ src/hudappindicatorsource.c	2012-03-26 15:29:24 +0000
@@ -83,9 +83,11 @@
   const gchar *dbus_path;
   GSequenceIter *iter;
   const gchar *id;
+  const gchar *icon_name;
   gint32 position;
   gchar *title;
 
+  g_variant_get_child (description, 0, "&s", &icon_name);
   g_variant_get_child (description, 1, "i", &position);
   g_variant_get_child (description, 2, "&s", &dbus_name);
   g_variant_get_child (description, 3, "&o", &dbus_path);
@@ -102,9 +104,10 @@
          for Network Manager would be 'nm-applet'. */
       title = g_strdup_printf(_("Untitled Indicator (%s)"), id);
     }
-  g_debug ("adding appindicator %s at %d ('%s', %s, %s)", id, position, title, dbus_name, dbus_path);
+  g_debug ("adding appindicator %s at %d ('%s', %s, %s, %s)", id, position, title, icon_name, dbus_name, dbus_path);
 
-  collector = hud_dbusmenu_collector_new_for_endpoint (id, title, hud_settings.indicator_penalty,
+  collector = hud_dbusmenu_collector_new_for_endpoint (id, title, icon_name,
+                                                       hud_settings.indicator_penalty,
                                                        dbus_name, dbus_path);
   g_signal_connect (collector, "changed", G_CALLBACK (hud_app_indicator_source_collector_changed), source);
 
@@ -201,6 +204,29 @@
           hud_dbusmenu_collector_set_prefix (collector, title);
         }
     }
+
+  else if (g_str_equal (signal_name, "ApplicationIconChanged"))
+    {
+      GSequenceIter *iter;
+      const gchar *icon;
+      gint32 position;
+
+      if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(iss)")))
+        return;
+
+      g_variant_get (parameters, "(i&ss)", &position, &icon, NULL);
+
+      g_debug ("changing icon of appindicator at %d to '%s'", position, icon);
+
+      iter = g_sequence_get_iter_at_pos (source->indicators, position);
+      if (!g_sequence_iter_is_end (iter))
+        {
+          HudDbusmenuCollector *collector;
+
+          collector = g_sequence_get (iter);
+          hud_dbusmenu_collector_set_icon (collector, icon);
+        }
+    }
 }
 
 static void
 
=== modified file 'src/huddbusmenucollector.c'
--- src/huddbusmenucollector.c	2012-03-17 16:07:32 +0000
+++ src/huddbusmenucollector.c	2012-03-26 15:29:24 +0000
@@ -159,6 +159,7 @@
 static HudDbusmenuItem *
 hud_dbusmenu_item_new (HudStringList    *context,
                        const gchar      *desktop_file,
+                       const gchar      *icon,
                        DbusmenuMenuitem *menuitem)
 {
   HudStringList *tokens;
@@ -195,7 +196,7 @@
   if (enabled)
     enabled &= !dbusmenu_menuitem_property_exist (menuitem, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY);
 
-  item = hud_item_construct (hud_dbusmenu_item_get_type (), tokens, desktop_file, enabled);
+  item = hud_item_construct (hud_dbusmenu_item_get_type (), tokens, desktop_file, icon, enabled);
   item->menuitem = g_object_ref (menuitem);
 
   hud_string_list_unref (tokens);
@@ -211,6 +212,7 @@
   DbusmenuMenuitem *root;
   gchar *application_id;
   HudStringList *prefix;
+  gchar *icon;
   GHashTable *items;
   guint penalty;
   guint xid;
@@ -357,6 +359,7 @@
   DbusmenuMenuitem *parent;
   HudStringList *context;
   HudDbusmenuItem *item;
+  gboolean was_open;
 
   g_assert (!collector->reentrance_check);
 
@@ -372,10 +375,13 @@
   else
     context = collector->prefix;
 
-  item = hud_dbusmenu_item_new (context, collector->application_id, menuitem);
+  item = g_hash_table_lookup (collector->items, menuitem);
+  was_open = item->is_opened;
   g_hash_table_remove (collector->items, menuitem);
 
-  if (collector->use_count && dbusmenu_menuitem_property_exist (menuitem, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY))
+  item = hud_dbusmenu_item_new (context, collector->application_id, collector->icon, menuitem);
+
+  if (collector->use_count && !was_open && dbusmenu_menuitem_property_exist (menuitem, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY))
     {
       dbusmenu_menuitem_handle_event (menuitem, DBUSMENU_MENUITEM_EVENT_OPENED, NULL, 0);
       item->is_opened = TRUE;
@@ -394,7 +400,7 @@
   HudDbusmenuItem *item;
   GList *child;
 
-  item = hud_dbusmenu_item_new (context, NULL, menuitem);
+  item = hud_dbusmenu_item_new (context, collector->application_id, collector->icon, menuitem);
   context = hud_item_get_tokens (HUD_ITEM (item));
 
   g_signal_connect (menuitem, "property-changed", G_CALLBACK (hud_dbusmenu_collector_property_changed), collector);
@@ -525,6 +531,7 @@
   g_hash_table_unref (collector->items);
 
   g_free (collector->application_id);
+  g_free (collector->icon);
 
   hud_string_list_unref (collector->prefix);
   g_clear_object (&collector->client);
@@ -555,7 +562,9 @@
 
 /**
  * hud_dbusmenu_collector_new_for_endpoint:
+ * @application_id: a unique identifier for the application
  * @prefix: the title to prefix to all items
+ * @icon: the icon for the appliction
  * @penalty: the penalty to apply to all results
  * @bus_name: a D-Bus bus name
  * @object_path: an object path at the destination given by @bus_name
@@ -580,6 +589,7 @@
 HudDbusmenuCollector *
 hud_dbusmenu_collector_new_for_endpoint (const gchar *application_id,
                                          const gchar *prefix,
+                                         const gchar *icon,
                                          guint        penalty,
                                          const gchar *bus_name,
                                          const gchar *object_path)
@@ -588,6 +598,7 @@
 
   collector = g_object_new (HUD_TYPE_DBUSMENU_COLLECTOR, NULL);
   collector->application_id = g_strdup (application_id);
+  collector->icon = g_strdup (icon);
   if (prefix)
     collector->prefix = hud_string_list_cons (prefix, NULL);
   collector->penalty = penalty;
@@ -611,12 +622,14 @@
  **/
 HudDbusmenuCollector *
 hud_dbusmenu_collector_new_for_window (BamfWindow  *window,
-                                       const gchar *desktop_file)
+                                       const gchar *desktop_file,
+                                       const gchar *icon)
 {
   HudDbusmenuCollector *collector;
 
   collector = g_object_new (HUD_TYPE_DBUSMENU_COLLECTOR, NULL);
   collector->application_id = g_strdup (desktop_file);
+  collector->icon = g_strdup (icon);
   collector->xid = bamf_window_get_xid (window);
   g_debug ("dbusmenu on %d", collector->xid);
   hud_app_menu_registrar_add_observer (hud_app_menu_registrar_get (), collector->xid,
@@ -645,3 +658,22 @@
   collector->prefix = hud_string_list_cons (prefix, NULL);
   hud_dbusmenu_collector_setup_root (collector, collector->root);
 }
+
+/**
+ * hud_dbusmenu_collector_set_icon:
+ * @collector: a #HudDbusmenuCollector
+ * @icon: the application icon
+ *
+ * Changes the application icon used for all items of the collector.
+ *
+ * This will involve destroying all of the items and recreating them
+ * (since each item's icon has to be changed).
+ **/
+void
+hud_dbusmenu_collector_set_icon (HudDbusmenuCollector *collector,
+                                 const gchar          *icon)
+{
+  g_free (collector->icon);
+  collector->icon = g_strdup (icon);
+  hud_dbusmenu_collector_setup_root (collector, collector->root);
+}
 
=== modified file 'src/huddbusmenucollector.h'
--- src/huddbusmenucollector.h	2012-03-12 16:25:31 +0000
+++ src/huddbusmenucollector.h	2012-03-26 15:29:24 +0000
@@ -33,12 +33,16 @@
 
 HudDbusmenuCollector *  hud_dbusmenu_collector_new_for_endpoint         (const gchar *application_id,
                                                                          const gchar *prefix,
+                                                                         const gchar *icon,
                                                                          guint        penalty,
                                                                          const gchar *bus_name,
                                                                          const gchar *object_path);
 HudDbusmenuCollector *  hud_dbusmenu_collector_new_for_window           (BamfWindow  *window,
-                                                                         const gchar *desktop_file);
+                                                                         const gchar *desktop_file,
+                                                                         const gchar *icon);
 void                    hud_dbusmenu_collector_set_prefix               (HudDbusmenuCollector *collector,
                                                                          const gchar          *prefix);
+void                    hud_dbusmenu_collector_set_icon                 (HudDbusmenuCollector *collector,
+                                                                         const gchar          *icon);
 
 #endif /* __HUD_DBUSMENU_COLLECTOR_H__ */
 
=== modified file 'src/huddebugsource.c'
--- src/huddebugsource.c	2012-03-15 22:30:20 +0000
+++ src/huddebugsource.c	2012-03-26 15:29:24 +0000
@@ -71,7 +71,7 @@
   g_date_time_unref (now);
   g_free (time);
 
-  source->item = hud_item_new (tokens, NULL, TRUE);
+  source->item = hud_item_new (tokens, NULL, NULL, TRUE);
   hud_string_list_unref (tokens);
 
   hud_source_changed (HUD_SOURCE (source));
 
=== modified file 'src/hudindicatorsource.c'
--- src/hudindicatorsource.c	2012-03-16 12:16:40 +0000
+++ src/hudindicatorsource.c	2012-03-26 15:29:24 +0000
@@ -184,6 +184,7 @@
 
   collector = hud_dbusmenu_collector_new_for_endpoint (indicator->info->indicator_name,
                                                        _(indicator->info->user_visible_name),
+                                                       indicator->info->icon,
                                                        hud_settings.indicator_penalty,
                                                        name_owner, indicator->info->dbus_menu_path);
   g_signal_connect (collector, "changed", G_CALLBACK (hud_indicator_source_collector_changed), indicator);
 
=== modified file 'src/huditem.c'
--- src/huditem.c	2012-03-15 18:27:03 +0000
+++ src/huditem.c	2012-03-26 15:29:24 +0000
@@ -54,6 +54,7 @@
 
   HudStringList *tokens;
   gchar *usage_tag;
+  gchar *app_icon;
   gboolean enabled;
   guint usage;
   guint64 id;
@@ -130,6 +131,7 @@
  * @g_type: a #GType
  * @tokens: the search tokens for the item
  * @desktop_file: the desktop file of the provider of the item
+ * @app_icon: the icon name for the application that created this item
  * @enabled: if the item is enabled
  *
  * This is the Vala-style chain-up constructor corresponding to
@@ -143,6 +145,7 @@
 hud_item_construct (GType          g_type,
                     HudStringList *tokens,
                     const gchar   *desktop_file,
+                    const gchar   *app_icon,
                     gboolean       enabled)
 {
   HudItem *item;
@@ -150,6 +153,7 @@
   item = g_object_new (g_type, NULL);
   item->priv->tokens = hud_string_list_ref (tokens);
   item->priv->desktop_file = g_strdup (desktop_file);
+  item->priv->app_icon = g_strdup (app_icon);
   item->priv->enabled = enabled;
   item->priv->id = hud_item_next_id++;
 
@@ -165,6 +169,7 @@
  * hud_item_new:
  * @tokens: the search tokens for the item
  * @desktop_file: the desktop file of the provider of the item
+ * @app_icon: the icon name for the application that created this item
  * @enabled: if the item is enabled
  *
  * Creates a new #HudItem.
@@ -177,9 +182,10 @@
 HudItem *
 hud_item_new (HudStringList *tokens,
               const gchar   *desktop_file,
+              const gchar   *app_icon,
               gboolean       enabled)
 {
-  return hud_item_construct (HUD_TYPE_ITEM, tokens, desktop_file, enabled);
+  return hud_item_construct (HUD_TYPE_ITEM, tokens, desktop_file, app_icon, enabled);
 }
 
 /**
@@ -236,7 +242,7 @@
  *
  * Gets the icon for the action represented by @item, if one exists.
  *
- * Returns: the icon name, or %NULL if there is no icon
+ * Returns: the icon name, or "" if there is no icon
  **/
 const gchar *
 hud_item_get_item_icon (HudItem *item)
@@ -250,12 +256,12 @@
  *
  * Gets the icon of the application that @item lies within.
  *
- * Returns: the icon name, or %NULL if there is no icon
+ * Returns: the icon name, or "" if there is no icon
  **/
 const gchar *
 hud_item_get_app_icon (HudItem *item)
 {
-  return "";
+  return item->priv->app_icon ? item->priv->app_icon : "";
 }
 
 /**
 
=== modified file 'src/huditem.h'
--- src/huditem.h	2012-03-07 21:55:41 +0000
+++ src/huditem.h	2012-03-26 15:29:24 +0000
@@ -59,9 +59,11 @@
 gpointer                hud_item_construct                              (GType          g_type,
                                                                          HudStringList *tokens,
                                                                          const gchar   *desktop_file,
+                                                                         const gchar   *app_icon,
                                                                          gboolean       enabled);
 HudItem *               hud_item_new                                    (HudStringList *tokens,
                                                                          const gchar   *desktop_file,
+                                                                         const gchar   *app_icon,
                                                                          gboolean       enabled);
 void                    hud_item_activate                               (HudItem       *item,
                                                                          GVariant      *platform_data);
 
=== modified file 'src/hudmenumodelcollector.c'
--- src/hudmenumodelcollector.c	2012-03-15 18:25:50 +0000
+++ src/hudmenumodelcollector.c	2012-03-26 15:29:24 +0000
@@ -60,6 +60,7 @@
   GDBusActionGroup *window;
 
   gchar *desktop_file;
+  gchar *icon;
   GPtrArray *items;
   gint use_count;
 };
@@ -119,13 +120,14 @@
 static HudItem *
 hud_model_item_new (HudStringList      *tokens,
                     const gchar        *desktop_file,
+                    const gchar        *icon,
                     GRemoteActionGroup *action_group,
                     const gchar        *action_name,
                     GVariant           *target)
 {
   HudModelItem *item;
 
-  item = hud_item_construct (hud_model_item_get_type (), tokens, desktop_file, TRUE);
+  item = hud_item_construct (hud_model_item_get_type (), tokens, desktop_file, icon, TRUE);
   item->group = g_object_ref (action_group);
   item->action_name = g_strdup (action_name);
   item->target = target ? g_variant_ref_sink (target) : NULL;
@@ -262,8 +264,7 @@
 
               target = g_menu_model_get_item_attribute_value (model, i, G_MENU_ATTRIBUTE_TARGET, NULL);
 
-              /* XXX: todo: target */
-              item = hud_model_item_new (tokens, collector->desktop_file,
+              item = hud_model_item_new (tokens, collector->desktop_file, collector->icon,
                                          G_REMOTE_ACTION_GROUP (action_group),
                                          value + 4, target);
               g_ptr_array_add (collector->items, item);
@@ -381,6 +382,7 @@
   g_clear_object (&collector->window);
 
   g_free (collector->desktop_file);
+  g_free (collector->icon);
 
   g_ptr_array_unref (collector->items);
 
@@ -412,6 +414,7 @@
  * hud_menu_model_collector_get:
  * @window: a #BamfWindow
  * @desktop_file: the desktop file of the application of @window
+ * @icon: the application icon's name
  *
  * If the given @window has #GMenuModel-style menus then returns a
  * collector for them, otherwise returns %NULL.
@@ -422,7 +425,8 @@
  **/
 HudMenuModelCollector *
 hud_menu_model_collector_get (BamfWindow  *window,
-                              const gchar *desktop_file)
+                              const gchar *desktop_file,
+                              const gchar *icon)
 {
   HudMenuModelCollector *collector;
   gchar *unique_bus_name;
@@ -466,6 +470,7 @@
     collector->window = g_dbus_action_group_get (session, unique_bus_name, window_object_path);
 
   collector->desktop_file = g_strdup (desktop_file);
+  collector->icon = g_strdup (icon);
 
   /* when the action groups change, we could end up having items
    * enabled/disabled.  how to deal with that?
 
=== modified file 'src/hudmenumodelcollector.h'
--- src/hudmenumodelcollector.h	2012-03-12 16:25:31 +0000
+++ src/hudmenumodelcollector.h	2012-03-26 15:29:24 +0000
@@ -33,6 +33,7 @@
 GType                   hud_menu_model_collector_get_type               (void);
 
 HudMenuModelCollector * hud_menu_model_collector_get                    (BamfWindow  *window,
-                                                                         const gchar *desktop_file);
+                                                                         const gchar *desktop_file,
+                                                                         const gchar *icon);
 
 #endif /* __HUD_MENU_MODEL_COLLECTOR_H__ */
 
=== modified file 'src/hudquery.c'
--- src/hudquery.c	2012-03-15 19:32:27 +0000
+++ src/hudquery.c	2012-03-26 15:29:24 +0000
@@ -106,14 +106,6 @@
   if (query->search_string[0] != '\0')
     hud_source_search (query->source, query->results, query->search_string);
 
-  /* XXX: The old code queried, sorted, truncated to 15, got usage data,
-   * then sorted again.
-   *
-   * We try to do it only once.
-   *
-   * This may change the results...
-   */
-
   g_ptr_array_foreach (query->results, hud_query_find_max_usage, &max_usage);
   g_ptr_array_sort_with_data (query->results, hud_query_compare_results, GINT_TO_POINTER (max_usage));
   if (query->results->len > query->num_results)
 
=== modified file 'src/hudwindowsource.c'
--- src/hudwindowsource.c	2012-03-15 21:06:48 +0000
+++ src/hudwindowsource.c	2012-03-26 15:29:24 +0000
@@ -67,6 +67,7 @@
   BamfWindow *active_window;
   BamfApplication *active_application;
   const gchar *active_desktop_file;
+  const gchar *active_icon;
   HudSource *active_collector;
   gint use_count;
 };
@@ -167,12 +168,15 @@
        * For that reason, we check first for GMenuModel and assume if it
        * doesn't exist then it must be dbusmenu.
        */
-      menumodel_collector = hud_menu_model_collector_get (source->active_window, source->active_desktop_file);
+      menumodel_collector = hud_menu_model_collector_get (source->active_window,
+                                                          source->active_desktop_file,
+                                                          source->active_icon);
       if (menumodel_collector)
         collector = HUD_SOURCE (menumodel_collector);
       else
         collector = HUD_SOURCE (hud_dbusmenu_collector_new_for_window (source->active_window,
-                                                                       source->active_desktop_file));
+                                                                       source->active_desktop_file,
+                                                                       source->active_icon));
 
       g_object_set_qdata_full (G_OBJECT (source->active_window), menu_collector_quark, collector, g_object_unref);
     }
@@ -254,6 +258,7 @@
   source->active_window = g_object_ref (window);
   source->active_application = g_object_ref (application);
   source->active_desktop_file = desktop_file;
+  source->active_icon = bamf_view_get_icon (BAMF_VIEW (application));
   source->active_collector = g_object_ref (hud_window_source_get_collector (source));
 
   if (source->use_count)
 
=== modified file 'tools-vala/hud-gtk.vala'
--- tools-vala/hud-gtk.vala	2012-03-21 17:16:38 +0000
+++ tools-vala/hud-gtk.vala	2012-03-26 15:29:24 +0000
@@ -53,6 +53,10 @@
 			query_key = null;
 			model.clear ();
 
+			if (entry.text == "") {
+				return;
+			}
+
 			try {
 				var session = Bus.get_sync (BusType.SESSION, null);
 				var reply = session.call_sync ("com.canonical.hud", "/com/canonical/hud", "com.canonical.hud",