summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Sales de Andrade <qulogic@pidgin.im>2009-11-16 07:25:22 +0000
committerElliott Sales de Andrade <qulogic@pidgin.im>2009-11-16 07:25:22 +0000
commit28e1330ffc781fe50be82b3ef09685baaf7f5353 (patch)
treeaef43547b1c042f6e7aa603969a4b681a52f4d2b
parent83342ed10de6b5efff3b31f9fa06a7b303010d81 (diff)
downloadpidgin-28e1330ffc781fe50be82b3ef09685baaf7f5353.tar.gz
Fix merge error
-rw-r--r--pidgin/gtkprefs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pidgin/gtkprefs.c b/pidgin/gtkprefs.c
index 32cee6ec01..1d2b49f909 100644
--- a/pidgin/gtkprefs.c
+++ b/pidgin/gtkprefs.c
@@ -1040,7 +1040,7 @@ prefs_set_status_icon_theme_cb(GtkComboBox *combo_box, gpointer user_data)
static GtkWidget *
theme_page(void)
{
- GtkWidget *ret;
+ GtkWidget *ret, *vbox;
GtkWidget *label;
GtkWidget *themesel_hbox;
GtkSizeGroup *label_sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);