pidgin: 96cf0432: Fix a crash when creating an account wit...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 96cf043274a971d5a2b9e01ef85fb60ca2a4bcd1
Ancestor: 5592cb6a8b667422747bafd555fea0aed19931b6
Author: datallah at pidgin.im
Date: 2009-03-23T02:10:44
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/96cf043274a971d5a2b9e01ef85fb60ca2a4bcd1

Modified files:
        pidgin/gtkaccount.c

ChangeLog: 

Fix a crash when creating an account with a prpl with no protocol_options. Fixes #8747.

-------------- next part --------------
============================================================
--- pidgin/gtkaccount.c	1b5237aeb9bbcae1d13855d8a1aa60dc39b16d04
+++ pidgin/gtkaccount.c	e88d49b1efe19940f4439dbed3deb6a8cfd6c24b
@@ -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. */