rpms/evolution
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add patch for Red Hat bug #831128 (opens on wrong monitor)

Browse source
This commit is contained in:
Milan Crha 2012-06-26 17:01:23 +02:00
commit 0f28833785
2 changed files with 41 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

33
evolution-3.4.3-remember-monitor.patch Normal file
View file

@ -0,0 +1,33 @@
diff --git a/e-util/e-util.c b/e-util/e-util.c
index f3b71c5..a579985 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -351,6 +351,11 @@ 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);
@@ -358,10 +363,13 @@ e_restore_window (GtkWindow *window,
data->premax_width = width;
data->premax_height = height;
- width = gdk_screen_get_width (screen);
- height = gdk_screen_get_height (screen);
+ monitor = gdk_screen_get_monitor_at_point (screen, x, y);
+ if (monitor < 0 || monitor >= gdk_screen_get_n_monitors (screen))
+ monitor = 0;
- gtk_window_resize (window, width, height);
+ gdk_screen_get_monitor_workarea (screen, monitor, &monitor_area);
+
+ gtk_window_resize (window, monitor_area.width, monitor_area.height);
gtk_window_maximize (window);
}
}

9
evolution.spec
View file

@ -27,7 +27,7 @@
Name: evolution
Version: 3.4.3
Release: 1%{?dist}
Release: 2%{?dist}
Group: Applications/Productivity
Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL
@ -46,6 +46,9 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch
# RH bug #589555
Patch02: evolution-2.30.1-help-contents.patch
# RH bug #831128
Patch03: evolution-3.4.3-remember-monitor.patch
## Dependencies ###
Requires(pre): GConf2
@ -202,6 +205,7 @@ This package contains the plugin to import Microsoft Personal Storage Table
%setup -q -n evolution-%{version}
%patch01 -p1 -b .ldaphack
%patch02 -p1 -b .help-contents
%patch03 -p1 -b .remember-monitor
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
@ -572,6 +576,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
* Tue Jun 26 2012 Milan Crha <mcrha@redhat.com> - 3.4.3-2
- Add patch for Red Hat bug #831128 (opens on wrong monitor)
* Mon Jun 18 2012 Milan Crha <mcrha@redhat.com> - 3.4.3-1
- Update to 3.4.3
- Bump gtkhtml3 dependency to 4.4.3