Mercurial > pidgin.yaz
changeset 29198:f56b7177553d
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.
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Wed, 23 Dec 2009 02:21:52 +0000 |
| parents | 9bf6fe097c9c |
| children | 77f2534b0cac |
| files | pidgin/gtkprefs.c |
| diffstat | 1 files changed, 6 insertions(+), 10 deletions(-) [+] |
line wrap: on
line 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;