diff options
author | Ted Gould <ted@gould.cx> | 2009-12-10 12:39:41 -0600 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2009-12-10 12:39:41 -0600 |
commit | 10e6923a8868dd8468e6e211a3631deafb578a3e (patch) | |
tree | 2a79277658598c8f47d22670d974a6c543fd1c2b /libdbusmenu-glib/server.c | |
parent | 38c9adcb94c6ab0d273815705b474a801f56a59d (diff) | |
parent | 54203154fee5b70cf37c4ce4f92176d67597a7e8 (diff) | |
download | libdbusmenu-10e6923a8868dd8468e6e211a3631deafb578a3e.tar.gz libdbusmenu-10e6923a8868dd8468e6e211a3631deafb578a3e.tar.bz2 libdbusmenu-10e6923a8868dd8468e6e211a3631deafb578a3e.zip |
Merge in some of the changes from the 0.2 branch. Specifically we're taking:
* Changing the name to org.ayatana
* Underline fixes
* Documenation of the DBus API
We're not taking
* Updates to the test suite
* New tools
Diffstat (limited to 'libdbusmenu-glib/server.c')
-rw-r--r-- | libdbusmenu-glib/server.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c index 1ac1da6..84bfffe 100644 --- a/libdbusmenu-glib/server.c +++ b/libdbusmenu-glib/server.c @@ -161,7 +161,7 @@ dbusmenu_server_class_init (DbusmenuServerClass *class) 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 @@ _dbusmenu_server_call (DbusmenuServer * server, guint id, GError ** error) 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 @@ DbusmenuServer * 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, |