Mercurial > pidgin
diff 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 |
line wrap: on
line diff
--- a/src/gtkdialogs.c Fri Sep 30 05:07:03 2005 +0000 +++ b/src/gtkdialogs.c Sun Oct 02 00:32:49 2005 +0000 @@ -511,8 +511,7 @@ gaim_gtkdialogs_im_with_user(GaimAccount *account, const char *username) { GaimConversation *conv; - GaimConvWindow *win; - GaimGtkWindow *gtkwin; + GaimGtkWindow *win; g_return_if_fail(account != NULL); g_return_if_fail(username != NULL); @@ -522,11 +521,10 @@ if (conv == NULL) conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, username); - win = gaim_conversation_get_window(conv); - gtkwin = GAIM_GTK_WINDOW(win); + win = GAIM_GTK_CONVERSATION(conv)->win; - gtk_window_present(GTK_WINDOW(gtkwin->window)); - gaim_conv_window_switch_conversation(win, conv); + gtk_window_present(GTK_WINDOW(win->window)); + gaim_gtk_conv_window_switch_gtkconv(win, GAIM_GTK_CONVERSATION(conv)); } static gboolean