# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1191291473 0
# Node ID f267a5b511ed8aecc2b43c677fdc3b48d9dd203b
# Parent  35a811e99c7dee99bcd7433856661d13261fc417
Better error handling when no libpurple dbus service is detected. This was Etan's suggestion. Fixes #3278.

diff -r 35a811e99c7d -r f267a5b511ed libpurple/purple-remote
--- a/libpurple/purple-remote	Mon Oct 01 17:54:21 2007 +0000
+++ b/libpurple/purple-remote	Tue Oct 02 02:17:53 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)