Merge lp:~ted/libdbusmenu/ayatanaize into lp:libdbusmenu/0.5

[Ted Gould]

[Ted Gould (ted)]

Removing the freedesktop.org references as this isn't (yet) an approved freedesktop spec.

[Neil J. Patel (njpatel)]

Approved.

review: Approve

[David Barth (dbarth)]

No need fixing that. We intend dbusmenu to be a freedesktop approved standard. I think it is consistent with the latest discussions in GC, that we do register the namespace and provide that implementation, without a long upfront xdg discussion. org.freedesktop is fine. the FD.o registration of dbusmenu is what's needed now.

review: Disapprove

[Ted Gould (ted)]

On Thu, 2009-10-29 at 11:24 +0000, David Barth wrote:
> No need fixing that. We intend dbusmenu to be a freedesktop approved
> standard. I think it is consistent with the latest discussions in GC,
> that we do register the namespace and provide that implementation,
> without a long upfront xdg discussion. org.freedesktop is fine. the
> FD.o registration of dbusmenu is what's needed now.

My understanding was that we couldn't use 'org.freedesktop' UNTIL it was
an approved standard. So, shouldn't we do this change as goodwill, even
if we never ship a version with it?

[Aurélien Gâteau (agateau)]

What was decided during FDo discussion at GCDS was that a project should request use of a org.freedesktop subdomain before starting to use it. Note that it was decided the project does not have to provide a finalized API to request the use of this subdomain, it should be seen more as a reservation of the subdomain. Meaning we do not necessarily have to go through a lengthy discussion just to "reserve" the subdomain.

If we keep using org.freedesktop subdomains without asking people at FDo, someone will eventually find out about it and we will be accused of not being good community citizens.

review: Approve

=== modified file 'libdbusmenu-glib/client.c'
--- libdbusmenu-glib/client.c	2009-10-02 21:31:22 +0000
+++ libdbusmenu-glib/client.c	2009-10-28 17:20:23 +0000
@@ -351,7 +351,7 @@
 	DbusmenuMenuitem * menuitem = dbusmenu_menuitem_find_id(priv->root, id);
 	g_return_if_fail(menuitem != NULL);
 
-	org_freedesktop_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_cb, menuitem);
+	org_ayatana_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_cb, menuitem);
 	return;
 }
 
@@ -472,7 +472,7 @@
 	priv->menuproxy = dbus_g_proxy_new_for_name_owner(priv->session_bus,
 	                                                  priv->dbus_name,
 	                                                  priv->dbus_object,
-	                                                  "org.freedesktop.dbusmenu",
+	                                                  "org.ayatana.dbusmenu",
 	                                                  &error);
 	if (error != NULL) {
 		g_warning("Unable to get dbusmenu proxy for %s on %s: %s", priv->dbus_name, priv->dbus_object, error->message);
@@ -647,7 +647,7 @@
 menuitem_activate (DbusmenuMenuitem * mi, DbusmenuClient * client)
 {
 	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
-	org_freedesktop_dbusmenu_call_async (priv->menuproxy, dbusmenu_menuitem_get_id(mi), menuitem_call_cb, mi);
+	org_ayatana_dbusmenu_call_async (priv->menuproxy, dbusmenu_menuitem_get_id(mi), menuitem_call_cb, mi);
 	return;
 }
 
@@ -689,7 +689,7 @@
 			propdata->item    = item;
 			propdata->parent  = parent;
 
-			org_freedesktop_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_new_cb, propdata);
+			org_ayatana_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_new_cb, propdata);
 		} else {
 			g_warning("Unable to allocate memory to get properties for menuitem.  This menuitem will never be realized.");
 		}
@@ -829,7 +829,7 @@
 	                                            update_layout_cb,
 	                                            client,
 	                                            NULL,
-	                                            G_TYPE_STRING, "org.freedesktop.dbusmenu",
+	                                            G_TYPE_STRING, "org.ayatana.dbusmenu",
 	                                            G_TYPE_STRING, "layout",
 	                                            G_TYPE_INVALID, G_TYPE_VALUE, G_TYPE_INVALID);
 

=== modified file 'libdbusmenu-glib/dbus-menu.xml'
--- libdbusmenu-glib/dbus-menu.xml	2009-09-21 20:20:45 +0000
+++ libdbusmenu-glib/dbus-menu.xml	2009-10-28 17:20:23 +0000
@@ -28,7 +28,7 @@
 <http://www.gnu.org/licenses/>
 -->
 <node name="/">
-	<interface name="org.freedesktop.dbusmenu">
+	<interface name="org.ayatana.dbusmenu">
 
 <!-- Properties -->
 		<property name="layout" type="s" access="read"/>

=== modified file 'libdbusmenu-glib/server.c'
--- libdbusmenu-glib/server.c	2009-09-21 20:01:40 +0000
+++ libdbusmenu-glib/server.c	2009-10-28 17:20:23 +0000
@@ -161,7 +161,7 @@
 	g_object_class_install_property (object_class, PROP_DBUS_OBJECT,
 	                                 g_param_spec_string(DBUSMENU_SERVER_PROP_DBUS_OBJECT, "DBus object path",
 	                                              "The object that represents this set of menus on DBus",
-	                                              "/org/freedesktop/dbusmenu",
+	                                              "/org/ayatana/dbusmenu",
 	                                              G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
 	g_object_class_install_property (object_class, PROP_ROOT_NODE,
 	                                 g_param_spec_object(DBUSMENU_SERVER_PROP_ROOT_NODE, "Root menu node",
@@ -472,7 +472,7 @@
 
 	Creates a new #DbusmenuServer object with a specific object
 	path on DBus.  If @object is set to NULL the default object
-	name of "/org/freedesktop/dbusmenu" will be used.
+	name of "/org/ayatana/dbusmenu" will be used.
 
 	Return value: A brand new #DbusmenuServer
 */
@@ -480,7 +480,7 @@
 dbusmenu_server_new (const gchar * object)
 {
 	if (object == NULL) {
-		object = "/org/freedesktop/dbusmenu";
+		object = "/org/ayatana/dbusmenu";
 	}
 
 	DbusmenuServer * self = g_object_new(DBUSMENU_TYPE_SERVER,