# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1241068684 0
# Node ID dfd7be3e3cb781ac504a62a4d6d2424a9cc46206
# Parent  71aafff243587f05989dea6dd23a10ee2202f4e8
Backport 96cf043274a971d5a2b9e01ef85fb60ca2a4bcd1 (#8747 - Crash when a prpl has no protocol options.)

diff -r 71aafff24358 -r dfd7be3e3cb7 pidgin/gtkaccount.c
--- a/pidgin/gtkaccount.c	Thu Apr 30 05:16:29 2009 +0000
+++ b/pidgin/gtkaccount.c	Thu Apr 30 05:18:04 2009 +0000
@@ -756,10 +756,6 @@
 		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 @@
 		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. */