# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1210128336 0
# Node ID 9089d36d64c99c9828d5ce082ad341527186d28b
# Parent  729a340375fad18b778e6ff7e101aa5e6ecc42e4# Parent  26b9735a34ae00c501f0b6a7bdd9f15e1e6164ad
merge of '02d1b6e1b18a057f6dc1f4698d85c8cd005f3bbc'
     and '2e0e8f0a987f266a2b42fe3f59932b060fcdcdaf'

diff -r 26b9735a34ae -r 9089d36d64c9 finch/gntrequest.c
--- a/finch/gntrequest.c	Tue May 06 08:06:19 2008 +0000
+++ b/finch/gntrequest.c	Wed May 07 02:45:36 2008 +0000
@@ -104,7 +104,8 @@
 static GntWidget *
 setup_button_box(GntWidget *win, gpointer userdata, gpointer cb, gpointer data, ...)
 {
-	GntWidget *box, *button;
+	GntWidget *box;
+	GntWidget *button = NULL;
 	va_list list;
 	const char *text;
 	gpointer callback;
@@ -124,7 +125,8 @@
 		g_signal_connect(G_OBJECT(button), "activate", G_CALLBACK(cb), data);
 	}
 
-	g_object_set_data(G_OBJECT(button), "cancellation-function", GINT_TO_POINTER(TRUE));
+	if (button)
+		g_object_set_data(G_OBJECT(button), "cancellation-function", GINT_TO_POINTER(TRUE));
 
 	va_end(list);
 	return box;
diff -r 26b9735a34ae -r 9089d36d64c9 finch/libgnt/gntwm.c
--- a/finch/libgnt/gntwm.c	Tue May 06 08:06:19 2008 +0000
+++ b/finch/libgnt/gntwm.c	Wed May 07 02:45:36 2008 +0000
@@ -101,7 +101,9 @@
 static gboolean idle_update;
 static GList *act = NULL; /* list of WS with unseen activitiy */
 static gboolean ignore_keys = FALSE;
+#ifdef USE_PYTHON
 static gboolean started_python = FALSE;
+#endif
 
 static GList *
 g_list_bring_to_front(GList *list, gpointer data)