[libsocialweb] Rename the DBus names to org.gnome.libsocialweb
- From: Ross Burton <rburton src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsocialweb] Rename the DBus names to org.gnome.libsocialweb
- Date: Thu, 3 Nov 2011 11:48:45 +0000 (UTC)
commit 68f462a871982858c54644f2bed34d62cd5c9cc3
Author: Ross Burton <ross linux intel com>
Date: Thu Nov 3 11:11:01 2011 +0000
Rename the DBus names to org.gnome.libsocialweb
https://bugzilla.gnome.org/show_bug.cgi?id=663304
README | 12 ++++----
examples/monitor-online.py | 6 ++--
examples/monitor.py | 10 +++---
examples/query.py | 10 +++---
examples/set-status.sh | 6 ++--
examples/upload-photo.py | 6 ++--
interfaces/lastfm.xml | 2 +-
interfaces/sw-avatar.xml | 2 +-
interfaces/sw-banishable.xml | 2 +-
interfaces/sw-collections.xml | 2 +-
interfaces/sw-contact-view.xml | 2 +-
interfaces/sw-contacts-query.xml | 2 +-
interfaces/sw-core.xml | 2 +-
interfaces/sw-item-view.xml | 2 +-
interfaces/sw-photo-upload.xml | 2 +-
interfaces/sw-query.xml | 2 +-
interfaces/sw-service.xml | 2 +-
interfaces/sw-status-update.xml | 2 +-
interfaces/sw-video-upload.xml | 2 +-
libsocialweb-client/sw-client-contact-view.c | 12 ++++----
libsocialweb-client/sw-client-item-view.c | 12 ++++----
libsocialweb-client/sw-client-lastfm.c | 10 +++---
libsocialweb-client/sw-client-service.c | 40 +++++++++++++-------------
libsocialweb-client/sw-client.c | 10 +++---
libsocialweb/sw-contact-view.c | 2 +-
libsocialweb/sw-core.c | 4 +-
libsocialweb/sw-item-stream.c | 2 +-
libsocialweb/sw-item-view.c | 2 +-
libsocialweb/sw-service.c | 2 +-
services/lastfm/lastfm.xml | 2 +-
src/libsocialweb.service.in | 2 +-
src/main.c | 2 +-
32 files changed, 89 insertions(+), 89 deletions(-)
---
diff --git a/README b/README
index 7a4a6ba..50f225a 100644
--- a/README
+++ b/README
@@ -9,13 +9,13 @@ Core
libsocialweb (referred to as lsw in this document) comprises of a core daemon
process that can load in multiple modules.
-The lsw core sits on the dbus at the well known name com.meego.libsocialweb.
-The core object sits on the bus at /com/meego/libsocialweb and implemented
-the com.meego.libsocialweb interface.
+The lsw core sits on the dbus at the well known name org.gnome.libsocialweb.
+The core object sits on the bus at /org/gnome/libsocialweb and implemented
+the org.gnome.libsocialweb interface.
This interface has the following methods:
-com.meego.libsocialweb (TODO: Rename to .Core)
+org.gnome.libsocialweb (TODO: Rename to .Core)
GetServices -> returns the set of available services
@@ -33,10 +33,10 @@ Services
The service names returned by GetServices can then be mapped to service
objects sitting on the dbus. These services have the object path:
-/com/meego/libsocialweb/Service/<service name>
+/org/gnome/libsocialweb/Service/<service name>
The service objects are provided by the loaded backends. Each service must
-implement the com.meego.libsocialweb.Service interface.
+implement the org.gnome.libsocialweb.Service interface.
This has the following methods:
diff --git a/examples/monitor-online.py b/examples/monitor-online.py
index d228512..b127423 100755
--- a/examples/monitor-online.py
+++ b/examples/monitor-online.py
@@ -22,10 +22,10 @@ from dbus.mainloop.glib import DBusGMainLoop
DBusGMainLoop(set_as_default=True)
bus = dbus.SessionBus()
-bus.start_service_by_name("com.meego.libsocialweb")
+bus.start_service_by_name("org.gnome.libsocialweb")
-sw = bus.get_object("com.meego.libsocialweb", "/com/meego/libsocialweb")
-sw = dbus.Interface(sw, "com.meego.libsocialweb")
+sw = bus.get_object("org.gnome.libsocialweb", "/org/gnome/libsocialweb")
+sw = dbus.Interface(sw, "org.gnome.libsocialweb")
def online(state):
if state:
diff --git a/examples/monitor.py b/examples/monitor.py
index b2bfc2e..40685d6 100755
--- a/examples/monitor.py
+++ b/examples/monitor.py
@@ -23,18 +23,18 @@ from dbus.mainloop.glib import DBusGMainLoop
DBusGMainLoop(set_as_default=True)
bus = dbus.SessionBus()
-bus.start_service_by_name("com.meego.libsocialweb")
+bus.start_service_by_name("org.gnome.libsocialweb")
-sw = bus.get_object("com.meego.libsocialweb", "/com/meego/libsocialweb")
-sw = dbus.Interface(sw, "com.meego.libsocialweb")
+sw = bus.get_object("org.gnome.libsocialweb", "/org/gnome/libsocialweb")
+sw = dbus.Interface(sw, "org.gnome.libsocialweb")
services = sys.argv[1:]
if not services:
services = sw.GetServices()
path = sw.OpenView(services, 10)
-view = bus.get_object("com.meego.libsocialweb", path)
-view = dbus.Interface(view, "com.meego.libsocialweb.ItemView")
+view = bus.get_object("org.gnome.libsocialweb", path)
+view = dbus.Interface(view, "org.gnome.libsocialweb.ItemView")
def now():
return time.strftime("%T", time.localtime())
diff --git a/examples/query.py b/examples/query.py
index 5421e77..f7e12a2 100755
--- a/examples/query.py
+++ b/examples/query.py
@@ -23,17 +23,17 @@ from dbus.mainloop.glib import DBusGMainLoop
DBusGMainLoop(set_as_default=True)
bus = dbus.SessionBus()
-bus.start_service_by_name("com.meego.libsocialweb")
+bus.start_service_by_name("org.gnome.libsocialweb")
-service = bus.get_object("com.meego.libsocialweb", "/com/meego/libsocialweb/Service/%s" % sys.argv[1])
+service = bus.get_object("org.gnome.libsocialweb", "/org/gnome/libsocialweb/Service/%s" % sys.argv[1])
if len(sys.argv) > 2:
query = sys.argv[2]
else:
query = "feed"
-path = service.OpenView(query, {}, dbus_interface="com.meego.libsocialweb.Query")
-view = bus.get_object("com.meego.libsocialweb", path)
-view = dbus.Interface(view, "com.meego.libsocialweb.ItemView")
+path = service.OpenView(query, {}, dbus_interface="org.gnome.libsocialweb.Query")
+view = bus.get_object("org.gnome.libsocialweb", path)
+view = dbus.Interface(view, "org.gnome.libsocialweb.ItemView")
def now():
return time.strftime("%T", time.localtime())
diff --git a/examples/set-status.sh b/examples/set-status.sh
index a34cc16..5abc177 100755
--- a/examples/set-status.sh
+++ b/examples/set-status.sh
@@ -12,7 +12,7 @@ shift
MESSAGE="$@"
dbus-send --session --print-reply \
- --dest=com.meego.libsocialweb \
- /com/meego/libsocialweb/Service/$SERVICE \
- com.meego.libsocialweb.StatusUpdate.UpdateStatus \
+ --dest=org.gnome.libsocialweb \
+ /org/gnome/libsocialweb/Service/$SERVICE \
+ org.gnome.libsocialweb.StatusUpdate.UpdateStatus \
string:"$MESSAGE" dict:string:string:
diff --git a/examples/upload-photo.py b/examples/upload-photo.py
index 0cb812e..1425462 100755
--- a/examples/upload-photo.py
+++ b/examples/upload-photo.py
@@ -28,10 +28,10 @@ DBusGMainLoop(set_as_default=True)
loop = gobject.MainLoop()
bus = dbus.SessionBus()
-bus.start_service_by_name("com.meego.libsocialweb")
+bus.start_service_by_name("org.gnome.libsocialweb")
-service = bus.get_object("com.meego.libsocialweb", "/com/meego/libsocialweb/Service/%s" % sys.argv[1])
-photoupload = dbus.Interface(service, "com.meego.libsocialweb.PhotoUpload")
+service = bus.get_object("org.gnome.libsocialweb", "/org/gnome/libsocialweb/Service/%s" % sys.argv[1])
+photoupload = dbus.Interface(service, "org.gnome.libsocialweb.PhotoUpload")
def progress_cb(opid, progress, message):
# Ignore signals for other uploads
diff --git a/interfaces/lastfm.xml b/interfaces/lastfm.xml
index 5299971..bd514ee 100644
--- a/interfaces/lastfm.xml
+++ b/interfaces/lastfm.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<node name="/Lastfm_Iface" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";>
- <interface name="com.meego.libsocialweb.Service.Lastfm">
+ <interface name="org.gnome.libsocialweb.Service.Lastfm">
<method name="NowPlaying" tp:name-for-bindings="Now_Playing">
<arg name="artist" type="s" direction="in"/>
<arg name="album" type="s" direction="in"/>
diff --git a/interfaces/sw-avatar.xml b/interfaces/sw-avatar.xml
index 6c3e136..491401e 100644
--- a/interfaces/sw-avatar.xml
+++ b/interfaces/sw-avatar.xml
@@ -2,7 +2,7 @@
<node name="/Avatar_Iface" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";
xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd";>
- <interface name="com.meego.libsocialweb.Avatar">
+ <interface name="org.gnome.libsocialweb.Avatar">
<doc:doc>
<doc:summary>An interface representing the functionality required to
fetch the user's own avatar for an account.</doc:summary>
diff --git a/interfaces/sw-banishable.xml b/interfaces/sw-banishable.xml
index 511b378..2d204fe 100644
--- a/interfaces/sw-banishable.xml
+++ b/interfaces/sw-banishable.xml
@@ -2,7 +2,7 @@
<node name="/Banishable_Iface"
xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";
xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd";>
- <interface name="com.meego.libsocialweb.Banishable">
+ <interface name="org.gnome.libsocialweb.Banishable">
<doc:doc>
<doc:summary>An interface for hiding items from a feed from a service.</doc:summary>
</doc:doc>
diff --git a/interfaces/sw-collections.xml b/interfaces/sw-collections.xml
index 565f630..b0d6351 100644
--- a/interfaces/sw-collections.xml
+++ b/interfaces/sw-collections.xml
@@ -3,7 +3,7 @@
<node name="/Collections_Iface"
xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";
xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd";>
- <interface name="com.meego.libsocialweb.Collections">
+ <interface name="org.gnome.libsocialweb.Collections">
<doc:doc>
<doc:summary>An interface representing named collections of
photos (eg. albums), videos (eg. channels) or both (eg. Flickr sets).
diff --git a/interfaces/sw-contact-view.xml b/interfaces/sw-contact-view.xml
index c36f0ff..57c6f40 100644
--- a/interfaces/sw-contact-view.xml
+++ b/interfaces/sw-contact-view.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<node name="/Contact_View_Iface" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";>>
- <interface name="com.meego.libsocialweb.ContactView">
+ <interface name="org.gnome.libsocialweb.ContactView">
<method name="Start" tp:name-for-bindings="Start"/>
<method name="Refresh" tp:name-for-bindings="Refresh"/>
diff --git a/interfaces/sw-contacts-query.xml b/interfaces/sw-contacts-query.xml
index 7b43575..8c6a501 100644
--- a/interfaces/sw-contacts-query.xml
+++ b/interfaces/sw-contacts-query.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<node name="/Contacts_Query_Iface" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";>>
- <interface name="com.meego.libsocialweb.ContactsQuery">
+ <interface name="org.gnome.libsocialweb.ContactsQuery">
<method name="OpenView" tp:name-for-bindings="Open_View">
<arg name="query" type="s" direction="in"/>
<arg name="params" type="a{ss}" direction="in"/>
diff --git a/interfaces/sw-core.xml b/interfaces/sw-core.xml
index 41caf72..d3f26cb 100644
--- a/interfaces/sw-core.xml
+++ b/interfaces/sw-core.xml
@@ -4,7 +4,7 @@
xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";
xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd";>
- <interface name="com.meego.libsocialweb">
+ <interface name="org.gnome.libsocialweb">
<doc:doc>
<doc:summary>Core interface.</doc:summary>
diff --git a/interfaces/sw-item-view.xml b/interfaces/sw-item-view.xml
index 8f825ab..cf1b66a 100644
--- a/interfaces/sw-item-view.xml
+++ b/interfaces/sw-item-view.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<node name="/Item_View_Iface" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";>>
- <interface name="com.meego.libsocialweb.ItemView">
+ <interface name="org.gnome.libsocialweb.ItemView">
<method name="Start" tp:name-for-bindings="Start"/>
<method name="Refresh" tp:name-for-bindings="Refresh"/>
diff --git a/interfaces/sw-photo-upload.xml b/interfaces/sw-photo-upload.xml
index 7a1364e..52bcdd0 100644
--- a/interfaces/sw-photo-upload.xml
+++ b/interfaces/sw-photo-upload.xml
@@ -4,7 +4,7 @@
xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";
xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd";>
- <interface name="com.meego.libsocialweb.PhotoUpload">
+ <interface name="org.gnome.libsocialweb.PhotoUpload">
<doc:doc>
<doc:summary>An interface for uploading photos.</doc:summary>
</doc:doc>
diff --git a/interfaces/sw-query.xml b/interfaces/sw-query.xml
index 3ef98c0..d7ad00c 100644
--- a/interfaces/sw-query.xml
+++ b/interfaces/sw-query.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<node name="/Query_Iface" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";>>
- <interface name="com.meego.libsocialweb.Query">
+ <interface name="org.gnome.libsocialweb.Query">
<method name="OpenView" tp:name-for-bindings="Open_View">
<arg name="query" type="s" direction="in"/>
<arg name="params" type="a{ss}" direction="in"/>
diff --git a/interfaces/sw-service.xml b/interfaces/sw-service.xml
index 61d9af4..9d5ab08 100644
--- a/interfaces/sw-service.xml
+++ b/interfaces/sw-service.xml
@@ -2,7 +2,7 @@
<node name="/Service_Iface" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";
xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd";>
- <interface name="com.meego.libsocialweb.Service">
+ <interface name="org.gnome.libsocialweb.Service">
<doc:doc>
<doc:summary>An interface representing the core functionality present on
all objects representing service backends.</doc:summary>
diff --git a/interfaces/sw-status-update.xml b/interfaces/sw-status-update.xml
index 706d061..572067d 100644
--- a/interfaces/sw-status-update.xml
+++ b/interfaces/sw-status-update.xml
@@ -4,7 +4,7 @@
xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";
xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd";>
- <interface name="com.meego.libsocialweb.StatusUpdate">
+ <interface name="org.gnome.libsocialweb.StatusUpdate">
<doc:doc>
<doc:summary>An interface for updating the user's status.</doc:summary>
</doc:doc>
diff --git a/interfaces/sw-video-upload.xml b/interfaces/sw-video-upload.xml
index b65c023..fe86e6c 100644
--- a/interfaces/sw-video-upload.xml
+++ b/interfaces/sw-video-upload.xml
@@ -4,7 +4,7 @@
xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";
xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd";>
- <interface name="com.meego.libsocialweb.VideoUpload">
+ <interface name="org.gnome.libsocialweb.VideoUpload">
<doc:doc>
<doc:summary>An interface for uploading videos.</doc:summary>
</doc:doc>
diff --git a/libsocialweb-client/sw-client-contact-view.c b/libsocialweb-client/sw-client-contact-view.c
index 4cfc5fa..bb2679f 100644
--- a/libsocialweb-client/sw-client-contact-view.c
+++ b/libsocialweb-client/sw-client-contact-view.c
@@ -56,8 +56,8 @@ enum
static guint signals[LAST_SIGNAL] = { 0 };
-#define SW_SERVICE_NAME "com.meego.libsocialweb"
-#define SW_SERVICE_CONTACT_VIEW_INTERFACE "com.meego.libsocialweb.ContactView"
+#define SW_SERVICE_NAME "org.gnome.libsocialweb"
+#define SW_SERVICE_CONTACT_VIEW_INTERFACE "org.gnome.libsocialweb.ContactView"
static void
sw_client_contact_view_get_property (GObject *object, guint property_id,
@@ -474,7 +474,7 @@ sw_client_contact_view_start (SwClientContactView *contact_view)
{
SwClientContactViewPrivate *priv = GET_PRIVATE (contact_view);
- com_meego_libsocialweb_ContactView_start_async (priv->proxy,
+ org_gnome_libsocialweb_ContactView_start_async (priv->proxy,
_sw_client_contact_view_generic_cb,
(gpointer)G_STRFUNC);
}
@@ -484,7 +484,7 @@ sw_client_contact_view_refresh (SwClientContactView *contact_view)
{
SwClientContactViewPrivate *priv = GET_PRIVATE (contact_view);
- com_meego_libsocialweb_ContactView_refresh_async (priv->proxy,
+ org_gnome_libsocialweb_ContactView_refresh_async (priv->proxy,
_sw_client_contact_view_generic_cb,
(gpointer)G_STRFUNC);
}
@@ -494,7 +494,7 @@ sw_client_contact_view_stop (SwClientContactView *contact_view)
{
SwClientContactViewPrivate *priv = GET_PRIVATE (contact_view);
- com_meego_libsocialweb_ContactView_stop_async (priv->proxy,
+ org_gnome_libsocialweb_ContactView_stop_async (priv->proxy,
_sw_client_contact_view_generic_cb,
(gpointer)G_STRFUNC);
}
@@ -504,7 +504,7 @@ sw_client_contact_view_close (SwClientContactView *contact_view)
{
SwClientContactViewPrivate *priv = GET_PRIVATE (contact_view);
- com_meego_libsocialweb_ContactView_close_async (priv->proxy,
+ org_gnome_libsocialweb_ContactView_close_async (priv->proxy,
_sw_client_contact_view_generic_cb,
(gpointer)G_STRFUNC);
}
diff --git a/libsocialweb-client/sw-client-item-view.c b/libsocialweb-client/sw-client-item-view.c
index 7119b89..6bfdb76 100644
--- a/libsocialweb-client/sw-client-item-view.c
+++ b/libsocialweb-client/sw-client-item-view.c
@@ -55,8 +55,8 @@ enum
static guint signals[LAST_SIGNAL] = { 0 };
-#define SW_SERVICE_NAME "com.meego.libsocialweb"
-#define SW_SERVICE_ITEM_VIEW_INTERFACE "com.meego.libsocialweb.ItemView"
+#define SW_SERVICE_NAME "org.gnome.libsocialweb"
+#define SW_SERVICE_ITEM_VIEW_INTERFACE "org.gnome.libsocialweb.ItemView"
static void
sw_client_item_view_get_property (GObject *object, guint property_id,
@@ -479,7 +479,7 @@ sw_client_item_view_start (SwClientItemView *item_view)
{
SwClientItemViewPrivate *priv = GET_PRIVATE (item_view);
- com_meego_libsocialweb_ItemView_start_async (priv->proxy,
+ org_gnome_libsocialweb_ItemView_start_async (priv->proxy,
_sw_client_item_view_generic_cb,
(gpointer)G_STRFUNC);
}
@@ -489,7 +489,7 @@ sw_client_item_view_refresh (SwClientItemView *item_view)
{
SwClientItemViewPrivate *priv = GET_PRIVATE (item_view);
- com_meego_libsocialweb_ItemView_refresh_async (priv->proxy,
+ org_gnome_libsocialweb_ItemView_refresh_async (priv->proxy,
_sw_client_item_view_generic_cb,
(gpointer)G_STRFUNC);
}
@@ -499,7 +499,7 @@ sw_client_item_view_stop (SwClientItemView *item_view)
{
SwClientItemViewPrivate *priv = GET_PRIVATE (item_view);
- com_meego_libsocialweb_ItemView_stop_async (priv->proxy,
+ org_gnome_libsocialweb_ItemView_stop_async (priv->proxy,
_sw_client_item_view_generic_cb,
(gpointer)G_STRFUNC);
}
@@ -509,7 +509,7 @@ sw_client_item_view_close (SwClientItemView *item_view)
{
SwClientItemViewPrivate *priv = GET_PRIVATE (item_view);
- com_meego_libsocialweb_ItemView_close_async (priv->proxy,
+ org_gnome_libsocialweb_ItemView_close_async (priv->proxy,
_sw_client_item_view_generic_cb,
(gpointer)G_STRFUNC);
}
diff --git a/libsocialweb-client/sw-client-lastfm.c b/libsocialweb-client/sw-client-lastfm.c
index a4e8765..1515c26 100644
--- a/libsocialweb-client/sw-client-lastfm.c
+++ b/libsocialweb-client/sw-client-lastfm.c
@@ -35,8 +35,8 @@ struct _SwClientLastfmPrivate {
DBusGProxy *proxy;
};
-#define SW_SERVICE_NAME "com.meego.libsocialweb"
-#define SW_SERVICE_LASTFM_INTERFACE "com.meego.libsocialweb.Service.Lastfm"
+#define SW_SERVICE_NAME "org.gnome.libsocialweb"
+#define SW_SERVICE_LASTFM_INTERFACE "org.gnome.libsocialweb.Service.Lastfm"
static void
sw_client_lastfm_dispose (GObject *object)
@@ -92,7 +92,7 @@ sw_client_lastfm_constructed (GObject *object)
priv->proxy = dbus_g_proxy_new_for_name_owner (priv->connection,
SW_SERVICE_NAME,
- "/com/meego/libsocialweb/Service/twitter",
+ "/org/gnome/libsocialweb/Service/twitter",
SW_SERVICE_LASTFM_INTERFACE,
&error);
@@ -151,7 +151,7 @@ sw_client_lastfm_now_playing (SwClientLastfm *lastfm,
{
SwClientLastfmPrivate *priv = GET_PRIVATE (lastfm);
- com_meego_libsocialweb_Service_Lastfm_now_playing_async (priv->proxy, artist,
+ org_gnome_libsocialweb_Service_Lastfm_now_playing_async (priv->proxy, artist,
album, track,
length, tracknumber,
musicbrainz_id,
@@ -186,7 +186,7 @@ sw_client_lastfm_submit_track (SwClientLastfm *lastfm,
{
SwClientLastfmPrivate *priv = GET_PRIVATE (lastfm);
- com_meego_libsocialweb_Service_Lastfm_submit_track_async (priv->proxy, artist,
+ org_gnome_libsocialweb_Service_Lastfm_submit_track_async (priv->proxy, artist,
album, track,
time, source, rating,
length, tracknumber,
diff --git a/libsocialweb-client/sw-client-service.c b/libsocialweb-client/sw-client-service.c
index 2d9d78d..8bdbb82 100644
--- a/libsocialweb-client/sw-client-service.c
+++ b/libsocialweb-client/sw-client-service.c
@@ -71,20 +71,20 @@ struct _SwClientServicePrivate {
};
static const gchar *interface_names[LAST_IFACE] = {
- "com.meego.libsocialweb.Service",
- "com.meego.libsocialweb.Avatar",
- "com.meego.libsocialweb.Query",
- "com.meego.libsocialweb.ContactsQuery",
- "com.meego.libsocialweb.StatusUpdate",
- "com.meego.libsocialweb.Banishable",
- "com.meego.libsocialweb.PhotoUpload",
- "com.meego.libsocialweb.VideoUpload"
+ "org.gnome.libsocialweb.Service",
+ "org.gnome.libsocialweb.Avatar",
+ "org.gnome.libsocialweb.Query",
+ "org.gnome.libsocialweb.ContactsQuery",
+ "org.gnome.libsocialweb.StatusUpdate",
+ "org.gnome.libsocialweb.Banishable",
+ "org.gnome.libsocialweb.PhotoUpload",
+ "org.gnome.libsocialweb.VideoUpload"
};
static guint signals[LAST_SIGNAL] = { 0 };
-#define SW_CLIENT_SERVICE_NAME "com.meego.libsocialweb"
-#define SW_CLIENT_SERVICE_OBJECT "/com/meego/libsocialweb/Service/%s"
+#define SW_CLIENT_SERVICE_NAME "org.gnome.libsocialweb"
+#define SW_CLIENT_SERVICE_OBJECT "/org/gnome/libsocialweb/Service/%s"
#define SW_CLIENT_SERVICE_ERROR sw_client_service_error_quark()
static GQuark
@@ -458,7 +458,7 @@ sw_client_service_get_static_capabilities (SwClientService
closure->cb = (GCallback)cb;
closure->userdata = userdata;
- com_meego_libsocialweb_Service_get_static_capabilities_async (priv->proxies[SERVICE_IFACE],
+ org_gnome_libsocialweb_Service_get_static_capabilities_async (priv->proxies[SERVICE_IFACE],
_get_capabilities_cb,
closure);
}
@@ -482,7 +482,7 @@ sw_client_service_get_dynamic_capabilities (SwClientService
closure->cb = (GCallback)cb;
closure->userdata = userdata;
- com_meego_libsocialweb_Service_get_dynamic_capabilities_async (priv->proxies[SERVICE_IFACE],
+ org_gnome_libsocialweb_Service_get_dynamic_capabilities_async (priv->proxies[SERVICE_IFACE],
_get_capabilities_cb,
closure);
}
@@ -569,7 +569,7 @@ sw_client_service_update_status_with_fields (SwClientService
closure->cb = (GCallback)cb;
closure->userdata = userdata;
- com_meego_libsocialweb_StatusUpdate_update_status_async (priv->proxies[STATUS_UPDATE_IFACE],
+ org_gnome_libsocialweb_StatusUpdate_update_status_async (priv->proxies[STATUS_UPDATE_IFACE],
status_msg,
fields,
_update_status_cb,
@@ -683,13 +683,13 @@ got_file_size_cb (GObject *source_object,
filename = g_file_get_path (G_FILE (source_object));
if (closure->iface == PHOTO_UPLOAD_IFACE) {
- com_meego_libsocialweb_PhotoUpload_upload_photo_async (priv->proxies[PHOTO_UPLOAD_IFACE],
+ org_gnome_libsocialweb_PhotoUpload_upload_photo_async (priv->proxies[PHOTO_UPLOAD_IFACE],
filename,
closure->fields,
_upload_file_cb,
closure);
} else {
- com_meego_libsocialweb_VideoUpload_upload_video_async (priv->proxies[VIDEO_UPLOAD_IFACE],
+ org_gnome_libsocialweb_VideoUpload_upload_video_async (priv->proxies[VIDEO_UPLOAD_IFACE],
filename,
closure->fields,
_upload_file_cb,
@@ -872,7 +872,7 @@ sw_client_service_request_avatar (SwClientService *service)
{
SwClientServicePrivate *priv = GET_PRIVATE (service);
- com_meego_libsocialweb_Avatar_request_avatar_async (priv->proxies[AVATAR_IFACE],
+ org_gnome_libsocialweb_Avatar_request_avatar_async (priv->proxies[AVATAR_IFACE],
_request_avatar_cb,
NULL);
}
@@ -888,7 +888,7 @@ sw_client_service_credentials_updated (SwClientService *service)
{
SwClientServicePrivate *priv = GET_PRIVATE (service);
- com_meego_libsocialweb_Service_credentials_updated_async (priv->proxies[SERVICE_IFACE],
+ org_gnome_libsocialweb_Service_credentials_updated_async (priv->proxies[SERVICE_IFACE],
_credentials_updated_cb,
NULL);
}
@@ -980,7 +980,7 @@ sw_client_service_query_open_view (SwClientService *service
params = tmp_params;
}
- com_meego_libsocialweb_Query_open_view_async (priv->proxies [QUERY_IFACE],
+ org_gnome_libsocialweb_Query_open_view_async (priv->proxies [QUERY_IFACE],
query,
params,
_query_open_view_cb,
@@ -1071,7 +1071,7 @@ sw_client_service_contacts_query_open_view (SwClientService *service,
params = tmp_params;
}
- com_meego_libsocialweb_ContactsQuery_open_view_async
+ org_gnome_libsocialweb_ContactsQuery_open_view_async
(priv->proxies [CONTACTS_QUERY_IFACE],
query,
params,
@@ -1163,7 +1163,7 @@ sw_client_service_banishable_hide_item (SwClientService *service,
return;
}
- com_meego_libsocialweb_Banishable_hide_item_async (priv->proxies[BANISHABLE_IFACE],
+ org_gnome_libsocialweb_Banishable_hide_item_async (priv->proxies[BANISHABLE_IFACE],
uid,
NULL,
NULL);
diff --git a/libsocialweb-client/sw-client.c b/libsocialweb-client/sw-client.c
index 6ce32e1..30dfb54 100644
--- a/libsocialweb-client/sw-client.c
+++ b/libsocialweb-client/sw-client.c
@@ -44,9 +44,9 @@ enum
static guint signals[LAST_SIGNAL] = { 0 };
-#define SW_SERVICE_NAME "com.meego.libsocialweb"
-#define SW_SERVICE_CORE_OBJECT "/com/meego/libsocialweb"
-#define SW_SERVICE_CORE_INTERFACE "com.meego.libsocialweb"
+#define SW_SERVICE_NAME "org.gnome.libsocialweb"
+#define SW_SERVICE_CORE_OBJECT "/org/gnome/libsocialweb"
+#define SW_SERVICE_CORE_INTERFACE "org.gnome.libsocialweb"
static void
_online_changed_cb (DBusGProxy *proxy,
@@ -214,7 +214,7 @@ sw_client_get_services (SwClient *client,
closure->cb = cb;
closure->userdata = userdata;
- com_meego_libsocialweb_get_services_async (priv->proxy,
+ org_gnome_libsocialweb_get_services_async (priv->proxy,
_sw_client_get_services_cb,
closure);
}
@@ -303,7 +303,7 @@ sw_client_is_online (SwClient *client,
closure->cb = cb;
closure->userdata = userdata;
- com_meego_libsocialweb_is_online_async (priv->proxy,
+ org_gnome_libsocialweb_is_online_async (priv->proxy,
_sw_client_is_online_cb,
closure);
}
diff --git a/libsocialweb/sw-contact-view.c b/libsocialweb/sw-contact-view.c
index bd03235..cec422a 100644
--- a/libsocialweb/sw-contact-view.c
+++ b/libsocialweb/sw-contact-view.c
@@ -164,7 +164,7 @@ _make_object_path (SwContactView *contact_view)
gchar *path;
static gint count = 0;
- path = g_strdup_printf ("/com/meego/libsocialweb/ContactView%d",
+ path = g_strdup_printf ("/org/gnome/libsocialweb/ContactView%d",
count);
count++;
diff --git a/libsocialweb/sw-core.c b/libsocialweb/sw-core.c
index d4f2063..5c3824b 100644
--- a/libsocialweb/sw-core.c
+++ b/libsocialweb/sw-core.c
@@ -167,7 +167,7 @@ load_module (SwCore *core, const char *file)
g_hash_table_insert (priv->bus_services,
(gchar *)service_name,
service);
- path = g_strdup_printf ("/com/meego/libsocialweb/Service/%s",
+ path = g_strdup_printf ("/org/gnome/libsocialweb/Service/%s",
service_name);
dbus_g_connection_register_g_object (priv->connection,
path,
@@ -309,7 +309,7 @@ sw_core_constructed (GObject *object)
}
dbus_g_connection_register_g_object (priv->connection,
- "/com/meego/libsocialweb",
+ "/org/gnome/libsocialweb",
object);
sw_client_monitor_init (priv->connection);
diff --git a/libsocialweb/sw-item-stream.c b/libsocialweb/sw-item-stream.c
index 3398e0d..ac44422 100644
--- a/libsocialweb/sw-item-stream.c
+++ b/libsocialweb/sw-item-stream.c
@@ -140,7 +140,7 @@ _make_object_path (SwItemStream *item_stream)
gchar *path;
static gint count = 0;
- path = g_strdup_printf ("/com/meego/libsocialweb/Stream%d",
+ path = g_strdup_printf ("/org/gnome/libsocialweb/Stream%d",
count);
count++;
diff --git a/libsocialweb/sw-item-view.c b/libsocialweb/sw-item-view.c
index 4820f53..f447ae7 100644
--- a/libsocialweb/sw-item-view.c
+++ b/libsocialweb/sw-item-view.c
@@ -171,7 +171,7 @@ _make_object_path (SwItemView *item_view)
gchar *path;
static gint count = 0;
- path = g_strdup_printf ("/com/meego/libsocialweb/View%d",
+ path = g_strdup_printf ("/org/gnome/libsocialweb/View%d",
count);
count++;
diff --git a/libsocialweb/sw-service.c b/libsocialweb/sw-service.c
index 1304dbb..22f2e63 100644
--- a/libsocialweb/sw-service.c
+++ b/libsocialweb/sw-service.c
@@ -109,7 +109,7 @@ sw_service_class_init (SwServiceClass *klass)
object_class->constructed = sw_service_constructed;
dbus_g_error_domain_register (SW_SERVICE_ERROR,
- "com.meego.libsocialweb.ServiceError",
+ "org.gnome.libsocialweb.ServiceError",
SW_TYPE_SERVICE_ERROR);
}
diff --git a/services/lastfm/lastfm.xml b/services/lastfm/lastfm.xml
index 5299971..bd514ee 100644
--- a/services/lastfm/lastfm.xml
+++ b/services/lastfm/lastfm.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<node name="/Lastfm_Iface" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";>
- <interface name="com.meego.libsocialweb.Service.Lastfm">
+ <interface name="org.gnome.libsocialweb.Service.Lastfm">
<method name="NowPlaying" tp:name-for-bindings="Now_Playing">
<arg name="artist" type="s" direction="in"/>
<arg name="album" type="s" direction="in"/>
diff --git a/src/libsocialweb.service.in b/src/libsocialweb.service.in
index f0d2d9d..5e43128 100644
--- a/src/libsocialweb.service.in
+++ b/src/libsocialweb.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
-Name=com.meego.libsocialweb
+Name=org.gnome.libsocialweb
Exec= dir@/libsocialweb-core
diff --git a/src/main.c b/src/main.c
index 133ddcb..18166b7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -51,7 +51,7 @@ request_name (void)
DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS);
- if (!org_freedesktop_DBus_request_name (proxy, "com.meego.libsocialweb",
+ if (!org_freedesktop_DBus_request_name (proxy, "org.gnome.libsocialweb",
DBUS_NAME_FLAG_DO_NOT_QUEUE, &request_status,
&error)) {
g_printerr ("Failed to request name: %s\n", error->message);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
