Mercurial > pidgin3 / file diff

--- a/pidgin/gtkprefs.c	Wed Dec 23 01:51:19 2009 +0000
+++ b/pidgin/gtkprefs.c	Wed Dec 23 02:21:52 2009 +0000
@@ -78,11 +78,6 @@
 static int notebook_page = 0;
 
 /* Themes page */
-static GtkListStore *prefs_sound_themes;
-static GtkListStore *prefs_blist_themes;
-static GtkListStore *prefs_status_icon_themes;
-static GtkListStore *prefs_smiley_themes;
-
 static GtkWidget *prefs_sound_themes_combo_box;
 static GtkWidget *prefs_blist_themes_combo_box;
 static GtkWidget *prefs_status_themes_combo_box;
@@ -93,6 +88,12 @@
 static int sound_row_sel = 0;
 static gboolean prefs_sound_themes_loading;
 
+/* These exist outside the lifetime of the prefs dialog */
+static GtkListStore *prefs_sound_themes;
+static GtkListStore *prefs_blist_themes;
+static GtkListStore *prefs_status_icon_themes;
+static GtkListStore *prefs_smiley_themes;
+
 /*
  * PROTOTYPES
  */
@@ -341,11 +342,6 @@
 	sound_row_sel = 0;
 	prefs_sound_themes_loading = FALSE;
 
-	prefs_sound_themes = NULL;
-	prefs_blist_themes = NULL;
-	prefs_status_icon_themes = NULL;
-	prefs_smiley_themes = NULL;
-
 	prefs_sound_themes_combo_box = NULL;
 	prefs_blist_themes_combo_box = NULL;
 	prefs_status_themes_combo_box = NULL;