comparison finch/gntaccount.c @ 28202:141e76df86a6

merged with im.pidgin.pidgin
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Sat, 08 Aug 2009 17:35:08 +0900
parents 3316e5c79a53
children a07e46f20644
comparison
equal deleted inserted replaced
28177:94abbb806273 28202:141e76df86a6
487 { 487 {
488 GntWidget *window, *hbox; 488 GntWidget *window, *hbox;
489 GntWidget *combo, *button, *entry; 489 GntWidget *combo, *button, *entry;
490 GList *list, *iter; 490 GList *list, *iter;
491 AccountEditDialog *dialog; 491 AccountEditDialog *dialog;
492 PurplePlugin *plugin;
492 493
493 if (account) 494 if (account)
494 { 495 {
495 GList *iter; 496 GList *iter;
496 for (iter = accountdialogs; iter; iter = iter->next) 497 for (iter = accountdialogs; iter; iter = iter->next)
530 { 531 {
531 gnt_combo_box_add_data(GNT_COMBO_BOX(combo), iter->data, 532 gnt_combo_box_add_data(GNT_COMBO_BOX(combo), iter->data,
532 ((PurplePlugin*)iter->data)->info->name); 533 ((PurplePlugin*)iter->data)->info->name);
533 } 534 }
534 535
535 if (account) 536 plugin = purple_plugins_find_with_id(purple_account_get_protocol_id(account));
536 gnt_combo_box_set_selected(GNT_COMBO_BOX(combo), 537
537 purple_plugins_find_with_id(purple_account_get_protocol_id(account))); 538 if (account && plugin)
539 gnt_combo_box_set_selected(GNT_COMBO_BOX(combo), plugin);
538 else 540 else
539 gnt_combo_box_set_selected(GNT_COMBO_BOX(combo), list->data); 541 gnt_combo_box_set_selected(GNT_COMBO_BOX(combo), list->data);
540 542
541 g_signal_connect(G_OBJECT(combo), "selection-changed", G_CALLBACK(prpl_changed_cb), dialog); 543 g_signal_connect(G_OBJECT(combo), "selection-changed", G_CALLBACK(prpl_changed_cb), dialog);
542 544