Mercurial > pidgin
comparison pidgin/gtkconv.c @ 22686:101d16be1521
Stop restoring conversation window locations on !Windows, I wasn't aware this
was still happening or I would have killed it a while ago. I left in restoring
the conversation window size (even though I think we shouldn't do that either)
because I was told we used to do that even back before we started remembering
the window location. Fixes #4832.
author | Etan Reisner <pidgin@unreliablesource.net> |
---|---|
date | Fri, 18 Apr 2008 03:41:12 +0000 |
parents | 5624eec4da24 |
children | 01b5c9ed85e7 |
comparison
equal
deleted
inserted
replaced
22685:72090ce17864 | 22686:101d16be1521 |
---|---|
8573 if (new_window) { | 8573 if (new_window) { |
8574 gint win_width, win_height; | 8574 gint win_width, win_height; |
8575 | 8575 |
8576 gtk_window_get_size(GTK_WINDOW(dest_win->window), | 8576 gtk_window_get_size(GTK_WINDOW(dest_win->window), |
8577 &win_width, &win_height); | 8577 &win_width, &win_height); |
8578 #ifdef WIN32 /* only override window manager placement on Windows */ | 8578 #ifdef _WIN32 /* only override window manager placement on Windows */ |
8579 gtk_window_move(GTK_WINDOW(dest_win->window), | 8579 gtk_window_move(GTK_WINDOW(dest_win->window), |
8580 e->x_root - (win_width / 2), | 8580 e->x_root - (win_width / 2), |
8581 e->y_root - (win_height / 2)); | 8581 e->y_root - (win_height / 2)); |
8582 #endif | 8582 #endif |
8583 | 8583 |
9009 conv_y = gdk_screen_height() - 100; | 9009 conv_y = gdk_screen_height() - 100; |
9010 else if (conv_y + conv_height < 0) | 9010 else if (conv_y + conv_height < 0) |
9011 conv_y = 100; | 9011 conv_y = 100; |
9012 | 9012 |
9013 /* ...and move it back. */ | 9013 /* ...and move it back. */ |
9014 #ifdef _WIN32 /* only override window manager placement on Windows */ | |
9014 gtk_window_move(GTK_WINDOW(win->window), conv_x, conv_y); | 9015 gtk_window_move(GTK_WINDOW(win->window), conv_x, conv_y); |
9016 #endif | |
9015 gtk_window_resize(GTK_WINDOW(win->window), conv_width, conv_height); | 9017 gtk_window_resize(GTK_WINDOW(win->window), conv_width, conv_height); |
9016 } | 9018 } |
9017 } | 9019 } |
9018 | 9020 |
9019 static void | 9021 static void |
9044 win->window = pidgin_create_window(NULL, 0, "conversation", TRUE); | 9046 win->window = pidgin_create_window(NULL, 0, "conversation", TRUE); |
9045 #if GTK_CHECK_VERSION(2,6,0) | 9047 #if GTK_CHECK_VERSION(2,6,0) |
9046 if (!gtk_get_current_event_state(&state)) | 9048 if (!gtk_get_current_event_state(&state)) |
9047 gtk_window_set_focus_on_map(GTK_WINDOW(win->window), FALSE); | 9049 gtk_window_set_focus_on_map(GTK_WINDOW(win->window), FALSE); |
9048 #endif | 9050 #endif |
9051 /* Etan: I really think this entire function call should happen only | |
9052 * when we are on Windows but I was informed that back before we used | |
9053 * to save the window position we stored the window size, so I'm | |
9054 * leaving it for now. */ | |
9055 #if TRUE || defined(_WIN32) | |
9049 pidgin_conv_restore_position(win); | 9056 pidgin_conv_restore_position(win); |
9057 #endif | |
9050 | 9058 |
9051 if (available_list == NULL) { | 9059 if (available_list == NULL) { |
9052 create_icon_lists(win->window); | 9060 create_icon_lists(win->window); |
9053 } | 9061 } |
9054 | 9062 |