changeset
Backport 96cf043274a971d5a2b9e01ef85fb60ca2a4bcd1 (#8747 - Crash when a prpl has no protocol options.)
Thu, 30 Apr 2009 05:18:04 +0000
- author
- Daniel Atallah <datallah@pidgin.im>
- date
- Thu, 30 Apr 2009 05:18:04 +0000
- branch
- release-2.5.6
- changeset 25730
- c2698534cbb1
- parent 25729
- 7ef1f61c876e
- child 25731
- b9fd4a560a72
Backport 96cf043274a971d5a2b9e01ef85fb60ca2a4bcd1 (#8747 - Crash when a prpl has no protocol options.)
| pidgin/gtkaccount.c | file | annotate | diff | comparison | revisions |
--- 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. */
