Mercurial > pidgin.yaz
changeset 22669: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 | 72090ce17864 |
| children | 4d968d8be5d2 e64f06237ff9 |
| files | pidgin/gtkconv.c |
| diffstat | 1 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Fri Apr 18 03:28:07 2008 +0000 +++ b/pidgin/gtkconv.c Fri Apr 18 03:41:12 2008 +0000 @@ -8575,7 +8575,7 @@ gtk_window_get_size(GTK_WINDOW(dest_win->window), &win_width, &win_height); -#ifdef WIN32 /* only override window manager placement on Windows */ +#ifdef _WIN32 /* only override window manager placement on Windows */ gtk_window_move(GTK_WINDOW(dest_win->window), e->x_root - (win_width / 2), e->y_root - (win_height / 2)); @@ -9011,7 +9011,9 @@ conv_y = 100; /* ...and move it back. */ +#ifdef _WIN32 /* only override window manager placement on Windows */ gtk_window_move(GTK_WINDOW(win->window), conv_x, conv_y); +#endif gtk_window_resize(GTK_WINDOW(win->window), conv_width, conv_height); } } @@ -9046,7 +9048,13 @@ if (!gtk_get_current_event_state(&state)) gtk_window_set_focus_on_map(GTK_WINDOW(win->window), FALSE); #endif + /* Etan: I really think this entire function call should happen only + * when we are on Windows but I was informed that back before we used + * to save the window position we stored the window size, so I'm + * leaving it for now. */ +#if TRUE || defined(_WIN32) pidgin_conv_restore_position(win); +#endif if (available_list == NULL) { create_icon_lists(win->window);