# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1192813027 0
# Node ID d130a8a8e354d21e1df2983581321fcc0c092d25
# Parent  67a7e08686189937fe1e36e4634043caecb60b37
applied changes from c699de7eec5194554b5fcb885019835fb902d95a
             through 3c351ab69ebec23d5a98c0193423e1f8281ece6b

diff -r 67a7e0868618 -r d130a8a8e354 libpurple/purple-remote
--- a/libpurple/purple-remote	Fri Oct 19 16:54:41 2007 +0000
+++ b/libpurple/purple-remote	Fri Oct 19 16:57:07 2007 +0000
@@ -9,7 +9,12 @@
 
 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:
     show_help()
-
+elif (obj == None):
+    print "No existing libpurple instance detected."
+    sys.exit(1);
+    
 for arg in sys.argv[1:]:
     output = execute(arg)