comparison pidgin/gtkpounce.c @ 32827:4a34689eeb33 default tip

merged from im.pidgin.pidgin
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Sat, 19 Nov 2011 14:42:54 +0900
parents b6276b10cb10
children
comparison
equal deleted inserted replaced
32692:0f94ec89f0bc 32827:4a34689eeb33
425 else 425 else
426 return; 426 return;
427 427
428 dialog = (PidginPounceDialog *)data; 428 dialog = (PidginPounceDialog *)data;
429 429
430 gtk_entry_set_text(GTK_ENTRY(dialog->buddy_entry), buddy->name); 430 gtk_entry_set_text(GTK_ENTRY(dialog->buddy_entry), purple_buddy_get_name(buddy));
431 dialog->account = buddy->account; 431 dialog->account = purple_buddy_get_account(buddy);
432 pidgin_account_option_menu_set_selected(dialog->account_menu, buddy->account); 432 pidgin_account_option_menu_set_selected(dialog->account_menu, purple_buddy_get_account(buddy));
433 433
434 gtk_drag_finish(dc, TRUE, (dc->action == GDK_ACTION_MOVE), t); 434 gtk_drag_finish(dc, TRUE, (dc->action == GDK_ACTION_MOVE), t);
435 } 435 }
436 else if (sd->target == gdk_atom_intern("application/x-im-contact", FALSE)) 436 else if (sd->target == gdk_atom_intern("application/x-im-contact", FALSE))
437 { 437 {
474 static void 474 static void
475 reset_send_msg_entry(PidginPounceDialog *dialog, GtkWidget *dontcare) 475 reset_send_msg_entry(PidginPounceDialog *dialog, GtkWidget *dontcare)
476 { 476 {
477 PurpleAccount *account = pidgin_account_option_menu_get_selected(dialog->account_menu); 477 PurpleAccount *account = pidgin_account_option_menu_get_selected(dialog->account_menu);
478 gtk_imhtml_setup_entry(GTK_IMHTML(dialog->send_msg_entry), 478 gtk_imhtml_setup_entry(GTK_IMHTML(dialog->send_msg_entry),
479 (account && account->gc) ? account->gc->flags : PURPLE_CONNECTION_HTML); 479 (account && purple_account_get_connection(account)) ? purple_connection_get_flags(purple_account_get_connection(account)) : PURPLE_CONNECTION_HTML);
480 } 480 }
481 481
482 void 482 void
483 pidgin_pounce_editor_show(PurpleAccount *account, const char *name, 483 pidgin_pounce_editor_show(PurpleAccount *account, const char *name,
484 PurplePounce *cur_pounce) 484 PurplePounce *cur_pounce)
1481 conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, pouncee); 1481 conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, pouncee);
1482 1482
1483 purple_conversation_write(conv, NULL, message, 1483 purple_conversation_write(conv, NULL, message,
1484 PURPLE_MESSAGE_SEND, time(NULL)); 1484 PURPLE_MESSAGE_SEND, time(NULL));
1485 1485
1486 serv_send_im(account->gc, (char *)pouncee, (char *)message, 0); 1486 serv_send_im(purple_account_get_connection(account), (char *)pouncee, (char *)message, 0);
1487 } 1487 }
1488 } 1488 }
1489 1489
1490 if (purple_pounce_action_is_enabled(pounce, "execute-command")) 1490 if (purple_pounce_action_is_enabled(pounce, "execute-command"))
1491 { 1491 {