summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRay Strode <rstrode@fedoraproject.org>2009-07-24 17:55:59 +0000
committerRay Strode <rstrode@fedoraproject.org>2009-07-24 17:55:59 +0000
commitb3ca3076378707984cb62d083bc5e8e981adcbdb (patch)
treeb554a29c1b20f24b33faa634d1f77d7d8ad5ce6c
parent628417d650279c6ba1cdfce949578186e91f1562 (diff)
downloadgnome-panel-b3ca3076378707984cb62d083bc5e8e981adcbdb.tar.gz
gnome-panel-b3ca3076378707984cb62d083bc5e8e981adcbdb.tar.xz
gnome-panel-b3ca3076378707984cb62d083bc5e8e981adcbdb.zip
- Make my panels show up again on login (gnome bug 589632)gnome-panel-2_27_4-3_fc12gnome-panel-2_27_4-3_fc11
-rw-r--r--gnome-panel-2.27.4-fix-monitor.patch17
-rw-r--r--gnome-panel.spec9
2 files changed, 25 insertions, 1 deletions
diff --git a/gnome-panel-2.27.4-fix-monitor.patch b/gnome-panel-2.27.4-fix-monitor.patch
new file mode 100644
index 0000000..25c176d
--- /dev/null
+++ b/gnome-panel-2.27.4-fix-monitor.patch
@@ -0,0 +1,17 @@
+diff -up gnome-panel-2.27.4/gnome-panel/panel-toplevel.c.fix-monitor gnome-panel-2.27.4/gnome-panel/panel-toplevel.c
+--- gnome-panel-2.27.4/gnome-panel/panel-toplevel.c.fix-monitor 2009-07-24 13:32:56.736614448 -0400
++++ gnome-panel-2.27.4/gnome-panel/panel-toplevel.c 2009-07-24 13:43:25.944864163 -0400
+@@ -2518,6 +2518,13 @@ panel_toplevel_update_geometry (PanelTop
+ GtkRequisition *requisition)
+ {
+ toplevel->priv->updated_geometry_initial = TRUE;
++
++ /* If the panel got assigned to a monitor that no longer exists, then
++ * move it to one that does.
++ */
++ if (toplevel->priv->monitor >= panel_multiscreen_monitors (gtk_window_get_screen (GTK_WINDOW (toplevel)))) {
++ panel_toplevel_set_monitor (toplevel, 0);
++ }
+ panel_toplevel_update_size (toplevel, requisition);
+ panel_toplevel_update_position (toplevel);
+
diff --git a/gnome-panel.spec b/gnome-panel.spec
index a903c75..8e3bf00 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.27.4
-Release: 2%{?dist}
+Release: 3%{?dist}
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-panel/2.27/%{name}-%{version}.tar.bz2
@@ -122,6 +122,9 @@ Patch42: polkit1.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=322932
Patch45: panel-icons.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=589632
+Patch46:gnome-panel-2.27.4-fix-monitor.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -171,6 +174,7 @@ Panel Applets using the libpanel-applet library.
%patch38 -p1 -b .clock-network
%patch42 -p1 -b .polkit1
%patch45 -p1 -b .panel-icons
+%patch46 -p1 -b .fix-monitor
. %{SOURCE6}
@@ -367,6 +371,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Fri Jul 24 2009 Ray Strode <rstrode@redhat.com> 2.27.4-3
+- Make my panels show up again on login (gnome bug 589632)
+
* Wed Jul 22 2009 Matthias Clasen <mclasen@redhat.com> - 2.27.4-2
- Make category icons follow the menu-images setting