changeset 22858:9089d36d64c9

merge of '02d1b6e1b18a057f6dc1f4698d85c8cd005f3bbc' and '2e0e8f0a987f266a2b42fe3f59932b060fcdcdaf'
author Richard Laager <rlaager@wiktel.com>
date Wed, 07 May 2008 02:45:36 +0000
parents 729a340375fa (diff) 26b9735a34ae (current diff)
children 4409f8a0d7aa
files
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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)