Mercurial > pidgin
changeset 13220:ac5bc9a7b603
[gaim-migrate @ 15584]
SF Patch #1428582 from Casey Harkins
"The dbus stuff in gaim is using the namespace org.gaim.
gaim.org is obviously not associated with gaim and
chances are they would never need the dbus namespace.
Regardless, it would probably be better if gaim used
net.sf.gaim for the namespace. It'd be easier to
change now than after 2.0 is released since things
might start depending on gaim's dbus api. The dbus spec
and tutorial both suggest/imply (though don't strictly
require) that the namespace coorespond to a domain name
that you own."
committer: Tailor Script <tailor@pidgin.im>
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sat, 11 Feb 2006 05:25:47 +0000 |
| parents | d0f7f698b6de |
| children | cc85a78191cc |
| files | src/Makefile.am src/dbus-gaim.h src/dbus-gaim.service src/dbus-server.c src/gaim-notifications-example.py src/gaim-remote.py src/gaim-send src/gaim-send-async |
| diffstat | 8 files changed, 15 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile.am Sat Feb 11 05:24:30 2006 +0000 +++ b/src/Makefile.am Sat Feb 11 05:25:47 2006 +0000 @@ -241,7 +241,7 @@ gaim.service: echo "[Gaim]" > $@ - echo "Name=org.gaim.GaimService" >> $@ + echo "Name=net.sf.gaim.GaimService" >> $@ echo "Exec=$(bindir)/gaim" >> $@ #Ideally, this directory should be autodetected, and the user should
--- a/src/dbus-gaim.h Sat Feb 11 05:24:30 2006 +0000 +++ b/src/dbus-gaim.h Sat Feb 11 05:25:47 2006 +0000 @@ -24,8 +24,8 @@ #ifndef _DBUS_GAIM_H_ #define _DBUS_GAIM_H_ -#define DBUS_SERVICE_GAIM "org.gaim.GaimService" -#define DBUS_PATH_GAIM "/org/gaim/GaimObject" -#define DBUS_INTERFACE_GAIM "org.gaim.GaimInterface" +#define DBUS_SERVICE_GAIM "net.sf.gaim.GaimService" +#define DBUS_PATH_GAIM "/net/sf/gaim/GaimObject" +#define DBUS_INTERFACE_GAIM "net.sf.gaim.GaimInterface" #endif /* _DBUS_GAIM_H_ */
--- a/src/dbus-gaim.service Sat Feb 11 05:24:30 2006 +0000 +++ b/src/dbus-gaim.service Sat Feb 11 05:25:47 2006 +0000 @@ -1,5 +1,5 @@ [D-BUS Service] -Name=org.gaim.GaimService +Name=net.sf.gaim.GaimService #replace this by the path to the gaim executable in your system Exec=/home/pz215/projects/gaim/src/gaim
--- a/src/dbus-server.c Sat Feb 11 05:24:30 2006 +0000 +++ b/src/dbus-server.c Sat Feb 11 05:25:47 2006 +0000 @@ -119,7 +119,7 @@ gint id = gaim_dbus_pointer_to_id(ptr); if (ptr != NULL && id == 0) - dbus_set_error(error, "org.gaim.ObjectNotFound", + dbus_set_error(error, "net.sf.gaim.ObjectNotFound", "The return object is not mapped (this is a Gaim error)"); return id; @@ -131,7 +131,7 @@ gpointer ptr = gaim_dbus_id_to_pointer(id, type); if (ptr == NULL && id != 0) - dbus_set_error(error, "org.gaim.InvalidHandle", + dbus_set_error(error, "net.sf.gaim.InvalidHandle", "%s object with ID = %i not found", typename, id); return ptr;
--- a/src/gaim-notifications-example.py Sat Feb 11 05:24:30 2006 +0000 +++ b/src/gaim-notifications-example.py Sat Feb 11 05:25:47 2006 +0000 @@ -66,15 +66,15 @@ bus = dbus.SessionBus() -obj = bus.get_object("org.gaim.GaimService", "/org/gaim/GaimObject") -gaim = dbus.Interface(obj, "org.gaim.GaimInterface") +obj = bus.get_object("net.sf.gaim.GaimService", "/net/sf/gaim/GaimObject") +gaim = dbus.Interface(obj, "net.sf.gaim.GaimInterface") bus.add_signal_receiver(receivedimmsg, - dbus_interface = "org.gaim.GaimInterface", + dbus_interface = "net.sf.gaim.GaimInterface", signal_name = "ReceivedImMsg") bus.add_signal_receiver(buddysignedon, - dbus_interface = "org.gaim.GaimInterface", + dbus_interface = "net.sf.gaim.GaimInterface", signal_name = "BuddySignedOn") print """This is a simple gaim notification server.
--- a/src/gaim-remote.py Sat Feb 11 05:24:30 2006 +0000 +++ b/src/gaim-remote.py Sat Feb 11 05:25:47 2006 +0000 @@ -9,8 +9,8 @@ xml.dom.minidom.Element.all = xml.dom.minidom.Element.getElementsByTagName -obj = dbus.SessionBus().get_object("org.gaim.GaimService", "/org/gaim/GaimObject") -gaim = dbus.Interface(obj, "org.gaim.GaimInterface") +obj = dbus.SessionBus().get_object("net.sf.gaim.GaimService", "/net/sf/gaim/GaimObject") +gaim = dbus.Interface(obj, "net.sf.gaim.GaimInterface") class CheckedObject: def __init__(self, obj):
--- a/src/gaim-send Sat Feb 11 05:24:30 2006 +0000 +++ b/src/gaim-send Sat Feb 11 05:25:47 2006 +0000 @@ -27,6 +27,6 @@ fi shift -dbus-send --dest=org.gaim.GaimService --print-reply --type=method_call /org/gaim/GaimObject org.gaim.GaimInterface.$METHOD_NAME "$@" +dbus-send --dest=net.sf.gaim.GaimService --print-reply --type=method_call /net/sf/gaim/GaimObject net.sf.gaim.GaimInterface.$METHOD_NAME "$@" echo
--- a/src/gaim-send-async Sat Feb 11 05:24:30 2006 +0000 +++ b/src/gaim-send-async Sat Feb 11 05:25:47 2006 +0000 @@ -25,6 +25,6 @@ fi shift -dbus-send --dest=org.gaim.GaimService --type=method_call /org/gaim/GaimObject org.gaim.GaimInterface.$METHOD_NAME "$@" +dbus-send --dest=net.sf.gaim.GaimService --type=method_call /net/sf/gaim/GaimObject net.sf.gaim.GaimInterface.$METHOD_NAME "$@" echo