Mercurial > pidgin
comparison libpurple/account.c @ 21353:8ae227dca885
merge of '00bf7296307f96f5c68d6e5edf219fb4a50bb947'
and '3468b1f73a715bd59ad22726232214da77cf67f7'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Fri, 16 Nov 2007 23:27:07 +0000 |
parents | d4f95419be45 73c5f5bfeb39 |
children | fcb848b2d669 |
comparison
equal
deleted
inserted
replaced
21352:ca17c133d6c3 | 21353:8ae227dca885 |
---|---|
1013 NULL, | 1013 NULL, |
1014 fields, | 1014 fields, |
1015 _("OK"), ok_cb, | 1015 _("OK"), ok_cb, |
1016 _("Cancel"), cancel_cb, | 1016 _("Cancel"), cancel_cb, |
1017 account, NULL, NULL, | 1017 account, NULL, NULL, |
1018 PURPLE_REQUEST_HINT_ACCOUNT, user_data); | 1018 "account", user_data); |
1019 g_free(primary); | 1019 g_free(primary); |
1020 } | 1020 } |
1021 | 1021 |
1022 void | 1022 void |
1023 purple_account_connect(PurpleAccount *account) | 1023 purple_account_connect(PurpleAccount *account) |
1302 "new password."), | 1302 "new password."), |
1303 fields, | 1303 fields, |
1304 _("OK"), G_CALLBACK(change_password_cb), | 1304 _("OK"), G_CALLBACK(change_password_cb), |
1305 _("Cancel"), NULL, | 1305 _("Cancel"), NULL, |
1306 account, NULL, NULL, | 1306 account, NULL, NULL, |
1307 PURPLE_REQUEST_HINT_ACCOUNT, account); | 1307 "account", account); |
1308 } | 1308 } |
1309 | 1309 |
1310 static void | 1310 static void |
1311 set_user_info_cb(PurpleAccount *account, const char *user_info) | 1311 set_user_info_cb(PurpleAccount *account, const char *user_info) |
1312 { | 1312 { |
1337 TRUE, FALSE, ((gc != NULL) && | 1337 TRUE, FALSE, ((gc != NULL) && |
1338 (gc->flags & PURPLE_CONNECTION_HTML) ? "html" : NULL), | 1338 (gc->flags & PURPLE_CONNECTION_HTML) ? "html" : NULL), |
1339 _("Save"), G_CALLBACK(set_user_info_cb), | 1339 _("Save"), G_CALLBACK(set_user_info_cb), |
1340 _("Cancel"), NULL, | 1340 _("Cancel"), NULL, |
1341 account, NULL, NULL, | 1341 account, NULL, NULL, |
1342 PURPLE_REQUEST_HINT_ACCOUNT, account); | 1342 "account", account); |
1343 } | 1343 } |
1344 | 1344 |
1345 void | 1345 void |
1346 purple_account_set_username(PurpleAccount *account, const char *username) | 1346 purple_account_set_username(PurpleAccount *account, const char *username) |
1347 { | 1347 { |