Mercurial > pidgin.yaz
comparison src/gtkconv.c @ 7060:9946001989a3
[gaim-migrate @ 7623]
show_add_buddy, show_add_chat, and show_add_group are gone, replaced with
the new core/UI split gaim_blist_request_add_{buddy,chat,group}.
committer: Tailor Script <tailor@pidgin.im>
author | Christian Hammond <chipx86@chipx86.com> |
---|---|
date | Tue, 30 Sep 2003 05:48:42 +0000 |
parents | feb3d21a7794 |
children | acd2a66e59ed |
comparison
equal
deleted
inserted
replaced
7059:e36cbed14f1e | 7060:9946001989a3 |
---|---|
477 } | 477 } |
478 | 478 |
479 static void | 479 static void |
480 add_cb(GtkWidget *widget, GaimConversation *conv) | 480 add_cb(GtkWidget *widget, GaimConversation *conv) |
481 { | 481 { |
482 GaimConnection *gc; | 482 GaimAccount *account; |
483 GaimBuddy *b; | 483 GaimBuddy *b; |
484 const char *name; | 484 const char *name; |
485 | 485 |
486 gc = gaim_conversation_get_gc(conv); | 486 account = gaim_conversation_get_account(conv); |
487 name = gaim_conversation_get_name(conv); | 487 name = gaim_conversation_get_name(conv); |
488 b = gaim_find_buddy(gc->account, name); | 488 b = gaim_find_buddy(account, name); |
489 | 489 |
490 if (b != NULL) | 490 if (b != NULL) |
491 show_confirm_del(b); | 491 show_confirm_del(b); |
492 else if (gc != NULL) | 492 else if (account != NULL && gaim_account_is_connected(account)) |
493 show_add_buddy(gc, (char *)name, NULL, NULL); | 493 gaim_blist_request_add_buddy(account, (char *)name, NULL, NULL); |
494 | 494 |
495 gtk_widget_grab_focus(GAIM_GTK_CONVERSATION(conv)->entry); | 495 gtk_widget_grab_focus(GAIM_GTK_CONVERSATION(conv)->entry); |
496 } | 496 } |
497 | 497 |
498 static void | 498 static void |
1012 } | 1012 } |
1013 | 1013 |
1014 static void | 1014 static void |
1015 menu_chat_add_cb(GtkWidget *w, GaimConversation *conv) | 1015 menu_chat_add_cb(GtkWidget *w, GaimConversation *conv) |
1016 { | 1016 { |
1017 GaimConnection *gc; | 1017 GaimAccount *account; |
1018 GaimBuddy *b; | 1018 GaimBuddy *b; |
1019 char *name; | 1019 char *name; |
1020 | 1020 |
1021 gc = gaim_conversation_get_gc(conv); | 1021 account = gaim_conversation_get_account(conv); |
1022 name = g_object_get_data(G_OBJECT(w), "user_data"); | 1022 name = g_object_get_data(G_OBJECT(w), "user_data"); |
1023 b = gaim_find_buddy(gc->account, name); | 1023 b = gaim_find_buddy(account, name); |
1024 | 1024 |
1025 if (b != NULL) | 1025 if (b != NULL) |
1026 show_confirm_del(b); | 1026 show_confirm_del(b); |
1027 else if (gc != NULL) | 1027 else if (account != NULL && gaim_account_is_connected(account)) |
1028 show_add_buddy(gc, name, NULL, NULL); | 1028 gaim_blist_request_add_buddy(account, name, NULL, NULL); |
1029 | 1029 |
1030 gtk_widget_grab_focus(GAIM_GTK_CONVERSATION(conv)->entry); | 1030 gtk_widget_grab_focus(GAIM_GTK_CONVERSATION(conv)->entry); |
1031 } | 1031 } |
1032 | 1032 |
1033 static gint | 1033 static gint |