summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Laager <rlaager@pidgin.im>2008-05-06 05:10:40 +0000
committerRichard Laager <rlaager@pidgin.im>2008-05-06 05:10:40 +0000
commit86fc5aed26383b2b3d60e34e5207c77b63b7b92d (patch)
tree02779535e495a0aaaa6bd0f9b339441b8e239f92
parent6a0ceb775b0df6dac956b7a9071cc2e25b9ae50e (diff)
downloadpidgin-86fc5aed26383b2b3d60e34e5207c77b63b7b92d.tar.gz
Fix a compiler warning. Sadrul or someone should double-check this.
-rw-r--r--finch/gntrequest.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/finch/gntrequest.c b/finch/gntrequest.c
index 55f3647153..b613d8f811 100644
--- a/finch/gntrequest.c
+++ b/finch/gntrequest.c
@@ -104,7 +104,8 @@ action_performed(GntWidget *button, gpointer data)
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 @@ setup_button_box(GntWidget *win, gpointer userdata, gpointer cb, gpointer data,
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;