# HG changeset patch # User Elliott Sales de Andrade # Date 1258356322 0 # Node ID 229b187af5b55c09d3c809c2445ad3bfffd93ae2 # Parent 3d40c443b2c7aab6486a7660eda0dfa81828e304 Fix merge error diff -r 3d40c443b2c7 -r 229b187af5b5 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);