Mercurial > pidgin3 / changeset

--- 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)
 

--- 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"