This is an automated email from the git hooks/post-receive script.
e r i c p u s h e d a
c o m m i t t o b r a n c h
m a s t e r
in repository xfce/garcon.
commit 8c14f977c06b531954b902ba9d593d22e1d77605
Author: Stephan Haller <no...@froevel.de>
Date: Thu Oct 26 09:21:35 2017 +0200
Replace hash table for application actions with a list
Currently GarconMenuItem uses a hash table to manage the list of
application actions. An application has to call garcon_menu_item_get_actions()
to get a list of action name and then call garcon_menu_item_get_action() to get
information about the action. The problem with garcon_menu_item_get_actions()
to get the list of action names is that the order of action names is
unpredictable and not the order as specified in the desktop file as
g_hash_table_get_keys() is used to create this lis [...]
To keep the order of action names the hash table was replace with a
doubly-linked list (GList) and all application action related function were
modified to maintain the GList.
To keep API stable the function modified will behave as before, e.g. the
actions names are not duplicated (g_strdup) but their pointers are copied as-is
to the list in garcon_menu_item_get_actions(). The callee still has to free the
list with g_list_free() but keep the data in the list untouched, i.e. not
calling g_list_free_full(list, g_free). Also the data in the list are modified
in-place - see garcon_menu_item_set_action().
Signed-off-by: Eric Koegel <eric.koe...@gmail.com>
---
garcon/garcon-menu-item.c | 86 ++++++++++++++++++++++++++++++++++++++---------
1 file changed, 71 insertions(+), 15 deletions(-)
diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c
index fc569bf..ca8cb63 100644
--- a/garcon/garcon-menu-item.c
+++ b/garcon/garcon-menu-item.c
@@ -141,8 +141,8 @@ struct _GarconMenuItemPrivate
/* Working directory */
gchar *path;
- /* Hash table for mapping action names to GarconMenuItemAction's */
- GHashTable *actions;
+ /* List of application actions of type GarconMenuItemAction */
+ GList *actions;
/* Hidden value */
guint hidden : 1;
@@ -398,8 +398,6 @@ static void
garcon_menu_item_init (GarconMenuItem *item)
{
item->priv = G_TYPE_INSTANCE_GET_PRIVATE (item, GARCON_TYPE_MENU_ITEM,
GarconMenuItemPrivate);
- item->priv->actions = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
- (GDestroyNotify)
garcon_menu_item_action_unref);
}
@@ -423,12 +421,11 @@ garcon_menu_item_finalize (GObject *object)
_garcon_g_list_free_full (item->priv->categories, g_free);
_garcon_g_list_free_full (item->priv->keywords, g_free);
+ _garcon_g_list_free_full (item->priv->actions,
garcon_menu_item_action_unref);
if (item->priv->file != NULL)
g_object_unref (G_OBJECT (item->priv->file));
- g_hash_table_unref (item->priv->actions);
-
(*G_OBJECT_CLASS (garcon_menu_item_parent_class)->finalize) (object);
}
@@ -1156,7 +1153,7 @@ garcon_menu_item_reload_from_file (GarconMenuItem *item,
item->priv->not_show_in = xfce_rc_read_list_entry (rc,
G_KEY_FILE_DESKTOP_KEY_NOT_SHOW_IN, ";");
/* Update application actions */
- g_hash_table_remove_all (item->priv->actions);
+ _garcon_g_list_free_full (item->priv->actions,
garcon_menu_item_action_unref);
str_list = xfce_rc_read_list_entry (rc, G_KEY_FILE_DESKTOP_KEY_ACTIONS, ";");
if (G_LIKELY (str_list != NULL))
{
@@ -1718,9 +1715,20 @@ garcon_menu_item_has_keyword (GarconMenuItem *item,
GList *
garcon_menu_item_get_actions (GarconMenuItem *item)
{
+ GList *action_names = NULL;
+ GList *iter;
+ GarconMenuItemAction *action;
+
g_return_val_if_fail (GARCON_IS_MENU_ITEM (item), NULL);
- return g_hash_table_get_keys (item->priv->actions);
+ for (iter = item->priv->actions; iter != NULL ; iter = g_list_next (iter))
+ {
+ action = GARCON_MENU_ITEM_ACTION (iter->data);
+ action_names = g_list_prepend (action_names,
(gchar*)garcon_menu_item_action_get_name (action));
+ }
+ action_names = g_list_reverse (action_names);
+
+ return action_names;
}
@@ -1729,9 +1737,20 @@ GarconMenuItemAction *
garcon_menu_item_get_action (GarconMenuItem *item,
const gchar *action_name)
{
+ GList *iter;
+ GarconMenuItemAction *action;
+
g_return_val_if_fail (GARCON_IS_MENU_ITEM (item), NULL);
-
- return g_hash_table_lookup (item->priv->actions, action_name);
+ g_return_val_if_fail (action_name != NULL, NULL);
+
+ for (iter = item->priv->actions; iter != NULL; iter = g_list_next (iter))
+ {
+ action = GARCON_MENU_ITEM_ACTION (iter->data);
+ if (g_strcmp0 (garcon_menu_item_action_get_name (action), action_name)
== 0)
+ return (action);
+ }
+
+ return NULL;
}
@@ -1742,14 +1761,39 @@ garcon_menu_item_set_action (GarconMenuItem *item,
const gchar *action_name,
GarconMenuItemAction *action)
{
+ GList *iter;
+ GarconMenuItemAction *old_action;
+ gboolean found = FALSE;
+
g_return_if_fail (GARCON_IS_MENU_ITEM (item));
g_return_if_fail (GARCON_IS_MENU_ITEM_ACTION (action));
- /* Insert into the hash table and remove old action (if any) */
- g_hash_table_replace (item->priv->actions, g_strdup (action_name), action);
+ /* If action name is found in list, then insert new action into the list and
+ * remove old action */
+ for (iter = item->priv->actions; !found && iter != NULL; iter = g_list_next
(iter))
+ {
+ old_action = GARCON_MENU_ITEM_ACTION (iter->data);
+ if (g_strcmp0 (garcon_menu_item_action_get_name (old_action),
action_name) == 0)
+ {
+ /* Release reference on action currently stored at action name */
+ garcon_menu_item_action_unref (old_action);
+
+ /* Replace action in list at action name and grab a reference */
+ iter->data = action;
+ garcon_menu_item_action_ref (action);
+
+ /* Set flag that action was found */
+ found = TRUE;
+ }
+ }
- /* Grab a reference on the action */
- garcon_menu_item_action_ref (action);
+ /* If action name was not found in list, then simply add it to list */
+ if (found == FALSE)
+ {
+ /* Add action to list and grab a reference */
+ item->priv->actions=g_list_append (item->priv->actions, action);
+ garcon_menu_item_action_ref (action);
+ }
}
@@ -1758,9 +1802,21 @@ gboolean
garcon_menu_item_has_action (GarconMenuItem *item,
const gchar *action_name)
{
+ GList *iter;
+ GarconMenuItemAction *action;
+ gboolean found = FALSE;
+
g_return_val_if_fail (GARCON_IS_MENU_ITEM (item), FALSE);
+ g_return_val_if_fail (action_name != NULL, FALSE);
+
+ for (iter = item->priv->actions; !found && iter != NULL; iter = g_list_next
(iter))
+ {
+ action = GARCON_MENU_ITEM_ACTION (iter->data);
+ if (g_strcmp0 (garcon_menu_item_action_get_name (action), action_name)
== 0)
+ found = TRUE;
+ }
- return g_hash_table_contains (item->priv->actions, action_name);
+ return found;
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
