# HG changeset patch # User Elliott Sales de Andrade # Date 1258356322 0 # Node ID 7e702319331606d4e1ce3715079344ec0499f079 # Parent b26b9f8c9dbde00e1caf3bb1cbcabb063c392425 Fix merge error diff -r b26b9f8c9dbd -r 7e7023193316 pidgin/gtkprefs.c --- 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);