comparison: pidgin/gtkconv.c
pidgin/gtkconv.c
- changeset 24265
- 328bde72a844
- parent 24261
- af5d1cd07c4e
- child 24457
- adbbdb0532b0
- child 24542
- 974dc8d888e4
- child 26142
- 20ed0b892829
equal
deleted
inserted
replaced
| 24264:6a709fc437e3 | 24265:328bde72a844 |
|---|---|
| 5251 hide = TRUE; | 5251 hide = TRUE; |
| 5252 | 5252 |
| 5253 if (conv && PIDGIN_IS_PIDGIN_CONVERSATION(conv) && !hide) { | 5253 if (conv && PIDGIN_IS_PIDGIN_CONVERSATION(conv) && !hide) { |
| 5254 PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv); | 5254 PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv); |
| 5255 if (gtkconv->win == hidden_convwin) { | 5255 if (gtkconv->win == hidden_convwin) { |
| 5256 pidgin_conv_window_remove_gtkconv(gtkconv->win, gtkconv); | 5256 pidgin_conv_attach_to_conversation(gtkconv->active_conv); |
| 5257 pidgin_conv_placement_place(gtkconv); | |
| 5258 } | 5257 } |
| 5259 return; | 5258 return; |
| 5260 } | 5259 } |
| 5261 | 5260 |
| 5262 if (hide) { | 5261 if (hide) { |
| 7237 purple_conversation_get_account(conv)))) | 7236 purple_conversation_get_account(conv)))) |
| 7238 l = l->next; | 7237 l = l->next; |
| 7239 if (!l) | 7238 if (!l) |
| 7240 break; | 7239 break; |
| 7241 | 7240 |
| 7242 pidgin_conv_window_remove_gtkconv(hidden_convwin, gtkconv); | 7241 pidgin_conv_attach_to_conversation(conv); |
| 7243 pidgin_conv_placement_place(gtkconv); | |
| 7244 | 7242 |
| 7245 /* TODO: do we need to do anything for any other conversations that are in the same gtkconv here? | 7243 /* TODO: do we need to do anything for any other conversations that are in the same gtkconv here? |
| 7246 * I'm a little concerned that not doing so will cause the "pending" indicator in the gtkblist not to be cleared. -DAA*/ | 7244 * I'm a little concerned that not doing so will cause the "pending" indicator in the gtkblist not to be cleared. -DAA*/ |
| 7247 purple_conversation_update(conv, PURPLE_CONV_UPDATE_UNSEEN); | 7245 purple_conversation_update(conv, PURPLE_CONV_UPDATE_UNSEEN); |
| 7248 } | 7246 } |
| 7278 (when_away && !purple_status_is_available( | 7276 (when_away && !purple_status_is_available( |
| 7279 purple_account_get_active_status( | 7277 purple_account_get_active_status( |
| 7280 purple_conversation_get_account(conv))))) | 7278 purple_conversation_get_account(conv))))) |
| 7281 continue; | 7279 continue; |
| 7282 | 7280 |
| 7283 pidgin_conv_window_remove_gtkconv(hidden_convwin, gtkconv); | 7281 pidgin_conv_attach_to_conversation(conv); |
| 7284 pidgin_conv_placement_place(gtkconv); | |
| 7285 } | 7282 } |
| 7286 } | 7283 } |
| 7287 | 7284 |
| 7288 | 7285 |
| 7289 static void | 7286 static void |
