luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-11 03:34:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename GMenuProxy to GDBusMenuModel

Browse Source 
This improves consistency with GDBusActionGroup.
This commit is contained in:
Ryan Lortie
2011-12-07 21:05:38 -05:00
parent 14900d37f4
commit 1c036cb9f5
5 changed files with 231 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gio/Makefile.am
View File

@@ -135,7 +135,7 @@ application_headers = \
gapplicationcommandline.h \ gapplicationcommandline.h \
gapplication.h \ gapplication.h \
gmenumodel.h \ gmenumodel.h \
gmenuproxy.h \ gdbusmenumodel.h \
gmenu.h \ gmenu.h \
gmenumarkup.h \ gmenumarkup.h \
gmenuexporter.h \ gmenuexporter.h \
@@ -154,7 +154,7 @@ application_sources = \
gapplicationimpl-dbus.c \ gapplicationimpl-dbus.c \
gapplication.c \ gapplication.c \
gmenumodel.c \ gmenumodel.c \
gmenuproxy.c \ gdbusmenumodel.c \
gmenu.c \ gmenu.c \
gmenumarkup.c \ gmenumarkup.c \
gmenuexporter.c \ gmenuexporter.c \

362
gio/gmenuproxy.c → gio/gdbusmenumodel.c
View File

