pidgin.2.5.6: 6e22a236: Backport 96cf043274a971d5a2b9e01ef85fb60...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 6e22a23609a6e1167ffbafeb34a526db3f9a6b3b
Ancestor: 4e079652a03cd6088bd41b56639b7352c1036981
Author: datallah at pidgin.im
Date: 2009-04-30T05:18:04
Branch: im.pidgin.pidgin.2.5.6
URL: http://d.pidgin.im/viewmtn/revision/info/6e22a23609a6e1167ffbafeb34a526db3f9a6b3b

Modified files:
        pidgin/gtkaccount.c

ChangeLog: 

Backport 96cf043274a971d5a2b9e01ef85fb60ca2a4bcd1 (#8747 - Crash when a prpl has no protocol options.)

-------------- next part --------------
============================================================
--- pidgin/gtkaccount.c	b46851a34214bd2a18360dbd863df23290da78c2
+++ pidgin/gtkaccount.c	50e6b2c51d30528f5758231bfbbff3a3d32e0f48
@@ -756,10 +756,6 @@ add_protocol_options(AccountPrefsDialog 
 		dialog->protocol_frame = NULL;
 	}
 
-	if (dialog->prpl_info == NULL ||
-			dialog->prpl_info->protocol_options == NULL)
-		return;
-
 	while (dialog->protocol_opt_entries != NULL) {
 		ProtocolOptEntry *opt_entry = dialog->protocol_opt_entries->data;
 		g_free(opt_entry->setting);
@@ -767,6 +763,10 @@ add_protocol_options(AccountPrefsDialog 
 		dialog->protocol_opt_entries = g_list_delete_link(dialog->protocol_opt_entries, dialog->protocol_opt_entries);
 	}
 
+	if (dialog->prpl_info == NULL ||
+			dialog->prpl_info->protocol_options == NULL)
+		return;
+
 	account = dialog->account;
 
 	/* Build the protocol options frame. */