comparison src/gtkconv.c @ 12088:980c877bd238

[gaim-migrate @ 14385] sf patch #1356873, from Will Thompson (resiak) "gaim_find_buddys_group is a stupid name. gaim_buddy_get_group is not a stupid name." Way to think outside the box! committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Mon, 14 Nov 2005 22:41:52 +0000
parents 9b886b6e3002
children 3960def0f75b
comparison
equal deleted inserted replaced
12087:f30a6ad84aff 12088:980c877bd238
6517 6517
6518 void 6518 void
6519 gaim_gtk_conv_window_raise(GaimGtkWindow *win) 6519 gaim_gtk_conv_window_raise(GaimGtkWindow *win)
6520 { 6520 {
6521 gtk_window_present(GTK_WINDOW(win->window)); 6521 gtk_window_present(GTK_WINDOW(win->window));
6522 /*
6523 gtk_widget_show(win->window);
6524 gtk_window_deiconify(GTK_WINDOW(win->window));
6525 gdk_window_raise(win->window->window);
6526 */
6527 } 6522 }
6528 6523
6529 void 6524 void
6530 gaim_gtk_conv_window_switch_gtkconv(GaimGtkWindow *win, GaimGtkConversation *gtkconv) 6525 gaim_gtk_conv_window_switch_gtkconv(GaimGtkWindow *win, GaimGtkConversation *gtkconv)
6531 { 6526 {
6926 6921
6927 buddy = gaim_find_buddy(gaim_conversation_get_account(conv->active_conv), 6922 buddy = gaim_find_buddy(gaim_conversation_get_account(conv->active_conv),
6928 gaim_conversation_get_name(conv->active_conv)); 6923 gaim_conversation_get_name(conv->active_conv));
6929 6924
6930 if (buddy != NULL) 6925 if (buddy != NULL)
6931 group = gaim_find_buddys_group(buddy); 6926 group = gaim_buddy_get_group(buddy);
6932 6927
6933 } else if (gaim_conversation_get_type(conv->active_conv) == GAIM_CONV_TYPE_CHAT) { 6928 } else if (gaim_conversation_get_type(conv->active_conv) == GAIM_CONV_TYPE_CHAT) {
6934 GaimChat *chat; 6929 GaimChat *chat;
6935 6930
6936 chat = gaim_blist_find_chat(gaim_conversation_get_account(conv->active_conv), 6931 chat = gaim_blist_find_chat(gaim_conversation_get_account(conv->active_conv),