comparison: pidgin/gtkconv.c
pidgin/gtkconv.c
- changeset 22466
- 1ec91c183c16
- parent 22419
- e7d643f4de4b
- child 22557
- a009a7319294
- child 22569
- 3e356f5ec696
equal
deleted
inserted
replaced
| 22465:c841e020c3a5 | 22466:1ec91c183c16 |
|---|---|
| 2804 * End of the bunch of buddy icon functions | 2804 * End of the bunch of buddy icon functions |
| 2805 **************************************************************************/ | 2805 **************************************************************************/ |
| 2806 void | 2806 void |
| 2807 pidgin_conv_present_conversation(PurpleConversation *conv) | 2807 pidgin_conv_present_conversation(PurpleConversation *conv) |
| 2808 { | 2808 { |
| 2809 PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv); | 2809 PidginConversation *gtkconv; |
| 2810 GdkModifierType state; | 2810 GdkModifierType state; |
| 2811 | 2811 |
| 2812 if (gtkconv == NULL) { | 2812 pidgin_conv_attach_to_conversation(conv); |
| 2813 pidgin_conv_attach_to_conversation(conv); | 2813 gtkconv = PIDGIN_CONVERSATION(conv); |
| 2814 gtkconv = PIDGIN_CONVERSATION(conv); | |
| 2815 } else if (gtkconv->win == hidden_convwin) { | |
| 2816 pidgin_conv_window_remove_gtkconv(hidden_convwin, gtkconv); | |
| 2817 pidgin_conv_placement_place(gtkconv); | |
| 2818 } | |
| 2819 | 2814 |
| 2820 pidgin_conv_switch_active_conversation(conv); | 2815 pidgin_conv_switch_active_conversation(conv); |
| 2821 /* Switch the tab only if the user initiated the event by pressing | 2816 /* Switch the tab only if the user initiated the event by pressing |
| 2822 * a button or hitting a key. */ | 2817 * a button or hitting a key. */ |
| 2823 if (gtk_get_current_event_state(&state)) | 2818 if (gtk_get_current_event_state(&state)) |
