Mercurial > pidgin.yaz
comparison pidgin/gtkaccount.c @ 25895:a81f75025e14
propagate from branch 'im.pidgin.pidgin.2.5.5.veracode' (head 1744a346c5951c97b5d6ec102b49606f3dd918cc)
to branch 'im.pidgin.pidgin.2.5.6' (head 9fe90237b75569f21f8de666d690a38109709df0)
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Thu, 14 May 2009 21:17:11 +0000 |
parents | dfd7be3e3cb7 |
children | 01f1929d0936 |
comparison
equal
deleted
inserted
replaced
25846:c7ec8f3b39d3 | 25895:a81f75025e14 |
---|---|
754 if (dialog->protocol_frame != NULL) { | 754 if (dialog->protocol_frame != NULL) { |
755 gtk_widget_destroy(dialog->protocol_frame); | 755 gtk_widget_destroy(dialog->protocol_frame); |
756 dialog->protocol_frame = NULL; | 756 dialog->protocol_frame = NULL; |
757 } | 757 } |
758 | 758 |
759 if (dialog->prpl_info == NULL || | |
760 dialog->prpl_info->protocol_options == NULL) | |
761 return; | |
762 | |
763 while (dialog->protocol_opt_entries != NULL) { | 759 while (dialog->protocol_opt_entries != NULL) { |
764 ProtocolOptEntry *opt_entry = dialog->protocol_opt_entries->data; | 760 ProtocolOptEntry *opt_entry = dialog->protocol_opt_entries->data; |
765 g_free(opt_entry->setting); | 761 g_free(opt_entry->setting); |
766 g_free(opt_entry); | 762 g_free(opt_entry); |
767 dialog->protocol_opt_entries = g_list_delete_link(dialog->protocol_opt_entries, dialog->protocol_opt_entries); | 763 dialog->protocol_opt_entries = g_list_delete_link(dialog->protocol_opt_entries, dialog->protocol_opt_entries); |
768 } | 764 } |
765 | |
766 if (dialog->prpl_info == NULL || | |
767 dialog->prpl_info->protocol_options == NULL) | |
768 return; | |
769 | 769 |
770 account = dialog->account; | 770 account = dialog->account; |
771 | 771 |
772 /* Build the protocol options frame. */ | 772 /* Build the protocol options frame. */ |
773 g_snprintf(buf, sizeof(buf), _("%s Options"), dialog->plugin->info->name); | 773 g_snprintf(buf, sizeof(buf), _("%s Options"), dialog->plugin->info->name); |