cpw.rekkanoryo.prefs_window: ccba7725: Fix merge error

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: ccba77252374e2a634a9d8ad69b536c117063c58
Ancestor: 1aec56331fde295ae0a58e485203f147e1dc9700
Author: qulogic at pidgin.im
Date: 2009-11-16T07:25:22
Branch: im.pidgin.cpw.rekkanoryo.prefs_window
URL: http://d.pidgin.im/viewmtn/revision/info/ccba77252374e2a634a9d8ad69b536c117063c58

Modified files:
        pidgin/gtkprefs.c

ChangeLog: 

Fix merge error

-------------- next part --------------
============================================================
--- pidgin/gtkprefs.c	7943429c1bd2a098b54938188859797c92fce9be
+++ pidgin/gtkprefs.c	cd5cd6bb20d7967ecf5189963c585c56ed591d8d
@@ -1040,7 +1040,7 @@ theme_page(void)
 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);