Mercurial > pidgin3 / changeset

• changeset
• raw

changeset

Fix merge error cpw.rekkanoryo.prefs_window

Mon, 16 Nov 2009 07:25:22 +0000

author

Elliott Sales de Andrade <qulogic@pidgin.im>

date

Mon, 16 Nov 2009 07:25:22 +0000

branch

cpw.rekkanoryo.prefs_window

changeset 28900

229b187af5b5

parent 28899

3d40c443b2c7

child 28901

e0098fe083e4

Fix merge error

--- a/pidgin/gtkprefs.c	Mon Nov 16 07:19:27 2009 +0000
+++ b/pidgin/gtkprefs.c	Mon Nov 16 07:25:22 2009 +0000
@@ -1040,7 +1040,7 @@
 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);