comparison: pidgin/gtkconv.c
pidgin/gtkconv.c
- changeset 21081
- 09317aaf5ef9
- parent 21076
- bb293a21ce84
- child 21084
- 6afa6be9d5c7
equal
deleted
inserted
replaced
| 21080:5e7866d800e8 | 21081:09317aaf5ef9 |
|---|---|
| 8826 { | 8826 { |
| 8827 PidginWindow *win; | 8827 PidginWindow *win; |
| 8828 GtkPositionType pos; | 8828 GtkPositionType pos; |
| 8829 GtkWidget *testidea; | 8829 GtkWidget *testidea; |
| 8830 GtkWidget *menubar; | 8830 GtkWidget *menubar; |
| 8831 #if GTK_CHECK_VERSION(2,6,0) | |
| 8832 GdkModifierType state; | |
| 8833 #endif | |
| 8831 | 8834 |
| 8832 win = g_malloc0(sizeof(PidginWindow)); | 8835 win = g_malloc0(sizeof(PidginWindow)); |
| 8833 | 8836 |
| 8834 window_list = g_list_append(window_list, win); | 8837 window_list = g_list_append(window_list, win); |
| 8835 | 8838 |
| 8836 /* Create the window. */ | 8839 /* Create the window. */ |
| 8837 win->window = pidgin_create_window(NULL, 0, "conversation", TRUE); | 8840 win->window = pidgin_create_window(NULL, 0, "conversation", TRUE); |
| 8841 #if GTK_CHECK_VERSION(2,6,0) | |
| 8842 if (!gtk_get_current_event_state(&state)) | |
| 8843 gtk_window_set_focus_on_map(GTK_WINDOW(win->window), FALSE); | |
| 8844 #endif | |
| 8838 pidgin_conv_restore_position(win); | 8845 pidgin_conv_restore_position(win); |
| 8839 | 8846 |
| 8840 if (available_list == NULL) { | 8847 if (available_list == NULL) { |
| 8841 create_icon_lists(win->window); | 8848 create_icon_lists(win->window); |
| 8842 } | 8849 } |
| 8905 | 8912 |
| 8906 #ifdef _WIN32 | 8913 #ifdef _WIN32 |
| 8907 g_signal_connect(G_OBJECT(win->window), "show", | 8914 g_signal_connect(G_OBJECT(win->window), "show", |
| 8908 G_CALLBACK(winpidgin_ensure_onscreen), win->window); | 8915 G_CALLBACK(winpidgin_ensure_onscreen), win->window); |
| 8909 | 8916 |
| 8910 if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/win32/minimize_new_convs")) | 8917 if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/win32/minimize_new_convs") |
| 8918 && !gtk_get_current_event_state(&state)) | |
| 8911 gtk_window_iconify(GTK_WINDOW(win->window)); | 8919 gtk_window_iconify(GTK_WINDOW(win->window)); |
| 8912 #endif | 8920 #endif |
| 8913 | 8921 |
| 8914 return win; | 8922 return win; |
| 8915 } | 8923 } |
