Mercurial > pidgin
comparison src/gtkconv.c @ 10824:8d52201620d0
[gaim-migrate @ 12488]
This changes gaim_conv_window_remove_conversation to take a GaimConversion
pointer to remore instead of an index. Every place just called a function
to get the index before calling it anyway.
This may or may not help the contact aware convo bugs, I didn't test it
yet, but I believe it to be a step in the right direction.
committer: Tailor Script <tailor@pidgin.im>
author | Tim Ringenbach <marv@pidgin.im> |
---|---|
date | Fri, 15 Apr 2005 00:28:54 +0000 |
parents | d087e928ffd1 |
children | 53e7884c549a |
comparison
equal
deleted
inserted
replaced
10823:c1bb12625b3f | 10824:8d52201620d0 |
---|---|
2248 gtkconv = GAIM_GTK_CONVERSATION(conv); | 2248 gtkconv = GAIM_GTK_CONVERSATION(conv); |
2249 | 2249 |
2250 dest_win = gaim_conv_window_new(); | 2250 dest_win = gaim_conv_window_new(); |
2251 | 2251 |
2252 gaim_conv_window_add_conversation(dest_win, | 2252 gaim_conv_window_add_conversation(dest_win, |
2253 gaim_conv_window_remove_conversation(win, | 2253 gaim_conv_window_remove_conversation(win, |
2254 gaim_conversation_get_index(conv))); | 2254 conv)); |
2255 | 2255 |
2256 dest_gtkwin = GAIM_GTK_WINDOW(dest_win); | 2256 dest_gtkwin = GAIM_GTK_WINDOW(dest_win); |
2257 | 2257 |
2258 gtk_window_get_size(GTK_WINDOW(dest_gtkwin->window), | 2258 gtk_window_get_size(GTK_WINDOW(dest_gtkwin->window), |
2259 &win_width, &win_height); | 2259 &win_width, &win_height); |
2279 gaim_conversation_get_index(conv), dest_page_num); | 2279 gaim_conversation_get_index(conv), dest_page_num); |
2280 } | 2280 } |
2281 else { | 2281 else { |
2282 size_t pos; | 2282 size_t pos; |
2283 | 2283 |
2284 gaim_conv_window_remove_conversation(win, | 2284 gaim_conv_window_remove_conversation(win, conv); |
2285 gaim_conversation_get_index(conv)); | |
2286 | 2285 |
2287 pos = gaim_conv_window_add_conversation(dest_win, conv); | 2286 pos = gaim_conv_window_add_conversation(dest_win, conv); |
2288 | 2287 |
2289 if (pos != dest_page_num) | 2288 if (pos != dest_page_num) |
2290 gaim_conv_window_move_conversation(dest_win, pos, dest_page_num); | 2289 gaim_conv_window_move_conversation(dest_win, pos, dest_page_num); |
4117 */ | 4116 */ |
4118 c = gaim_find_conversation_with_account(GAIM_CONV_IM, b->name, b->account); | 4117 c = gaim_find_conversation_with_account(GAIM_CONV_IM, b->name, b->account); |
4119 if (c != NULL) { | 4118 if (c != NULL) { |
4120 GaimConvWindow *oldwin; | 4119 GaimConvWindow *oldwin; |
4121 oldwin = gaim_conversation_get_window(c); | 4120 oldwin = gaim_conversation_get_window(c); |
4122 index = gaim_conversation_get_index(c); | |
4123 if (oldwin != win) { | 4121 if (oldwin != win) { |
4124 gaim_conv_window_remove_conversation(oldwin, index); | 4122 gaim_conv_window_remove_conversation(oldwin, c); |
4125 gaim_conv_window_add_conversation(win, c); | 4123 gaim_conv_window_add_conversation(win, c); |
4126 } | 4124 } |
4127 } else { | 4125 } else { |
4128 c = gaim_conversation_new(GAIM_CONV_IM, b->account, b->name); | 4126 c = gaim_conversation_new(GAIM_CONV_IM, b->account, b->name); |
4129 gaim_conv_window_add_conversation(win, c); | 4127 gaim_conv_window_add_conversation(win, c); |