Mercurial > pidgin
changeset 27841:0e516784bbae
merge of '05d22685de7c7e91a18724eccf5ecf6791146239'
and '3ca58814bdd8642da208ea36f34f9a752fd4bf1b'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Thu, 06 Aug 2009 03:23:05 +0000 |
| parents | d9aef5487af9 (diff) 0c90b164a735 (current diff) |
| children | f9cf1e14838b |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/finch/gntaccount.c Thu Aug 06 03:21:59 2009 +0000 +++ b/finch/gntaccount.c Thu Aug 06 03:23:05 2009 +0000 @@ -489,6 +489,7 @@ GntWidget *combo, *button, *entry; GList *list, *iter; AccountEditDialog *dialog; + PurplePlugin *plugin; if (account) { @@ -532,9 +533,10 @@ ((PurplePlugin*)iter->data)->info->name); } - if (account) - gnt_combo_box_set_selected(GNT_COMBO_BOX(combo), - purple_plugins_find_with_id(purple_account_get_protocol_id(account))); + plugin = purple_plugins_find_with_id(purple_account_get_protocol_id(account)); + + if (account && plugin) + gnt_combo_box_set_selected(GNT_COMBO_BOX(combo), plugin); else gnt_combo_box_set_selected(GNT_COMBO_BOX(combo), list->data);
--- a/pidgin.spec.in Thu Aug 06 03:21:59 2009 +0000 +++ b/pidgin.spec.in Thu Aug 06 03:23:05 2009 +0000 @@ -251,6 +251,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so +rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libymsg.so rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod find $RPM_BUILD_ROOT -type f -name '*.a' -exec rm -f {} ';'