pidgin: 9b93f440: Make sure all globals are NULL when the ...

qulogic at pidgin.im qulogic at pidgin.im
Wed Dec 23 03:47:09 EST 2009


-----------------------------------------------------------------
Revision: 9b93f44091f082fb1ef3f24c7496f0e9f53dfadf
Ancestor: fac6845b197a67f834b52ad1150880c28d1d03aa
Author: qulogic at pidgin.im
Date: 2009-12-23T01:51:19
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9b93f44091f082fb1ef3f24c7496f0e9f53dfadf

Modified files:
        pidgin/gtkprefs.c

ChangeLog: 

Make sure all globals are NULL when the prefs page is destroyed.

-------------- next part --------------
============================================================
--- pidgin/gtkprefs.c	a721e2f76689d2726721267b45f16aeeb144f644
+++ pidgin/gtkprefs.c	b5bae9667ef1b451a919d7564d63972946883dae
@@ -74,7 +74,7 @@ static GtkWidget *prefs = NULL;
 static GtkWidget *prefs = NULL;
 
 /* Notebook */
-static GtkWidget *prefsnotebook;
+static GtkWidget *prefsnotebook = NULL;
 static int notebook_page = 0;
 
 /* Themes page */
@@ -336,9 +336,24 @@ delete_prefs(GtkWidget *asdf, void *gdsa
 	/* Unregister callbacks. */
 	purple_prefs_disconnect_by_handle(prefs);
 
-	prefs = NULL;
+	/* NULL-ify globals */
 	sound_entry = NULL;
+	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;
+	prefs_smiley_themes_combo_box = NULL;
+
 	notebook_page = 0;
+	prefsnotebook = NULL;
+	prefs = NULL;
 }
 
 static gchar *


More information about the Commits mailing list