Mercurial > pidgin
comparison src/gtkconv.c @ 9730:c9ac1976ef01
[gaim-migrate @ 10591]
I shuffled lots of stuff around again.
See plugins/ChangeLog.API for the list of renamed functions.
I'm trying to clean up gtkdialogs.c/.h, so I moved the away stuff
into away.c/.h
I also reduced the minimum buddy list height from 200 pixels to
100 pixels. I just realized that that's also the default height
used when you don't have a prefs.xml, which is bad. I think I'm
going to set the default height to around 300 pixels.
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Mon, 09 Aug 2004 03:49:46 +0000 |
parents | 8be2c406a1f1 |
children | a2fd9abea23a |
comparison
equal
deleted
inserted
replaced
9729:f44ae9331afc | 9730:c9ac1976ef01 |
---|---|
523 if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) { | 523 if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) { |
524 GaimBuddy *b; | 524 GaimBuddy *b; |
525 | 525 |
526 b = gaim_find_buddy(account, name); | 526 b = gaim_find_buddy(account, name); |
527 if (b != NULL) | 527 if (b != NULL) |
528 show_confirm_del(b); | 528 gaim_gtkdialogs_remove_buddy(b); |
529 else if (account != NULL && gaim_account_is_connected(account)) | 529 else if (account != NULL && gaim_account_is_connected(account)) |
530 gaim_blist_request_add_buddy(account, (char *)name, NULL, NULL); | 530 gaim_blist_request_add_buddy(account, (char *)name, NULL, NULL); |
531 } else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) { | 531 } else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) { |
532 GaimChat *c; | 532 GaimChat *c; |
533 | 533 |
534 c = gaim_blist_find_chat(account, name); | 534 c = gaim_blist_find_chat(account, name); |
535 if (c != NULL) | 535 if (c != NULL) |
536 show_confirm_del_blist_chat(c); | 536 gaim_gtkdialogs_remove_chat(c); |
537 else if (account != NULL && gaim_account_is_connected(account)) | 537 else if (account != NULL && gaim_account_is_connected(account)) |
538 gaim_blist_request_add_chat(account, NULL, NULL); | 538 gaim_blist_request_add_chat(account, NULL, NULL); |
539 } | 539 } |
540 | 540 |
541 gtk_widget_grab_focus(GAIM_GTK_CONVERSATION(conv)->entry); | 541 gtk_widget_grab_focus(GAIM_GTK_CONVERSATION(conv)->entry); |
996 if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) { | 996 if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) { |
997 GaimBuddy *b; | 997 GaimBuddy *b; |
998 | 998 |
999 b = gaim_find_buddy(account, name); | 999 b = gaim_find_buddy(account, name); |
1000 if (b != NULL) | 1000 if (b != NULL) |
1001 alias_dialog_bud(b); | 1001 gaim_gtkdialogs_alias_buddy(b); |
1002 } else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) { | 1002 } else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) { |
1003 GaimChat *c; | 1003 GaimChat *c; |
1004 | 1004 |
1005 c = gaim_blist_find_chat(account, name); | 1005 c = gaim_blist_find_chat(account, name); |
1006 if (c != NULL) | 1006 if (c != NULL) |
1007 alias_dialog_blist_chat(c); | 1007 gaim_gtkdialogs_alias_chat(c); |
1008 } | 1008 } |
1009 } | 1009 } |
1010 | 1010 |
1011 static void | 1011 static void |
1012 menu_get_info_cb(gpointer data, guint action, GtkWidget *widget) | 1012 menu_get_info_cb(gpointer data, guint action, GtkWidget *widget) |
1300 account = gaim_conversation_get_account(conv); | 1300 account = gaim_conversation_get_account(conv); |
1301 name = g_object_get_data(G_OBJECT(w), "user_data"); | 1301 name = g_object_get_data(G_OBJECT(w), "user_data"); |
1302 b = gaim_find_buddy(account, name); | 1302 b = gaim_find_buddy(account, name); |
1303 | 1303 |
1304 if (b != NULL) | 1304 if (b != NULL) |
1305 show_confirm_del(b); | 1305 gaim_gtkdialogs_remove_buddy(b); |
1306 else if (account != NULL && gaim_account_is_connected(account)) | 1306 else if (account != NULL && gaim_account_is_connected(account)) |
1307 gaim_blist_request_add_buddy(account, name, NULL, NULL); | 1307 gaim_blist_request_add_buddy(account, name, NULL, NULL); |
1308 | 1308 |
1309 gtk_widget_grab_focus(GAIM_GTK_CONVERSATION(conv)->entry); | 1309 gtk_widget_grab_focus(GAIM_GTK_CONVERSATION(conv)->entry); |
1310 } | 1310 } |