[evolution/gnome-3-4] Revert "Bug #677993 - Remember screen used in previous session"
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/gnome-3-4] Revert "Bug #677993 - Remember screen used in previous session"
- Date: Wed, 22 Aug 2012 11:22:23 +0000 (UTC)
commit cd025711aa515d3588e8448959de7fd7f246eb6d
Author: Matthew Barnes <mbarnes redhat com>
Date: Wed Aug 22 07:21:00 2012 -0400
Revert "Bug #677993 - Remember screen used in previous session"
This reverts commit bfcf55ab7de47fb2fb4219878c15a8104d7ea5a3.
gdk_screen_get_monitor_workarea() was introduced in GDK 3.4, but
Evolution 3.4 only requires GDK 3.2.
e-util/e-util.c | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/e-util/e-util.c b/e-util/e-util.c
index 09f023c..109ee1b 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -353,11 +353,6 @@ e_restore_window (GtkWindow *window,
if (g_settings_get_boolean (settings, "maximized")) {
GdkScreen *screen;
- GdkRectangle monitor_area;
- gint x, y, monitor;
-
- x = g_settings_get_int (settings, "x");
- y = g_settings_get_int (settings, "y");
screen = gtk_window_get_screen (window);
gtk_window_get_size (window, &width, &height);
@@ -365,13 +360,10 @@ e_restore_window (GtkWindow *window,
data->premax_width = width;
data->premax_height = height;
- monitor = gdk_screen_get_monitor_at_point (screen, x, y);
- if (monitor < 0 || monitor >= gdk_screen_get_n_monitors (screen))
- monitor = 0;
-
- gdk_screen_get_monitor_workarea (screen, monitor, &monitor_area);
+ width = gdk_screen_get_width (screen);
+ height = gdk_screen_get_height (screen);
- gtk_window_resize (window, monitor_area.width, monitor_area.height);
+ gtk_window_resize (window, width, height);
gtk_window_maximize (window);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]