im.pidgin.pidgin.2.2.2: 2a3ed3bd5a1949f701cd2c316fd1b90fedaa7559

[lschiere at pidgin.im]

-----------------------------------------------------------------
Revision: 2a3ed3bd5a1949f701cd2c316fd1b90fedaa7559
Ancestor: d4335829fce98463c101c48b218c2eb02a9a8428
Author: lschiere at pidgin.im
Date: 2007-10-19T16:57:07
Branch: im.pidgin.pidgin.2.2.2

Modified files:
        libpurple/purple-remote

ChangeLog: 

applied changes from c699de7eec5194554b5fcb885019835fb902d95a
             through 3c351ab69ebec23d5a98c0193423e1f8281ece6b

-------------- next part --------------
============================================================
--- libpurple/purple-remote	ba9eca8159997a15119270a88a7d0d194465107e
+++ libpurple/purple-remote	cedd9f61973784230e4b3c890d5161d571747955
@@ -9,7 +9,12 @@ xml.dom.minidom.Element.all   = xml.dom.
 
 xml.dom.minidom.Element.all   = xml.dom.minidom.Element.getElementsByTagName
 
-obj = dbus.SessionBus().get_object("im.pidgin.purple.PurpleService", "/im/pidgin/purple/PurpleObject")
+obj = None
+try:
+    obj = dbus.SessionBus().get_object("im.pidgin.purple.PurpleService", "/im/pidgin/purple/PurpleObject")
+except:
+    pass
+
 purple = dbus.Interface(obj, "im.pidgin.purple.PurpleInterface")
 
 class CheckedObject:
@@ -212,7 +217,10 @@ if len(sys.argv) == 1:
 
 if len(sys.argv) == 1:
     show_help()
-
+elif (obj == None):
+    print "No existing libpurple instance detected."
+    sys.exit(1);
+    
 for arg in sys.argv[1:]:
     output = execute(arg)