Mercurial > pidgin.yaz
comparison src/dialogs.c @ 5943:a4f2aba0848d
[gaim-migrate @ 6384]
This should fix corruption in the blist, accounts, and pounces when some
protocol plugins cannot load. Some parts of gaim now use the new unique
Plugin or Protocol Plugin IDs, while some still use the old protocol
numbers. Accounts kind of used both, and when prpls were missing, it had
trouble finding accounts. It would find the names, even without mapping the
protocol numbers to IDs, and any duplicate accounts would get nuked. That
would then affect pounce saving. Anyhow, long story short (well, it's
already long, too late for that), this should fix all that mess. And
introduce new mess, but hopefully temporary mess.
committer: Tailor Script <tailor@pidgin.im>
author | Christian Hammond <chipx86@chipx86.com> |
---|---|
date | Mon, 23 Jun 2003 02:00:15 +0000 |
parents | 6690934e5ea6 |
children | fccc33d4b8fa |
comparison
equal
deleted
inserted
replaced
5942:d0320de18feb | 5943:a4f2aba0848d |
---|---|
1162 } | 1162 } |
1163 | 1163 |
1164 static void addchat_select_account(GObject *w, GaimConnection *gc) | 1164 static void addchat_select_account(GObject *w, GaimConnection *gc) |
1165 { | 1165 { |
1166 struct addchat *ac = g_object_get_data(w, "addchat"); | 1166 struct addchat *ac = g_object_get_data(w, "addchat"); |
1167 | 1167 GaimAccount *account; |
1168 if(ac->account->protocol == gc->account->protocol) { | 1168 |
1169 ac->account = gc->account; | 1169 account = gaim_connection_get_account(gc); |
1170 | |
1171 if (gaim_account_get_protocol(ac->account) == | |
1172 gaim_account_get_protocol(account)) { | |
1173 | |
1174 ac->account = account; | |
1170 } else { | 1175 } else { |
1171 ac->account = gc->account; | 1176 ac->account = account; |
1172 rebuild_addchat_entries(ac); | 1177 rebuild_addchat_entries(ac); |
1173 } | 1178 } |
1174 } | 1179 } |
1175 | 1180 |
1176 static void create_online_account_menu_for_add_chat(struct addchat *ac) | 1181 static void create_online_account_menu_for_add_chat(struct addchat *ac) |
3509 | 3514 |
3510 if (gtkconv->dialogs.smiley) | 3515 if (gtkconv->dialogs.smiley) |
3511 return; | 3516 return; |
3512 | 3517 |
3513 if(c->account) | 3518 if(c->account) |
3514 smileys = get_proto_smileys(c->account->protocol); | 3519 smileys = get_proto_smileys( |
3520 gaim_account_get_protocol(gaim_conversation_get_account(c))); | |
3515 else | 3521 else |
3516 smileys = get_proto_smileys(GAIM_PROTO_DEFAULT); | 3522 smileys = get_proto_smileys(GAIM_PROTO_DEFAULT); |
3517 | 3523 |
3518 while(smileys) { | 3524 while(smileys) { |
3519 GtkIMHtmlSmiley *smiley = smileys->data; | 3525 GtkIMHtmlSmiley *smiley = smileys->data; |