@@ -19,19 +19,19 @@
* Author: Ryan Lortie <desrt@desrt.ca> * Author: Ryan Lortie <desrt@desrt.ca>
*/ */
#include "gmenuproxy.h" #include "gdbusmenumodel.h"
#include "gmenumodel.h" #include "gmenumodel.h"
/* Prelude {{{1 */ /* Prelude {{{1 */
/** /**
* SECTION:gmenuproxy * SECTION:gdbusmenumodel
* @title: GMenuProxy * @title: GDBusMenuModel
* @short_description: A D-Bus GMenuModel implementation * @short_description: A D-Bus GMenuModel implementation
* @see_also: <link linkend="gio-GMenuModel-exporter">GMenuModel Exporter</link> * @see_also: <link linkend="gio-GMenuModel-exporter">GMenuModel Exporter</link>
* *
* #GMenuProxy is an implementation of #GMenuModel that can be used * #GDBusMenuModel is an implementation of #GMenuModel that can be used
* as a proxy for a menu model that is exported over D-Bus with * as a proxy for a menu model that is exported over D-Bus with
* g_menu_model_dbus_export_start(). * g_menu_model_dbus_export_start().
*/ */
@@ -39,126 +39,126 @@
/* /*
* There are 3 main (quasi-)classes involved here: * There are 3 main (quasi-)classes involved here:
* *
* - GMenuProxyPath * - GDBusMenuPath
* - GMenuProxyGroup * - GDBusMenuGroup
* - GMenuProxy * - GDBusMenuModel
* *
* Each of these classes exists as a parameterised singleton keyed to a * Each of these classes exists as a parameterised singleton keyed to a
* particular thing: * particular thing:
* *
* - GMenuProxyPath represents a D-Bus object path on a particular * - GDBusMenuPath represents a D-Bus object path on a particular
* unique bus name on a particular GDBusConnection. * unique bus name on a particular GDBusConnection.
* *
* - GMenuProxyGroup represents a particular group on a particular * - GDBusMenuGroup represents a particular group on a particular
* GMenuProxyPath. * GDBusMenuPath.
* *
* - GMenuProxy represents a particular menu within a particular * - GDBusMenuModel represents a particular menu within a particular
* GMenuProxyGroup. * GDBusMenuGroup.
* *
* There are also two (and a half) utility structs: * There are also two (and a half) utility structs:
* *
* - PathIdentifier and ConstPathIdentifier * - PathIdentifier and ConstPathIdentifier
* - GMenuProxyItem * - GDBusMenuModelItem
* *
* PathIdentifier is the triplet of (GDBusConnection, unique name, * PathIdentifier is the triplet of (GDBusConnection, unique name,
* object path) that uniquely identifies a particular GMenuProxyPath. * object path) that uniquely identifies a particular GDBusMenuPath.
* It holds ownership on each of these things, so we have a * It holds ownership on each of these things, so we have a
* ConstPathIdentifier variant that does not. * ConstPathIdentifier variant that does not.
* *
* We have a 3-level hierarchy of hashtables: * We have a 3-level hierarchy of hashtables:
* *
* - a global hashtable (g_menu_proxy_paths) maps from PathIdentifier * - a global hashtable (g_dbus_menu_paths) maps from PathIdentifier
* to GMenuProxyPath * to GDBusMenuPath
* *
* - each GMenuProxyPath has a hashtable mapping from guint (group * - each GDBusMenuPath has a hashtable mapping from guint (group
* number) to GMenuProxyGroup * number) to GDBusMenuGroup
* *
* - each GMenuProxyGroup has a hashtable mapping from guint (menu * - each GDBusMenuGroup has a hashtable mapping from guint (menu
* number) to GMenuProxy. * number) to GDBusMenuModel.
* *
* In this way, each quintuplet of (connection, bus name, object path, * In this way, each quintuplet of (connection, bus name, object path,
* group id, menu id) maps to a single GMenuProxy instance that can be * group id, menu id) maps to a single GDBusMenuModel instance that can be
* located via 3 hashtable lookups. * located via 3 hashtable lookups.
* *
* All of the 3 classes are refcounted (GMenuProxyPath and * All of the 3 classes are refcounted (GDBusMenuPath and
* GMenuProxyGroup manually, and GMenuProxy by virtue of being a * GDBusMenuGroup manually, and GDBusMenuModel by virtue of being a
* GObject). The hashtables do not hold references -- rather, when the * GObject). The hashtables do not hold references -- rather, when the
* last reference is dropped, the object is removed from the hashtable. * last reference is dropped, the object is removed from the hashtable.
* *
* The hard references go in the other direction: GMenuProxy is created * The hard references go in the other direction: GDBusMenuModel is created
* as the user requests it and only exists as long as the user holds a * as the user requests it and only exists as long as the user holds a
* reference on it. GMenuProxy holds a reference on the GMenuProxyGroup * reference on it. GDBusMenuModel holds a reference on the GDBusMenuGroup
* from which it came. GMenuProxyGroup holds a reference on * from which it came. GDBusMenuGroup holds a reference on
* GMenuProxyPath. * GDBusMenuPath.
* *
* In addition to refcounts, each object has an 'active' variable (ints * In addition to refcounts, each object has an 'active' variable (ints
* for GMenuProxyPath and GMenuProxyGroup, boolean for GMenuProxy). * for GDBusMenuPath and GDBusMenuGroup, boolean for GDBusMenuModel).
* *
* - GMenuProxy is inactive when created and becomes active only when * - GDBusMenuModel is inactive when created and becomes active only when
* first queried for information. This prevents extra work from * first queried for information. This prevents extra work from
* happening just by someone acquiring a GMenuProxy (and not * happening just by someone acquiring a GDBusMenuModel (and not
* actually trying to display it yet). * actually trying to display it yet).
* *
* - The active count on GMenuProxyGroup is equal to the number of * - The active count on GDBusMenuGroup is equal to the number of
* GMenuProxy instances in that group that are active. When the * GDBusMenuModel instances in that group that are active. When the
* active count transitions from 0 to 1, the group calls the 'Start' * active count transitions from 0 to 1, the group calls the 'Start'
* method on the service to begin monitoring that group. When it * method on the service to begin monitoring that group. When it
* drops from 1 to 0, the group calls the 'End' method to stop * drops from 1 to 0, the group calls the 'End' method to stop
* monitoring. * monitoring.
* *
* - The active count on GMenuProxyPath is equal to the number of * - The active count on GDBusMenuPath is equal to the number of
* GMenuProxyGroup instances on that path with a non-zero active * GDBusMenuGroup instances on that path with a non-zero active
* count. When the active count transitions from 0 to 1, the path * count. When the active count transitions from 0 to 1, the path
* sets up a signal subscription to monitor any changes. The signal * sets up a signal subscription to monitor any changes. The signal
* subscription is taken down when the active count transitions from * subscription is taken down when the active count transitions from
* 1 to 0. * 1 to 0.
* *
* When active, GMenuProxyPath gets incoming signals when changes occur. * When active, GDBusMenuPath gets incoming signals when changes occur.
* If the change signal mentions a group for which we currently have an * If the change signal mentions a group for which we currently have an
* active GMenuProxyGroup, the change signal is passed along to that * active GDBusMenuGroup, the change signal is passed along to that
* group. If the group is inactive, the change signal is ignored. * group. If the group is inactive, the change signal is ignored.
* *
* Most of the "work" occurs in GMenuProxyGroup. In addition to the * Most of the "work" occurs in GDBusMenuGroup. In addition to the
* hashtable of GMenuProxy instances, it keeps a hashtable of the actual * hashtable of GDBusMenuModel instances, it keeps a hashtable of the actual
* menu contents, each encoded as GSequence of GMenuProxyItem. It * menu contents, each encoded as GSequence of GDBusMenuModelItem. It
* initially populates this table with the results of the "Start" method * initially populates this table with the results of the "Start" method
* call and then updates it according to incoming change signals. If * call and then updates it according to incoming change signals. If
* the change signal mentions a menu for which we current have an active * the change signal mentions a menu for which we current have an active
* GMenuProxy, the change signal is passed along to that proxy. If the * GDBusMenuModel, the change signal is passed along to that model. If the
* proxy is inactive, the change signal is ignored. * model is inactive, the change signal is ignored.
* *
* GMenuProxyItem is just a pair of hashtables, one for the attributes * GDBusMenuModelItem is just a pair of hashtables, one for the attributes
* and one for the links of the item. Both map strings to GVariant * and one for the links of the item. Both map strings to GVariant
* instances. In the case of links, the GVariant has type '(uu)' and is * instances. In the case of links, the GVariant has type '(uu)' and is
* turned into a GMenuProxy at the point that the user pulls it through * turned into a GDBusMenuModel at the point that the user pulls it through
* the API. * the API.
* *
* Following the "empty is the same as non-existent" rule, the hashtable * Following the "empty is the same as non-existent" rule, the hashtable
* of GSequence of GMenuProxyItem holds NULL for empty menus. * of GSequence of GDBusMenuModelItem holds NULL for empty menus.
* *
* GMenuProxy contains very little functionality of its own. It holds a * GDBusMenuModel contains very little functionality of its own. It holds a
* (weak) reference to the GSequence of GMenuProxyItem contained in the * (weak) reference to the GSequence of GDBusMenuModelItem contained in the
* GMenuProxyGroup. It uses this GSequence to implement the GMenuModel * GDBusMenuGroup. It uses this GSequence to implement the GMenuModel
* interface. It also emits the "items-changed" signal if it is active * interface. It also emits the "items-changed" signal if it is active
* and it was told that the contents of the GSequence changed. * and it was told that the contents of the GSequence changed.
*/ */
typedef struct _GMenuProxyGroup GMenuProxyGroup; typedef struct _GDBusMenuGroup GDBusMenuGroup;
typedef struct _GMenuProxyPath GMenuProxyPath; typedef struct _GDBusMenuPath GDBusMenuPath;
static void g_menu_proxy_group_changed (GMenuProxyGroup *group, static void g_dbus_menu_group_changed (GDBusMenuGroup *group,
guint menu_id, guint menu_id,
gint position, gint position,
gint removed, gint removed,
GVariant *added); GVariant *added);
static void g_menu_proxy_changed (GMenuProxy *proxy, static void g_dbus_menu_model_changed (GDBusMenuModel *proxy,
GSequence *items, GSequence *items,
gint position, gint position,
gint removed, gint removed,
gint added); gint added);
static GMenuProxyGroup * g_menu_proxy_group_get_from_path (GMenuProxyPath *path, static GDBusMenuGroup * g_dbus_menu_group_get_from_path (GDBusMenuPath *path,
guint group_id); guint group_id);
static GMenuProxy * g_menu_proxy_get_from_group (GMenuProxyGroup *group, static GDBusMenuModel * g_dbus_menu_model_get_from_group (GDBusMenuGroup *group,
guint menu_id); guint menu_id);
/* PathIdentifier {{{1 */ /* PathIdentifier {{{1 */
@@ -219,9 +219,9 @@ path_identifier_new (ConstPathIdentifier *cid)
return id; return id;
} }
/* GMenuProxyPath {{{1 */ /* GDBusMenuPath {{{1 */
struct _GMenuProxyPath struct _GDBusMenuPath
{ {
PathIdentifier *id; PathIdentifier *id;
gint ref_count; gint ref_count;
@@ -231,10 +231,10 @@ struct _GMenuProxyPath
guint watch_id; guint watch_id;
}; };
static GHashTable *g_menu_proxy_paths; static GHashTable *g_dbus_menu_paths;
static GMenuProxyPath * static GDBusMenuPath *
g_menu_proxy_path_ref (GMenuProxyPath *path) g_dbus_menu_path_ref (GDBusMenuPath *path)
{ {
path->ref_count++; path->ref_count++;
@@ -242,20 +242,20 @@ g_menu_proxy_path_ref (GMenuProxyPath *path)
} }
static void static void
g_menu_proxy_path_unref (GMenuProxyPath *path) g_dbus_menu_path_unref (GDBusMenuPath *path)
{ {
if (--path->ref_count == 0) if (--path->ref_count == 0)
{ {
g_hash_table_remove (g_menu_proxy_paths, path->id); g_hash_table_remove (g_dbus_menu_paths, path->id);
g_hash_table_unref (path->groups); g_hash_table_unref (path->groups);
path_identifier_free (path->id); path_identifier_free (path->id);
g_slice_free (GMenuProxyPath, path); g_slice_free (GDBusMenuPath, path);
} }
} }
static void static void
g_menu_proxy_path_signal (GDBusConnection *connection, g_dbus_menu_path_signal (GDBusConnection *connection,
const gchar *sender_name, const gchar *sender_name,
const gchar *object_path, const gchar *object_path,
const gchar *interface_name, const gchar *interface_name,
@@ -263,7 +263,7 @@ g_menu_proxy_path_signal (GDBusConnection *connection,
GVariant *parameters, GVariant *parameters,
gpointer user_data) gpointer user_data)
{ {
GMenuProxyPath *path = user_data; GDBusMenuPath *path = user_data;
GVariantIter *iter; GVariantIter *iter;
guint group_id; guint group_id;
guint menu_id; guint menu_id;
@@ -277,61 +277,61 @@ g_menu_proxy_path_signal (GDBusConnection *connection,
g_variant_get (parameters, "(a(uuuuaa{sv}))", &iter); g_variant_get (parameters, "(a(uuuuaa{sv}))", &iter);
while (g_variant_iter_loop (iter, "(uuuu@aa{sv})", &group_id, &menu_id, &position, &removes, &adds)) while (g_variant_iter_loop (iter, "(uuuu@aa{sv})", &group_id, &menu_id, &position, &removes, &adds))
{ {
GMenuProxyGroup *group; GDBusMenuGroup *group;
group = g_hash_table_lookup (path->groups, GINT_TO_POINTER (group_id)); group = g_hash_table_lookup (path->groups, GINT_TO_POINTER (group_id));
if (group != NULL) if (group != NULL)
g_menu_proxy_group_changed (group, menu_id, position, removes, adds); g_dbus_menu_group_changed (group, menu_id, position, removes, adds);
} }
g_variant_iter_free (iter); g_variant_iter_free (iter);
} }
static void static void
g_menu_proxy_path_activate (GMenuProxyPath *path) g_dbus_menu_path_activate (GDBusMenuPath *path)
{ {
if (path->active++ == 0) if (path->active++ == 0)
path->watch_id = g_dbus_connection_signal_subscribe (path->id->connection, path->id->bus_name, path->watch_id = g_dbus_connection_signal_subscribe (path->id->connection, path->id->bus_name,
"org.gtk.Menus", "Changed", path->id->object_path, "org.gtk.Menus", "Changed", path->id->object_path,
NULL, G_DBUS_SIGNAL_FLAGS_NONE, NULL, G_DBUS_SIGNAL_FLAGS_NONE,
g_menu_proxy_path_signal, path, NULL); g_dbus_menu_path_signal, path, NULL);
} }
static void static void
g_menu_proxy_path_deactivate (GMenuProxyPath *path) g_dbus_menu_path_deactivate (GDBusMenuPath *path)
{ {
if (--path->active == 0) if (--path->active == 0)
g_dbus_connection_signal_unsubscribe (path->id->connection, path->watch_id); g_dbus_connection_signal_unsubscribe (path->id->connection, path->watch_id);
} }
static GMenuProxyPath * static GDBusMenuPath *
g_menu_proxy_path_get (GDBusConnection *connection, g_dbus_menu_path_get (GDBusConnection *connection,
const gchar *bus_name, const gchar *bus_name,
const gchar *object_path) const gchar *object_path)
{ {
ConstPathIdentifier cid = { connection, bus_name, object_path }; ConstPathIdentifier cid = { connection, bus_name, object_path };
GMenuProxyPath *path; GDBusMenuPath *path;
if (g_menu_proxy_paths == NULL) if (g_dbus_menu_paths == NULL)
g_menu_proxy_paths = g_hash_table_new (path_identifier_hash, path_identifier_equal); g_dbus_menu_paths = g_hash_table_new (path_identifier_hash, path_identifier_equal);
path = g_hash_table_lookup (g_menu_proxy_paths, &cid); path = g_hash_table_lookup (g_dbus_menu_paths, &cid);
if (path == NULL) if (path == NULL)
{ {
path = g_slice_new (GMenuProxyPath); path = g_slice_new (GDBusMenuPath);
path->id = path_identifier_new (&cid); path->id = path_identifier_new (&cid);
path->groups = g_hash_table_new (NULL, NULL); path->groups = g_hash_table_new (NULL, NULL);
path->ref_count = 0; path->ref_count = 0;
path->active = 0; path->active = 0;
g_hash_table_insert (g_menu_proxy_paths, path->id, path); g_hash_table_insert (g_dbus_menu_paths, path->id, path);
} }
return g_menu_proxy_path_ref (path); return g_dbus_menu_path_ref (path);
} }
/* GMenuProxyGroup, GMenuProxyItem {{{1 */ /* GDBusMenuGroup, GDBusMenuModelItem {{{1 */
typedef enum typedef enum
{ {
GROUP_OFFLINE, GROUP_OFFLINE,
@@ -339,12 +339,12 @@ typedef enum
GROUP_ONLINE GROUP_ONLINE
} GroupStatus; } GroupStatus;
struct _GMenuProxyGroup struct _GDBusMenuGroup
{ {
GMenuProxyPath *path; GDBusMenuPath *path;
guint id; guint id;
GHashTable *proxies; /* uint -> unowned GMenuProxy */ GHashTable *proxies; /* uint -> unowned GDBusMenuModel */
GHashTable *menus; /* uint -> owned GSequence */ GHashTable *menus; /* uint -> owned GSequence */
gint ref_count; gint ref_count;
GroupStatus state; GroupStatus state;
@@ -355,10 +355,10 @@ typedef struct
{ {
GHashTable *attributes; GHashTable *attributes;
GHashTable *links; GHashTable *links;
} GMenuProxyItem; } GDBusMenuModelItem;
static GMenuProxyGroup * static GDBusMenuGroup *
g_menu_proxy_group_ref (GMenuProxyGroup *group) g_dbus_menu_group_ref (GDBusMenuGroup *group)
{ {
group->ref_count++; group->ref_count++;
@@ -366,7 +366,7 @@ g_menu_proxy_group_ref (GMenuProxyGroup *group)
} }
static void static void
g_menu_proxy_group_unref (GMenuProxyGroup *group) g_dbus_menu_group_unref (GDBusMenuGroup *group)
{ {
if (--group->ref_count == 0) if (--group->ref_count == 0)
{ {
@@ -376,32 +376,32 @@ g_menu_proxy_group_unref (GMenuProxyGroup *group)
g_hash_table_remove (group->path->groups, GINT_TO_POINTER (group->id)); g_hash_table_remove (group->path->groups, GINT_TO_POINTER (group->id));
g_hash_table_unref (group->proxies); g_hash_table_unref (group->proxies);
g_menu_proxy_path_unref (group->path); g_dbus_menu_path_unref (group->path);
g_slice_free (GMenuProxyGroup, group); g_slice_free (GDBusMenuGroup, group);
} }
} }
static void static void
g_menu_proxy_item_free (gpointer data) g_dbus_menu_model_item_free (gpointer data)
{ {
GMenuProxyItem *item = data; GDBusMenuModelItem *item = data;
g_hash_table_unref (item->attributes); g_hash_table_unref (item->attributes);
g_hash_table_unref (item->links); g_hash_table_unref (item->links);
g_slice_free (GMenuProxyItem, item); g_slice_free (GDBusMenuModelItem, item);
} }
static GMenuProxyItem * static GDBusMenuModelItem *
g_menu_proxy_group_create_item (GVariant *description) g_dbus_menu_group_create_item (GVariant *description)
{ {
GMenuProxyItem *item; GDBusMenuModelItem *item;
GVariantIter iter; GVariantIter iter;
const gchar *key; const gchar *key;
GVariant *value; GVariant *value;
item = g_slice_new (GMenuProxyItem); item = g_slice_new (GDBusMenuModelItem);
item->attributes = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_variant_unref); item->attributes = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_variant_unref);
item->links = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_variant_unref); item->links = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_variant_unref);
@@ -417,7 +417,7 @@ g_menu_proxy_group_create_item (GVariant *description)
} }
/* /*
* GMenuProxyGroup can be in three states: * GDBusMenuGroup can be in three states:
* *
* OFFLINE: not subscribed to this group * OFFLINE: not subscribed to this group
* PENDING: we made the call to subscribe to this group, but the result * PENDING: we made the call to subscribe to this group, but the result
@@ -456,7 +456,7 @@ g_menu_proxy_group_create_item (GVariant *description)
* ONLINE: this should not be possible * ONLINE: this should not be possible
* *
* We have to take care with regards to signal subscriptions (ie: * We have to take care with regards to signal subscriptions (ie:
* activation of the GMenuProxyPath). The signal subscription is always * activation of the GDBusMenuPath). The signal subscription is always
* established when transitioning from OFFLINE to PENDING and taken down * established when transitioning from OFFLINE to PENDING and taken down
* when transitioning to OFFLINE (from either PENDING or ONLINE). * when transitioning to OFFLINE (from either PENDING or ONLINE).
* *
@@ -464,9 +464,9 @@ g_menu_proxy_group_create_item (GVariant *description)
* that code out into a separate function. * that code out into a separate function.
*/ */
static void static void
g_menu_proxy_group_go_offline (GMenuProxyGroup *group) g_dbus_menu_group_go_offline (GDBusMenuGroup *group)
{ {
g_menu_proxy_path_deactivate (group->path); g_dbus_menu_path_deactivate (group->path);
g_dbus_connection_call (group->path->id->connection, g_dbus_connection_call (group->path->id->connection,
group->path->id->bus_name, group->path->id->bus_name,
group->path->id->object_path, group->path->id->object_path,
@@ -479,12 +479,12 @@ g_menu_proxy_group_go_offline (GMenuProxyGroup *group)
static void static void
g_menu_proxy_group_start_ready (GObject *source_object, g_dbus_menu_group_start_ready (GObject *source_object,
GAsyncResult *result, GAsyncResult *result,
gpointer user_data) gpointer user_data)
{ {
GDBusConnection *connection = G_DBUS_CONNECTION (source_object); GDBusConnection *connection = G_DBUS_CONNECTION (source_object);
GMenuProxyGroup *group = user_data; GDBusMenuGroup *group = user_data;
GVariant *reply; GVariant *reply;
g_assert (group->state == GROUP_PENDING); g_assert (group->state == GROUP_PENDING);
@@ -506,21 +506,21 @@ g_menu_proxy_group_start_ready (GObject *source_object,
g_variant_get (reply, "(a(uuaa{sv}))", &iter); g_variant_get (reply, "(a(uuaa{sv}))", &iter);
while (g_variant_iter_loop (iter, "(uu@aa{sv})", &group_id, &menu_id, &items)) while (g_variant_iter_loop (iter, "(uu@aa{sv})", &group_id, &menu_id, &items))
if (group_id == group->id) if (group_id == group->id)
g_menu_proxy_group_changed (group, menu_id, 0, 0, items); g_dbus_menu_group_changed (group, menu_id, 0, 0, items);
g_variant_iter_free (iter); g_variant_iter_free (iter);
} }
} }
else else
g_menu_proxy_group_go_offline (group); g_dbus_menu_group_go_offline (group);
if (reply) if (reply)
g_variant_unref (reply); g_variant_unref (reply);
g_menu_proxy_group_unref (group); g_dbus_menu_group_unref (group);
} }
static void static void
g_menu_proxy_group_activate (GMenuProxyGroup *group) g_dbus_menu_group_activate (GDBusMenuGroup *group)
{ {
if (group->active++ == 0) if (group->active++ == 0)
{ {
@@ -528,7 +528,7 @@ g_menu_proxy_group_activate (GMenuProxyGroup *group)
if (group->state == GROUP_OFFLINE) if (group->state == GROUP_OFFLINE)
{ {
g_menu_proxy_path_activate (group->path); g_dbus_menu_path_activate (group->path);
g_dbus_connection_call (group->path->id->connection, g_dbus_connection_call (group->path->id->connection,
group->path->id->bus_name, group->path->id->bus_name,
@@ -537,15 +537,15 @@ g_menu_proxy_group_activate (GMenuProxyGroup *group)
g_variant_new_parsed ("([ %u ],)", group->id), g_variant_new_parsed ("([ %u ],)", group->id),
G_VARIANT_TYPE ("(a(uuaa{sv}))"), G_VARIANT_TYPE ("(a(uuaa{sv}))"),
G_DBUS_CALL_FLAGS_NONE, -1, NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL,
g_menu_proxy_group_start_ready, g_dbus_menu_group_start_ready,
g_menu_proxy_group_ref (group)); g_dbus_menu_group_ref (group));
group->state = GROUP_PENDING; group->state = GROUP_PENDING;
} }
} }
} }
static void static void
g_menu_proxy_group_deactivate (GMenuProxyGroup *group) g_dbus_menu_group_deactivate (GDBusMenuGroup *group)
{ {
if (--group->active == 0) if (--group->active == 0)
{ {
@@ -558,13 +558,13 @@ g_menu_proxy_group_deactivate (GMenuProxyGroup *group)
*/ */
g_hash_table_remove_all (group->menus); g_hash_table_remove_all (group->menus);
g_menu_proxy_group_go_offline (group); g_dbus_menu_group_go_offline (group);
} }
} }
} }
static void static void
g_menu_proxy_group_changed (GMenuProxyGroup *group, g_dbus_menu_group_changed (GDBusMenuGroup *group,
guint menu_id, guint menu_id,
gint position, gint position,
gint removed, gint removed,
@@ -572,7 +572,7 @@ g_menu_proxy_group_changed (GMenuProxyGroup *group,
{ {
GSequenceIter *point; GSequenceIter *point;
GVariantIter iter; GVariantIter iter;
GMenuProxy *proxy; GDBusMenuModel *proxy;
GSequence *items; GSequence *items;
GVariant *item; GVariant *item;
gint n_added; gint n_added;
@@ -590,7 +590,7 @@ g_menu_proxy_group_changed (GMenuProxyGroup *group,
if (items == NULL) if (items == NULL)
{ {
items = g_sequence_new (g_menu_proxy_item_free); items = g_sequence_new (g_dbus_menu_model_item_free);
g_hash_table_insert (group->menus, GINT_TO_POINTER (menu_id), items); g_hash_table_insert (group->menus, GINT_TO_POINTER (menu_id), items);
} }
@@ -608,7 +608,7 @@ g_menu_proxy_group_changed (GMenuProxyGroup *group,
n_added = g_variant_iter_init (&iter, added); n_added = g_variant_iter_init (&iter, added);
while (g_variant_iter_loop (&iter, "@a{sv}", &item)) while (g_variant_iter_loop (&iter, "@a{sv}", &item))
g_sequence_insert_before (point, g_menu_proxy_group_create_item (item)); g_sequence_insert_before (point, g_dbus_menu_group_create_item (item));
if (g_sequence_get_length (items) == 0) if (g_sequence_get_length (items) == 0)
{ {
@@ -617,21 +617,21 @@ g_menu_proxy_group_changed (GMenuProxyGroup *group,
} }
if ((proxy = g_hash_table_lookup (group->proxies, GINT_TO_POINTER (menu_id)))) if ((proxy = g_hash_table_lookup (group->proxies, GINT_TO_POINTER (menu_id))))
g_menu_proxy_changed (proxy, items, position, removed, n_added); g_dbus_menu_model_changed (proxy, items, position, removed, n_added);
} }
static GMenuProxyGroup * static GDBusMenuGroup *
g_menu_proxy_group_get_from_path (GMenuProxyPath *path, g_dbus_menu_group_get_from_path (GDBusMenuPath *path,
guint group_id) guint group_id)
{ {
GMenuProxyGroup *group; GDBusMenuGroup *group;
group = g_hash_table_lookup (path->groups, GINT_TO_POINTER (group_id)); group = g_hash_table_lookup (path->groups, GINT_TO_POINTER (group_id));
if (group == NULL) if (group == NULL)
{ {
group = g_slice_new (GMenuProxyGroup); group = g_slice_new (GDBusMenuGroup);
group->path = g_menu_proxy_path_ref (path); group->path = g_dbus_menu_path_ref (path);
group->id = group_id; group->id = group_id;
group->proxies = g_hash_table_new (NULL, NULL); group->proxies = g_hash_table_new (NULL, NULL);
group->menus = g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify) g_sequence_free); group->menus = g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify) g_sequence_free);
@@ -642,55 +642,55 @@ g_menu_proxy_group_get_from_path (GMenuProxyPath *path,
g_hash_table_insert (path->groups, GINT_TO_POINTER (group->id), group); g_hash_table_insert (path->groups, GINT_TO_POINTER (group->id), group);
} }
return g_menu_proxy_group_ref (group); return g_dbus_menu_group_ref (group);
} }
static GMenuProxyGroup * static GDBusMenuGroup *
g_menu_proxy_group_get (GDBusConnection *connection, g_dbus_menu_group_get (GDBusConnection *connection,
const gchar *bus_name, const gchar *bus_name,
const gchar *object_path, const gchar *object_path,
guint group_id) guint group_id)
{ {
GMenuProxyGroup *group; GDBusMenuGroup *group;
GMenuProxyPath *path; GDBusMenuPath *path;
path = g_menu_proxy_path_get (connection, bus_name, object_path); path = g_dbus_menu_path_get (connection, bus_name, object_path);
group = g_menu_proxy_group_get_from_path (path, group_id); group = g_dbus_menu_group_get_from_path (path, group_id);
g_menu_proxy_path_unref (path); g_dbus_menu_path_unref (path);
return group; return group;
} }
/* GMenuProxy {{{1 */ /* GDBusMenuModel {{{1 */
typedef GMenuModelClass GMenuProxyClass; typedef GMenuModelClass GDBusMenuModelClass;
struct _GMenuProxy struct _GDBusMenuModel
{ {
GMenuModel parent; GMenuModel parent;
GMenuProxyGroup *group; GDBusMenuGroup *group;
guint id; guint id;
GSequence *items; /* unowned */ GSequence *items; /* unowned */
gboolean active; gboolean active;
}; };
G_DEFINE_TYPE (GMenuProxy, g_menu_proxy, G_TYPE_MENU_MODEL) G_DEFINE_TYPE (GDBusMenuModel, g_dbus_menu_model, G_TYPE_MENU_MODEL)
static gboolean static gboolean
g_menu_proxy_is_mutable (GMenuModel *model) g_dbus_menu_model_is_mutable (GMenuModel *model)
{ {
return TRUE; return TRUE;
} }
static gint static gint
g_menu_proxy_get_n_items (GMenuModel *model) g_dbus_menu_model_get_n_items (GMenuModel *model)
{ {
GMenuProxy *proxy = G_MENU_PROXY (model); GDBusMenuModel *proxy = G_DBUS_MENU_MODEL (model);
if (!proxy->active) if (!proxy->active)
{ {
g_menu_proxy_group_activate (proxy->group); g_dbus_menu_group_activate (proxy->group);
proxy->active = TRUE; proxy->active = TRUE;
} }
@@ -698,12 +698,12 @@ g_menu_proxy_get_n_items (GMenuModel *model)
} }
static void static void
g_menu_proxy_get_item_attributes (GMenuModel *model, g_dbus_menu_model_get_item_attributes (GMenuModel *model,
gint item_index, gint item_index,
GHashTable **table) GHashTable **table)
{ {
GMenuProxy *proxy = G_MENU_PROXY (model); GDBusMenuModel *proxy = G_DBUS_MENU_MODEL (model);
GMenuProxyItem *item; GDBusMenuModelItem *item;
GSequenceIter *iter; GSequenceIter *iter;
g_return_if_fail (proxy->active); g_return_if_fail (proxy->active);
@@ -719,12 +719,12 @@ g_menu_proxy_get_item_attributes (GMenuModel *model,
} }
static void static void
g_menu_proxy_get_item_links (GMenuModel *model, g_dbus_menu_model_get_item_links (GMenuModel *model,
gint item_index, gint item_index,
GHashTable **table) GHashTable **table)
{ {
GMenuProxy *proxy = G_MENU_PROXY (model); GDBusMenuModel *proxy = G_DBUS_MENU_MODEL (model);
GMenuProxyItem *item; GDBusMenuModelItem *item;
GSequenceIter *iter; GSequenceIter *iter;
g_return_if_fail (proxy->active); g_return_if_fail (proxy->active);
@@ -749,62 +749,62 @@ g_menu_proxy_get_item_links (GMenuModel *model,
if (g_variant_is_of_type (value, G_VARIANT_TYPE ("(uu)"))) if (g_variant_is_of_type (value, G_VARIANT_TYPE ("(uu)")))
{ {
guint group_id, menu_id; guint group_id, menu_id;
GMenuProxyGroup *group; GDBusMenuGroup *group;
GMenuProxy *link; GDBusMenuModel *link;
g_variant_get (value, "(uu)", &group_id, &menu_id); g_variant_get (value, "(uu)", &group_id, &menu_id);
/* save the hash lookup in a relatively common case */ /* save the hash lookup in a relatively common case */
if (proxy->group->id != group_id) if (proxy->group->id != group_id)
group = g_menu_proxy_group_get_from_path (proxy->group->path, group_id); group = g_dbus_menu_group_get_from_path (proxy->group->path, group_id);
else else
group = g_menu_proxy_group_ref (proxy->group); group = g_dbus_menu_group_ref (proxy->group);
link = g_menu_proxy_get_from_group (group, menu_id); link = g_dbus_menu_model_get_from_group (group, menu_id);
g_hash_table_insert (*table, g_strdup (key), link); g_hash_table_insert (*table, g_strdup (key), link);
g_menu_proxy_group_unref (group); g_dbus_menu_group_unref (group);
} }
} }
} }
} }
static void static void
g_menu_proxy_finalize (GObject *object) g_dbus_menu_model_finalize (GObject *object)
{ {
GMenuProxy *proxy = G_MENU_PROXY (object); GDBusMenuModel *proxy = G_DBUS_MENU_MODEL (object);
if (proxy->active) if (proxy->active)
g_menu_proxy_group_deactivate (proxy->group); g_dbus_menu_group_deactivate (proxy->group);
g_hash_table_remove (proxy->group->proxies, GINT_TO_POINTER (proxy->id)); g_hash_table_remove (proxy->group->proxies, GINT_TO_POINTER (proxy->id));
g_menu_proxy_group_unref (proxy->group); g_dbus_menu_group_unref (proxy->group);
G_OBJECT_CLASS (g_menu_proxy_parent_class) G_OBJECT_CLASS (g_dbus_menu_model_parent_class)
->finalize (object); ->finalize (object);
} }
static void static void
g_menu_proxy_init (GMenuProxy *proxy) g_dbus_menu_model_init (GDBusMenuModel *proxy)
{ {
} }
static void static void
g_menu_proxy_class_init (GMenuProxyClass *class) g_dbus_menu_model_class_init (GDBusMenuModelClass *class)
{ {
GObjectClass *object_class = G_OBJECT_CLASS (class); GObjectClass *object_class = G_OBJECT_CLASS (class);
class->is_mutable = g_menu_proxy_is_mutable; class->is_mutable = g_dbus_menu_model_is_mutable;
class->get_n_items = g_menu_proxy_get_n_items; class->get_n_items = g_dbus_menu_model_get_n_items;
class->get_item_attributes = g_menu_proxy_get_item_attributes; class->get_item_attributes = g_dbus_menu_model_get_item_attributes;
class->get_item_links = g_menu_proxy_get_item_links; class->get_item_links = g_dbus_menu_model_get_item_links;
object_class->finalize = g_menu_proxy_finalize; object_class->finalize = g_dbus_menu_model_finalize;
} }
static void static void
g_menu_proxy_changed (GMenuProxy *proxy, g_dbus_menu_model_changed (GDBusMenuModel *proxy,
GSequence *items, GSequence *items,
gint position, gint position,
gint removed, gint removed,
@@ -816,11 +816,11 @@ g_menu_proxy_changed (GMenuProxy *proxy,
g_menu_model_items_changed (G_MENU_MODEL (proxy), position, removed, added); g_menu_model_items_changed (G_MENU_MODEL (proxy), position, removed, added);
} }
static GMenuProxy * static GDBusMenuModel *
g_menu_proxy_get_from_group (GMenuProxyGroup *group, g_dbus_menu_model_get_from_group (GDBusMenuGroup *group,
guint menu_id) guint menu_id)
{ {
GMenuProxy *proxy; GDBusMenuModel *proxy;
proxy = g_hash_table_lookup (group->proxies, GINT_TO_POINTER (menu_id)); proxy = g_hash_table_lookup (group->proxies, GINT_TO_POINTER (menu_id));
if (proxy) if (proxy)
@@ -828,10 +828,10 @@ g_menu_proxy_get_from_group (GMenuProxyGroup *group,
if (proxy == NULL) if (proxy == NULL)
{ {
proxy = g_object_new (G_TYPE_MENU_PROXY, NULL); proxy = g_object_new (G_TYPE_DBUS_MENU_MODEL, NULL);
proxy->items = g_hash_table_lookup (group->menus, GINT_TO_POINTER (menu_id)); proxy->items = g_hash_table_lookup (group->menus, GINT_TO_POINTER (menu_id));
g_hash_table_insert (group->proxies, GINT_TO_POINTER (menu_id), proxy); g_hash_table_insert (group->proxies, GINT_TO_POINTER (menu_id), proxy);
proxy->group = g_menu_proxy_group_ref (group); proxy->group = g_dbus_menu_group_ref (group);
proxy->id = menu_id; proxy->id = menu_id;
} }
@@ -839,27 +839,27 @@ g_menu_proxy_get_from_group (GMenuProxyGroup *group,
} }
/** /**
* g_menu_proxy_get: * g_dbus_menu_model_get:
* @connection: a #GDBusConnection * @connection: a #GDBusConnection
* @bus_name: the bus name which exports the menu model * @bus_name: the bus name which exports the menu model
* @object_path: the object path at which the menu model is exported * @object_path: the object path at which the menu model is exported
* *
* Obtains a #GMenuProxy for the menu model which is exported * Obtains a #GDBusMenuModel for the menu model which is exported
* at the given @bus_name and @object_path. * at the given @bus_name and @object_path.
* *
* Returns: (transfer full): a #GMenuProxy object. Free with g_object_unref(). * Returns: (transfer full): a #GDBusMenuModel object. Free with g_object_unref().
*/ */
GMenuProxy * GDBusMenuModel *
g_menu_proxy_get (GDBusConnection *connection, g_dbus_menu_model_get (GDBusConnection *connection,
const gchar *bus_name, const gchar *bus_name,
const gchar *object_path) const gchar *object_path)
{ {
GMenuProxyGroup *group; GDBusMenuGroup *group;
GMenuProxy *proxy; GDBusMenuModel *proxy;
group = g_menu_proxy_group_get (connection, bus_name, object_path, 0); group = g_dbus_menu_group_get (connection, bus_name, object_path, 0);
proxy = g_menu_proxy_get_from_group (group, 0); proxy = g_dbus_menu_model_get_from_group (group, 0);
g_menu_proxy_group_unref (group); g_dbus_menu_group_unref (group);
return proxy; return proxy;
} }
@@ -868,7 +868,7 @@ g_menu_proxy_get (GDBusConnection *connection,
static void static void
dump_proxy (gpointer key, gpointer value, gpointer data) dump_proxy (gpointer key, gpointer value, gpointer data)
{ {
GMenuProxy *proxy = value; GDBusMenuModel *proxy = value;
g_print (" menu %d refcount %d active %d\n", g_print (" menu %d refcount %d active %d\n",
proxy->id, G_OBJECT (proxy)->ref_count, proxy->active); proxy->id, G_OBJECT (proxy)->ref_count, proxy->active);
@@ -877,7 +877,7 @@ dump_proxy (gpointer key, gpointer value, gpointer data)
static void static void
dump_group (gpointer key, gpointer value, gpointer data) dump_group (gpointer key, gpointer value, gpointer data)
{ {
GMenuProxyGroup *group = value; GDBusMenuGroup *group = value;
g_print (" group %d refcount %d state %d active %d\n", g_print (" group %d refcount %d state %d active %d\n",
group->id, group->ref_count, group->state, group->active); group->id, group->ref_count, group->state, group->active);
@@ -889,16 +889,16 @@ static void
dump_path (gpointer key, gpointer value, gpointer data) dump_path (gpointer key, gpointer value, gpointer data)
{ {
PathIdentifier *pid = key; PathIdentifier *pid = key;
GMenuProxyPath *path = value; GDBusMenuPath *path = value;
g_print ("%s active %d\n", pid->object_path, path->active); g_print ("%s active %d\n", pid->object_path, path->active);
g_hash_table_foreach (path->groups, dump_group, NULL); g_hash_table_foreach (path->groups, dump_group, NULL);
} }
void void
g_menu_proxy_dump (void) g_dbus_menu_model_dump (void)
{ {
g_hash_table_foreach (g_menu_proxy_paths, dump_path, NULL); g_hash_table_foreach (g_dbus_menu_paths, dump_path, NULL);
} }
#endif #endif

23
gio/gmenuproxy.h → gio/gdbusmenumodel.h
View File

@@ -19,26 +19,27 @@
* Author: Ryan Lortie <desrt@desrt.ca> * Author: Ryan Lortie <desrt@desrt.ca>
*/ */
#ifndef __G_MENU_PROXY_H__ #ifndef __G_DBUS_MENU_MODEL_H__
#define __G_MENU_PROXY_H__ #define __G_DBUS_MENU_MODEL_H__
#include <gio/gdbusconnection.h> #include <gio/gdbusconnection.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define G_TYPE_MENU_PROXY (g_menu_proxy_get_type ()) #define G_TYPE_DBUS_MENU_MODEL (g_dbus_menu_model_get_type ())
#define G_MENU_PROXY(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \ #define G_DBUS_MENU_MODEL(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
G_TYPE_MENU_PROXY, GMenuProxy)) G_TYPE_DBUS_MENU_MODEL, GDBusMenuModel))
#define G_IS_MENU_PROXY(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \ #define G_IS_DBUS_MENU_MODEL(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
G_TYPE_MENU_PROXY)) G_TYPE_DBUS_MENU_MODEL))
typedef struct _GMenuProxy GMenuProxy; typedef struct _GDBusMenuModel GDBusMenuModel;
GType g_menu_proxy_get_type (void) G_GNUC_CONST; GType g_dbus_menu_model_get_type (void) G_GNUC_CONST;
GMenuProxy * g_menu_proxy_get (GDBusConnection *connection,
GDBusMenuModel * g_dbus_menu_model_get (GDBusConnection *connection,
const gchar *bus_name, const gchar *bus_name,
const gchar *object_path); const gchar *object_path);
G_END_DECLS G_END_DECLS
#endif /* __G_MENU_PROXY_H__ */ #endif /* __G_DBUS_MENU_MODEL_H__ */

2
gio/gio.h
View File

@@ -151,7 +151,7 @@
#include <gio/gmenu.h> #include <gio/gmenu.h>
#include <gio/gmenuexporter.h> #include <gio/gmenuexporter.h>
#include <gio/gmenumarkup.h> #include <gio/gmenumarkup.h>
#include <gio/gmenuproxy.h> #include <gio/gdbusmenumodel.h>
#undef __GIO_GIO_H_INSIDE__ #undef __GIO_GIO_H_INSIDE__

8
gio/tests/gmenumodel.c
View File

@@ -554,7 +554,7 @@ struct roundtrip_state
{ {
RandomMenu *random; RandomMenu *random;
MirrorMenu *proxy_mirror; MirrorMenu *proxy_mirror;
GMenuProxy *proxy; GDBusMenuModel *proxy;
GMainLoop *loop; GMainLoop *loop;
GRand *rand; GRand *rand;
gint success; gint success;
@@ -602,7 +602,7 @@ test_dbus_roundtrip (void)
state.random = random_menu_new (state.rand, 2); state.random = random_menu_new (state.rand, 2);
export_id = g_dbus_connection_export_menu_model (bus, "/", G_MENU_MODEL (state.random), NULL); export_id = g_dbus_connection_export_menu_model (bus, "/", G_MENU_MODEL (state.random), NULL);
state.proxy = g_menu_proxy_get (bus, g_dbus_connection_get_unique_name (bus), "/"); state.proxy = g_dbus_menu_model_get (bus, g_dbus_connection_get_unique_name (bus), "/");
state.proxy_mirror = mirror_menu_new (G_MENU_MODEL (state.proxy)); state.proxy_mirror = mirror_menu_new (G_MENU_MODEL (state.proxy));
state.count = 0; state.count = 0;
state.success = 0; state.success = 0;
@@ -649,7 +649,7 @@ test_dbus_subscriptions (void)
{ {
GDBusConnection *bus; GDBusConnection *bus;
GMenu *menu; GMenu *menu;
GMenuProxy *proxy; GDBusMenuModel *proxy;
GMainLoop *loop; GMainLoop *loop;
GError *error = NULL; GError *error = NULL;
guint export_id; guint export_id;
@@ -663,7 +663,7 @@ test_dbus_subscriptions (void)
export_id = g_dbus_connection_export_menu_model (bus, "/", G_MENU_MODEL (menu), &error); export_id = g_dbus_connection_export_menu_model (bus, "/", G_MENU_MODEL (menu), &error);
g_assert_no_error (error); g_assert_no_error (error);
proxy = g_menu_proxy_get (bus, g_dbus_connection_get_unique_name (bus), "/"); proxy = g_dbus_menu_model_get (bus, g_dbus_connection_get_unique_name (bus), "/");
items_changed_count = 0; items_changed_count = 0;
g_signal_connect (proxy, "items-changed", g_signal_connect (proxy, "items-changed",
G_CALLBACK (items_changed), NULL); G_CALLBACK (items_changed), NULL);