diff --git a/gnome-panel.spec b/gnome-panel.spec index eca4336..1eec069 100644 --- a/gnome-panel.spec +++ b/gnome-panel.spec @@ -22,7 +22,7 @@ Summary: GNOME panel Name: gnome-panel Version: 2.28.0 -Release: 14%{?dist} +Release: 15%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-panel/2.28/%{name}-%{version}.tar.bz2 @@ -127,6 +127,9 @@ Patch44: icon-order.patch # https://bugzilla.gnome.org/show_bug.cgi?id=583273 Patch45: icon-padding.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=341441 +Patch46: resolution-change.patch + Conflicts: gnome-power-manager < 2.15.3 %description @@ -178,6 +181,7 @@ Panel Applets using the libpanel-applet library. %patch43 -p1 -b .panel-padding %patch44 -p1 -b .icon-order %patch45 -p1 -b .icon-padding +%patch46 -p1 -b .resolution-change . %{SOURCE6} @@ -385,6 +389,10 @@ fi %{_datadir}/gtk-doc/html/* %changelog +* Mon Nov 9 2009 Matthias Clasen 2.28.0-15 +- Improve the behaviour of the panel when screen resolution + changes (gnome #341441) + * Fri Nov 6 2009 Matthias Clasen 2.28.0-14 - Revert the last change, it didn't have the desired effect diff --git a/resolution-change.patch b/resolution-change.patch new file mode 100644 index 0000000..9447804 --- /dev/null +++ b/resolution-change.patch @@ -0,0 +1,21 @@ +diff -up gnome-panel-2.28.0/gnome-panel/panel-widget.c.resolution-change gnome-panel-2.28.0/gnome-panel/panel-widget.c +--- gnome-panel-2.28.0/gnome-panel/panel-widget.c.resolution-change 2009-11-09 22:48:41.992597171 -0500 ++++ gnome-panel-2.28.0/gnome-panel/panel-widget.c 2009-11-09 22:37:57.240584835 -0500 +@@ -1186,7 +1186,7 @@ panel_widget_right_stick(PanelWidget *pa + + ad = list->data; + do { +- i = ad->constrained; ++ i = ad->pos; + ad->pos = ad->constrained = pos--; + ad->cells = 1; + prev = list; +@@ -1194,7 +1194,7 @@ panel_widget_right_stick(PanelWidget *pa + if(!list) + break; + ad = list->data; +- } while(ad->constrained + ad->cells == i); ++ } while(ad->pos + ad->cells == i); + + for (list = prev; list; list = list->next) + emit_applet_moved (panel, list->data);