From aabdb7e190fc4db595484e05e40315985c6c4645 Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Wed, 21 Sep 2011 08:16:43 -0400 Subject: [PATCH] GDBusObject{Proxy,Skeleton}: Prefix properties with g- to avoid collisions Otherwise we might collide with an interface called Connection. https://bugzilla.gnome.org/show_bug.cgi?id=659699 This is for the same reason that GDBusProxy has its properties prefixed with g-. Signed-off-by: David Zeuthen --- gio/gdbus-2.0/codegen/codegen.py | 4 ++-- gio/gdbusobjectmanagerclient.c | 4 ++-- gio/gdbusobjectmanagerserver.c | 2 +- gio/gdbusobjectproxy.c | 28 ++++++++++++++-------------- gio/gdbusobjectskeleton.c | 16 ++++++++-------- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/gio/gdbus-2.0/codegen/codegen.py b/gio/gdbus-2.0/codegen/codegen.py index daf9766..6e4aca1 100644 --- a/gio/gdbus-2.0/codegen/codegen.py +++ b/gio/gdbus-2.0/codegen/codegen.py @@ -2838,7 +2838,7 @@ class CodeGenerator: '{\n' ' g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), NULL);\n' ' g_return_val_if_fail (g_variant_is_object_path (object_path), NULL);\n' - ' return %sOBJECT_PROXY (g_object_new (%sTYPE_OBJECT_PROXY, "connection", connection, "object-path", object_path, NULL));\n' + ' return %sOBJECT_PROXY (g_object_new (%sTYPE_OBJECT_PROXY, "g-connection", connection, "g-object-path", object_path, NULL));\n' '}\n' '\n'%(self.namespace, self.ns_lower, self.ns_upper, self.ns_upper)) @@ -2979,7 +2979,7 @@ class CodeGenerator: '%sobject_skeleton_new (const gchar *object_path)\n' '{\n' ' g_return_val_if_fail (g_variant_is_object_path (object_path), NULL);\n' - ' return %sOBJECT_SKELETON (g_object_new (%sTYPE_OBJECT_SKELETON, "object-path", object_path, NULL));\n' + ' return %sOBJECT_SKELETON (g_object_new (%sTYPE_OBJECT_SKELETON, "g-object-path", object_path, NULL));\n' '}\n' '\n'%(self.namespace, self.ns_lower, self.ns_upper, self.ns_upper)) for i in self.ifaces: diff --git a/gio/gdbusobjectmanagerclient.c b/gio/gdbusobjectmanagerclient.c index 2f581db..cffbd09 100644 --- a/gio/gdbusobjectmanagerclient.c +++ b/gio/gdbusobjectmanagerclient.c @@ -1444,8 +1444,8 @@ add_interfaces (GDBusObjectManagerClient *manager, object_proxy_type = G_TYPE_DBUS_OBJECT_PROXY; } op = g_object_new (object_proxy_type, - "connection", manager->priv->connection, - "object-path", object_path, + "g-connection", manager->priv->connection, + "g-object-path", object_path, NULL); added = TRUE; } diff --git a/gio/gdbusobjectmanagerserver.c b/gio/gdbusobjectmanagerserver.c index f0eb389..70ed766 100644 --- a/gio/gdbusobjectmanagerserver.c +++ b/gio/gdbusobjectmanagerserver.c @@ -549,7 +549,7 @@ g_dbus_object_manager_server_export (GDBusObjectManagerServer *manager, * Like g_dbus_object_manager_server_export() but appends a string of * the form _N (with N being a natural number) to * @object's object path if an object with the given path - * already exists. As such, the #GDBusObjectProxy:object-path property + * already exists. As such, the #GDBusObjectProxy:g-object-path property * of @object may be modified. * * Since: 2.30 diff --git a/gio/gdbusobjectproxy.c b/gio/gdbusobjectproxy.c index 2249303..c2dd2bb 100644 --- a/gio/gdbusobjectproxy.c +++ b/gio/gdbusobjectproxy.c @@ -55,8 +55,8 @@ struct _GDBusObjectProxyPrivate enum { PROP_0, - PROP_OBJECT_PATH, - PROP_CONNECTION + PROP_G_OBJECT_PATH, + PROP_G_CONNECTION }; static void dbus_object_interface_init (GDBusObjectIface *iface); @@ -87,13 +87,13 @@ g_dbus_object_proxy_get_property (GObject *object, switch (prop_id) { - case PROP_OBJECT_PATH: + case PROP_G_OBJECT_PATH: g_mutex_lock (proxy->priv->lock); g_value_set_string (value, proxy->priv->object_path); g_mutex_unlock (proxy->priv->lock); break; - case PROP_CONNECTION: + case PROP_G_CONNECTION: g_value_set_object (value, g_dbus_object_proxy_get_connection (proxy)); break; @@ -113,13 +113,13 @@ g_dbus_object_proxy_set_property (GObject *object, switch (prop_id) { - case PROP_OBJECT_PATH: + case PROP_G_OBJECT_PATH: g_mutex_lock (proxy->priv->lock); proxy->priv->object_path = g_value_dup_string (value); g_mutex_unlock (proxy->priv->lock); break; - case PROP_CONNECTION: + case PROP_G_CONNECTION: g_mutex_lock (proxy->priv->lock); proxy->priv->connection = g_value_dup_object (value); g_mutex_unlock (proxy->priv->lock); @@ -141,15 +141,15 @@ g_dbus_object_proxy_class_init (GDBusObjectProxyClass *klass) gobject_class->get_property = g_dbus_object_proxy_get_property; /** - * GDBusObjectProxy:object-path: + * GDBusObjectProxy:g-object-path: * * The object path of the proxy. * * Since: 2.30 */ g_object_class_install_property (gobject_class, - PROP_OBJECT_PATH, - g_param_spec_string ("object-path", + PROP_G_OBJECT_PATH, + g_param_spec_string ("g-object-path", "Object Path", "The object path of the proxy", NULL, @@ -158,15 +158,15 @@ g_dbus_object_proxy_class_init (GDBusObjectProxyClass *klass) G_PARAM_STATIC_STRINGS)); /** - * GDBusObjectProxy:connection: + * GDBusObjectProxy:g-connection: * * The connection of the proxy. * * Since: 2.30 */ g_object_class_install_property (gobject_class, - PROP_CONNECTION, - g_param_spec_object ("connection", + PROP_G_CONNECTION, + g_param_spec_object ("g-connection", "Connection", "The connection of the proxy", G_TYPE_DBUS_CONNECTION, @@ -281,8 +281,8 @@ g_dbus_object_proxy_new (GDBusConnection *connection, g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), NULL); g_return_val_if_fail (g_variant_is_object_path (object_path), NULL); return G_DBUS_OBJECT_PROXY (g_object_new (G_TYPE_DBUS_OBJECT_PROXY, - "object-path", object_path, - "connection", connection, + "g-object-path", object_path, + "g-connection", connection, NULL)); } diff --git a/gio/gdbusobjectskeleton.c b/gio/gdbusobjectskeleton.c index af75220..1b4c31b 100644 --- a/gio/gdbusobjectskeleton.c +++ b/gio/gdbusobjectskeleton.c @@ -55,7 +55,7 @@ struct _GDBusObjectSkeletonPrivate enum { PROP_0, - PROP_OBJECT_PATH + PROP_G_OBJECT_PATH }; enum @@ -96,7 +96,7 @@ g_dbus_object_skeleton_get_property (GObject *_object, switch (prop_id) { - case PROP_OBJECT_PATH: + case PROP_G_OBJECT_PATH: g_mutex_lock (object->priv->lock); g_value_take_string (value, object->priv->object_path); g_mutex_unlock (object->priv->lock); @@ -118,7 +118,7 @@ g_dbus_object_skeleton_set_property (GObject *_object, switch (prop_id) { - case PROP_OBJECT_PATH: + case PROP_G_OBJECT_PATH: g_dbus_object_skeleton_set_object_path (object, g_value_get_string (value)); break; @@ -148,15 +148,15 @@ g_dbus_object_skeleton_class_init (GDBusObjectSkeletonClass *klass) klass->authorize_method = g_dbus_object_skeleton_authorize_method_default; /** - * GDBusObjectSkeleton:object-path: + * GDBusObjectSkeleton:g-object-path: * * The object path where the object is exported. * * Since: 2.30 */ g_object_class_install_property (gobject_class, - PROP_OBJECT_PATH, - g_param_spec_string ("object-path", + PROP_G_OBJECT_PATH, + g_param_spec_string ("g-object-path", "Object Path", "The object path where the object is exported", NULL, @@ -226,7 +226,7 @@ g_dbus_object_skeleton_new (const gchar *object_path) { g_return_val_if_fail (g_variant_is_object_path (object_path), NULL); return G_DBUS_OBJECT_SKELETON (g_object_new (G_TYPE_DBUS_OBJECT_SKELETON, - "object-path", object_path, + "g-object-path", object_path, NULL)); } @@ -252,7 +252,7 @@ g_dbus_object_skeleton_set_object_path (GDBusObjectSkeleton *object, g_free (object->priv->object_path); object->priv->object_path = g_strdup (object_path); g_mutex_unlock (object->priv->lock); - g_object_notify (G_OBJECT (object), "object-path"); + g_object_notify (G_OBJECT (object), "g-object-path"); } else { -- 2.7.4