Mercurial > pidgin
comparison libpurple/account.c @ 21098:7e200a629109
explicit merge of '8f24e3576448fefbc861e06f1e8d5fe17db2e71a'
and '49d0219884ede2c6c571f2df73e29dffa86f54ad'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sun, 14 Oct 2007 02:13:14 +0000 |
parents | 285bb637a2b7 |
children | 8c9aad9479c0 0b67d509a305 |
comparison
equal
deleted
inserted
replaced
21093:5e46cdf9ef2b | 21098:7e200a629109 |
---|---|
1002 purple_request_field_group_add_field(group, field); | 1002 purple_request_field_group_add_field(group, field); |
1003 | 1003 |
1004 field = purple_request_field_bool_new("remember", _("Save password"), FALSE); | 1004 field = purple_request_field_bool_new("remember", _("Save password"), FALSE); |
1005 purple_request_field_group_add_field(group, field); | 1005 purple_request_field_group_add_field(group, field); |
1006 | 1006 |
1007 purple_request_fields(account, | 1007 purple_request_fields_with_hint(account, |
1008 NULL, | 1008 NULL, |
1009 primary, | 1009 primary, |
1010 NULL, | 1010 NULL, |
1011 fields, | 1011 fields, |
1012 _("OK"), ok_cb, | 1012 _("OK"), ok_cb, |
1013 _("Cancel"), cancel_cb, | 1013 _("Cancel"), cancel_cb, |
1014 account, NULL, NULL, | 1014 account, NULL, NULL, |
1015 user_data); | 1015 "account", user_data); |
1016 g_free(primary); | 1016 g_free(primary); |
1017 } | 1017 } |
1018 | 1018 |
1019 void | 1019 void |
1020 purple_account_connect(PurpleAccount *account) | 1020 purple_account_connect(PurpleAccount *account) |
1251 g_snprintf(primary, sizeof(primary), _("Change password for %s"), | 1251 g_snprintf(primary, sizeof(primary), _("Change password for %s"), |
1252 purple_account_get_username(account)); | 1252 purple_account_get_username(account)); |
1253 | 1253 |
1254 /* I'm sticking this somewhere in the code: bologna */ | 1254 /* I'm sticking this somewhere in the code: bologna */ |
1255 | 1255 |
1256 purple_request_fields(purple_account_get_connection(account), | 1256 purple_request_fields_with_hint(purple_account_get_connection(account), |
1257 NULL, | 1257 NULL, |
1258 primary, | 1258 primary, |
1259 _("Please enter your current password and your " | 1259 _("Please enter your current password and your " |
1260 "new password."), | 1260 "new password."), |
1261 fields, | 1261 fields, |
1262 _("OK"), G_CALLBACK(change_password_cb), | 1262 _("OK"), G_CALLBACK(change_password_cb), |
1263 _("Cancel"), NULL, | 1263 _("Cancel"), NULL, |
1264 account, NULL, NULL, | 1264 account, NULL, NULL, |
1265 account); | 1265 "account", account); |
1266 } | 1266 } |
1267 | 1267 |
1268 static void | 1268 static void |
1269 set_user_info_cb(PurpleAccount *account, const char *user_info) | 1269 set_user_info_cb(PurpleAccount *account, const char *user_info) |
1270 { | 1270 { |
1288 | 1288 |
1289 g_snprintf(primary, sizeof(primary), | 1289 g_snprintf(primary, sizeof(primary), |
1290 _("Change user information for %s"), | 1290 _("Change user information for %s"), |
1291 purple_account_get_username(account)); | 1291 purple_account_get_username(account)); |
1292 | 1292 |
1293 purple_request_input(gc, _("Set User Info"), primary, NULL, | 1293 purple_request_input_with_hint(gc, _("Set User Info"), primary, NULL, |
1294 purple_account_get_user_info(account), | 1294 purple_account_get_user_info(account), |
1295 TRUE, FALSE, ((gc != NULL) && | 1295 TRUE, FALSE, ((gc != NULL) && |
1296 (gc->flags & PURPLE_CONNECTION_HTML) ? "html" : NULL), | 1296 (gc->flags & PURPLE_CONNECTION_HTML) ? "html" : NULL), |
1297 _("Save"), G_CALLBACK(set_user_info_cb), | 1297 _("Save"), G_CALLBACK(set_user_info_cb), |
1298 _("Cancel"), NULL, | 1298 _("Cancel"), NULL, |
1299 account, NULL, NULL, | 1299 account, NULL, NULL, |
1300 account); | 1300 "account", account); |
1301 } | 1301 } |
1302 | 1302 |
1303 void | 1303 void |
1304 purple_account_set_username(PurpleAccount *account, const char *username) | 1304 purple_account_set_username(PurpleAccount *account, const char *username) |
1305 { | 1305 { |