# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1191296803 0
# Node ID 0ee0cad488b45e34968b94fb59d7f7746444d447
# Parent  9071ddcd48dfdbb7284298b1114266a54f2acfec# Parent  2e711c2d080e453510fad94615870924d5e1ab24
merge of '40d389dd2daa85ead2860fa3617e9fc354476bf8'
     and 'ef27aa2268c20c7b9bc1cde4850481b6442ac22d'

diff -r 9071ddcd48df -r 0ee0cad488b4 libpurple/purple-remote
--- a/libpurple/purple-remote	Tue Oct 02 03:44:49 2007 +0000
+++ b/libpurple/purple-remote	Tue Oct 02 03:46:43 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)
 
diff -r 9071ddcd48df -r 0ee0cad488b4 pidgin/plugins/gestures/stroke-draw.c
--- a/pidgin/plugins/gestures/stroke-draw.c	Tue Oct 02 03:44:49 2007 +0000
+++ b/pidgin/plugins/gestures/stroke-draw.c	Tue Oct 02 03:46:43 2007 +0000
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <glib.h>
 #include <gtk/gtk.h>
+#include <gdk/gdkx.h>
 
 #include "gstroke.h"
 #include "gstroke-internal.h"