pidgin: 7583d5cd: Oops, the GtkListStore's for the themes ...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 7583d5cd1f78cf3472d2cc2780bedf4134de49ba
Ancestor: 9b93f44091f082fb1ef3f24c7496f0e9f53dfadf
Author: qulogic at pidgin.im
Date: 2009-12-23T02:21:52
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7583d5cd1f78cf3472d2cc2780bedf4134de49ba

Modified files:
        pidgin/gtkprefs.c

ChangeLog: 

Oops, the GtkListStore's for the themes have a lifetime that extends over
the prefs dialog, so they shouldn't be NULL'd when it closes.

-------------- next part --------------
============================================================
--- pidgin/gtkprefs.c	b5bae9667ef1b451a919d7564d63972946883dae
+++ pidgin/gtkprefs.c	afd2949c435e4ed52a9b2665fb40f7208611b1ad
@@ -78,11 +78,6 @@ static int notebook_page = 0;
 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 gboolean prefs_sound_themes_loadi
 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 @@ delete_prefs(GtkWidget *asdf, void *gdsa
 	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;