Mercurial > pidgin

comparison libpurple/protocols/msn/msn.c @ 21560:665e04562de0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
This merge has the effect of reverting the hinting code from trunk.
author Richard Laager <rlaager@wiktel.com>
date Sat, 17 Nov 2007 00:12:30 +0000
parents 38cc722159ff fcb848b2d669
children ef781d8d2ec1 b82a17934604 60f5abc6cf0c
comparison
equal deleted inserted replaced
21544:9b4d1af17ced 21560:665e04562de0
281 { 281 {
282 PurpleConnection *gc; 282 PurpleConnection *gc;
283 283
284 gc = (PurpleConnection *) action->context; 284 gc = (PurpleConnection *) action->context;
285 285
286 purple_request_input_with_hint(gc, NULL, _("Set your friendly name."), 286 purple_request_input(gc, NULL, _("Set your friendly name."),
287 _("This is the name that other MSN buddies will " 287 _("This is the name that other MSN buddies will "
288 "see you as."), 288 "see you as."),
289 purple_connection_get_display_name(gc), FALSE, FALSE, NULL, 289 purple_connection_get_display_name(gc), FALSE, FALSE, NULL,
290 _("OK"), G_CALLBACK(msn_act_id), 290 _("OK"), G_CALLBACK(msn_act_id),
291 _("Cancel"), NULL, 291 _("Cancel"), NULL,
292 purple_connection_get_account(gc), NULL, NULL, 292 purple_connection_get_account(gc), NULL, NULL,
293 PURPLE_REQUEST_UI_HINT_ACCOUNT, gc); 293 gc);
294 } 294 }
295 295
296 static void 296 static void
297 msn_show_set_home_phone(PurplePluginAction *action) 297 msn_show_set_home_phone(PurplePluginAction *action)
298 { 298 {
300 MsnSession *session; 300 MsnSession *session;
301 301
302 gc = (PurpleConnection *) action->context; 302 gc = (PurpleConnection *) action->context;
303 session = gc->proto_data; 303 session = gc->proto_data;
304 304
305 purple_request_input_with_hint(gc, NULL, _("Set your home phone number."), NULL, 305 purple_request_input(gc, NULL, _("Set your home phone number."), NULL,
306 msn_user_get_home_phone(session->user), FALSE, FALSE, NULL, 306 msn_user_get_home_phone(session->user), FALSE, FALSE, NULL,
307 _("OK"), G_CALLBACK(msn_set_home_phone_cb), 307 _("OK"), G_CALLBACK(msn_set_home_phone_cb),
308 _("Cancel"), NULL, 308 _("Cancel"), NULL,
309 purple_connection_get_account(gc), NULL, NULL, 309 purple_connection_get_account(gc), NULL, NULL,
310 PURPLE_REQUEST_UI_HINT_ACCOUNT, gc); 310 gc);
311 } 311 }
312 312
313 static void 313 static void
314 msn_show_set_work_phone(PurplePluginAction *action) 314 msn_show_set_work_phone(PurplePluginAction *action)
315 { 315 {
317 MsnSession *session; 317 MsnSession *session;
318 318
319 gc = (PurpleConnection *) action->context; 319 gc = (PurpleConnection *) action->context;
320 session = gc->proto_data; 320 session = gc->proto_data;
321 321
322 purple_request_input_with_hint(gc, NULL, _("Set your work phone number."), NULL, 322 purple_request_input(gc, NULL, _("Set your work phone number."), NULL,
323 msn_user_get_work_phone(session->user), FALSE, FALSE, NULL, 323 msn_user_get_work_phone(session->user), FALSE, FALSE, NULL,
324 _("OK"), G_CALLBACK(msn_set_work_phone_cb), 324 _("OK"), G_CALLBACK(msn_set_work_phone_cb),
325 _("Cancel"), NULL, 325 _("Cancel"), NULL,
326 purple_connection_get_account(gc), NULL, NULL, 326 purple_connection_get_account(gc), NULL, NULL,
327 PURPLE_REQUEST_UI_HINT_ACCOUNT, gc); 327 gc);
328 } 328 }
329 329
330 static void 330 static void
331 msn_show_set_mobile_phone(PurplePluginAction *action) 331 msn_show_set_mobile_phone(PurplePluginAction *action)
332 { 332 {
334 MsnSession *session; 334 MsnSession *session;
335 335
336 gc = (PurpleConnection *) action->context; 336 gc = (PurpleConnection *) action->context;
337 session = gc->proto_data; 337 session = gc->proto_data;
338 338
339 purple_request_input_with_hint(gc, NULL, _("Set your mobile phone number."), NULL, 339 purple_request_input(gc, NULL, _("Set your mobile phone number."), NULL,
340 msn_user_get_mobile_phone(session->user), FALSE, FALSE, NULL, 340 msn_user_get_mobile_phone(session->user), FALSE, FALSE, NULL,
341 _("OK"), G_CALLBACK(msn_set_mobile_phone_cb), 341 _("OK"), G_CALLBACK(msn_set_mobile_phone_cb),
342 _("Cancel"), NULL, 342 _("Cancel"), NULL,
343 purple_connection_get_account(gc), NULL, NULL, 343 purple_connection_get_account(gc), NULL, NULL,
344 PURPLE_REQUEST_UI_HINT_ACCOUNT, gc); 344 gc);
345 } 345 }
346 346
347 static void 347 static void
348 msn_show_set_mobile_pages(PurplePluginAction *action) 348 msn_show_set_mobile_pages(PurplePluginAction *action)
349 { 349 {
350 PurpleConnection *gc; 350 PurpleConnection *gc;
351 351
352 gc = (PurpleConnection *) action->context; 352 gc = (PurpleConnection *) action->context;
353 353
354 purple_request_action_with_hint(gc, NULL, _("Allow MSN Mobile pages?"), 354 purple_request_action(gc, NULL, _("Allow MSN Mobile pages?"),
355 _("Do you want to allow or disallow people on " 355 _("Do you want to allow or disallow people on "
356 "your buddy list to send you MSN Mobile pages " 356 "your buddy list to send you MSN Mobile pages "
357 "to your cell phone or other mobile device?"), 357 "to your cell phone or other mobile device?"),
358 -1, 358 -1,
359 purple_connection_get_account(gc), NULL, NULL, 359 purple_connection_get_account(gc), NULL, NULL,
360 PURPLE_REQUEST_UI_HINT_ACCOUNT, gc, 3, 360 gc, 3,
361 _("Allow"), G_CALLBACK(enable_msn_pages_cb), 361 _("Allow"), G_CALLBACK(enable_msn_pages_cb),
362 _("Disallow"), G_CALLBACK(disable_msn_pages_cb), 362 _("Disallow"), G_CALLBACK(disable_msn_pages_cb),
363 _("Cancel"), NULL); 363 _("Cancel"), NULL);
364 } 364 }
365 365
399 399
400 data = g_new0(MsnMobileData, 1); 400 data = g_new0(MsnMobileData, 1);
401 data->gc = gc; 401 data->gc = gc;
402 data->passport = buddy->name; 402 data->passport = buddy->name;
403 403
404 purple_request_input_with_hint(gc, NULL, _("Send a mobile message."), NULL, 404 purple_request_input(gc, NULL, _("Send a mobile message."), NULL,
405 NULL, TRUE, FALSE, NULL, 405 NULL, TRUE, FALSE, NULL,
406 _("Page"), G_CALLBACK(send_to_mobile_cb), 406 _("Page"), G_CALLBACK(send_to_mobile_cb),
407 _("Close"), G_CALLBACK(close_mobile_page_cb), 407 _("Close"), G_CALLBACK(close_mobile_page_cb),
408 purple_connection_get_account(gc), purple_buddy_get_name(buddy), NULL, 408 purple_connection_get_account(gc), purple_buddy_get_name(buddy), NULL,
409 PURPLE_REQUEST_UI_HINT_ACCOUNT, data); 409 data);
410 } 410 }
411 411
412 static gboolean 412 static gboolean
413 msn_offline_message(const PurpleBuddy *buddy) { 413 msn_offline_message(const PurpleBuddy *buddy) {
414 MsnUser *user; 414 MsnUser *user;