comparison src/gtkdialogs.c @ 11581:9b3833da6840

[gaim-migrate @ 13851] goodbye GaimConvWindow. Still some problems with this patch: - Scarey warnings console with gaim -d when closing tab - I tried to seperate gtkconv and gtkconvwin, but failed, as a result it has its own header, but the code is in the same file, which is rather weird. Also some code got moved around for no good reason. Feel free to move it back or reorganize it. - I broke the gesters plugin, and just disabled it. Hopefully someone with more time will fix it, it shouldn't take long, but I didn't feel like bothering. - This list is incomplete. committer: Tailor Script <tailor@pidgin.im>
author Tim Ringenbach <marv@pidgin.im>
date Sun, 02 Oct 2005 00:32:49 +0000
parents 448bc3b8eb63
children 6135c29a514f
comparison
equal deleted inserted replaced
11580:24169af08585 11581:9b3833da6840
509 509
510 void 510 void
511 gaim_gtkdialogs_im_with_user(GaimAccount *account, const char *username) 511 gaim_gtkdialogs_im_with_user(GaimAccount *account, const char *username)
512 { 512 {
513 GaimConversation *conv; 513 GaimConversation *conv;
514 GaimConvWindow *win; 514 GaimGtkWindow *win;
515 GaimGtkWindow *gtkwin;
516 515
517 g_return_if_fail(account != NULL); 516 g_return_if_fail(account != NULL);
518 g_return_if_fail(username != NULL); 517 g_return_if_fail(username != NULL);
519 518
520 conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, username, account); 519 conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, username, account);
521 520
522 if (conv == NULL) 521 if (conv == NULL)
523 conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, username); 522 conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, username);
524 523
525 win = gaim_conversation_get_window(conv); 524 win = GAIM_GTK_CONVERSATION(conv)->win;
526 gtkwin = GAIM_GTK_WINDOW(win); 525
527 526 gtk_window_present(GTK_WINDOW(win->window));
528 gtk_window_present(GTK_WINDOW(gtkwin->window)); 527 gaim_gtk_conv_window_switch_gtkconv(win, GAIM_GTK_CONVERSATION(conv));
529 gaim_conv_window_switch_conversation(win, conv);
530 } 528 }
531 529
532 static gboolean 530 static gboolean
533 gaim_gtkdialogs_ee(const char *ee) 531 gaim_gtkdialogs_ee(const char *ee)
534 { 532 {