rpms/xfce4-settings/devel xfce4-settings-4.6.1-restore-display-settings.patch, NONE, 1.1 xfce4-settings.spec, 1.17, 1.18

Kevin Fenzi kevin at fedoraproject.org
Sat Sep 26 20:42:17 UTC 2009


Author: kevin

Update of /cvs/extras/rpms/xfce4-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv858

Modified Files:
	xfce4-settings.spec 
Added Files:
	xfce4-settings-4.6.1-restore-display-settings.patch 
Log Message:
Add patch for restoring display resolution on login (bug #504908)


xfce4-settings-4.6.1-restore-display-settings.patch:
 displays.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE xfce4-settings-4.6.1-restore-display-settings.patch ---
diff --git a/xfce4-settings-helper/displays.c b/xfce4-settings-helper/displays.c
index bcc713c..1e57ce5 100644
--- a/xfce4-settings-helper/displays.c
+++ b/xfce4-settings-helper/displays.c
@@ -46,6 +46,8 @@
 static void            xfce_displays_helper_class_init                     (XfceDisplaysHelperClass *klass);
 static void            xfce_displays_helper_init                           (XfceDisplaysHelper      *helper);
 static void            xfce_displays_helper_finalize                       (GObject                 *object);
+static void            xfce_displays_helper_channel_apply_legacy           (XfceDisplaysHelper      *helper,
+                                                                            const gchar             *scheme);
 static void            xfce_displays_helper_channel_property_changed       (XfconfChannel           *channel,
                                                                             const gchar             *property_name,
                                                                             const GValue            *value,
@@ -112,6 +114,9 @@ xfce_displays_helper_init (XfceDisplaysHelper *helper)
             /* monitor channel changes */
             g_signal_connect (G_OBJECT (helper->channel), "property-changed", 
                               G_CALLBACK (xfce_displays_helper_channel_property_changed), helper);
+
+            /* restore the default scheme */
+            xfce_displays_helper_channel_apply_legacy (helper, "Default");
         }
         else
         {


Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-settings/devel/xfce4-settings.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- xfce4-settings.spec	10 Sep 2009 02:18:06 -0000	1.17
+++ xfce4-settings.spec	26 Sep 2009 20:42:17 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           xfce4-settings
 Version:        4.6.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Settings Manager for Xfce
 
 Group:          User Interface/Desktops
@@ -14,6 +14,9 @@ Patch1:         xfce4-settings-4.6.1-xkl
 Patch2:         xfce4-settings-4.6.1-fix-timeout-startup.patch
 # Fix typo in xfce-keyboard-settings
 Patch3:         xfce4-settings-4.6.1-fix-keyrepeat-typo-1.patch
+# Always restore the display on login: 
+# http://git.xfce.org/xfce/xfce4-settings/commit/?h=xfce-4.6&id=837281a333935d022621841155207bd4c75f1731
+Patch4:         xfce4-settings-4.6.1-restore-display-settings.patch
 # use vendor's artwork
 Patch10:        xfce4-settings-4.6.0-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,6 +51,7 @@ This package includes the settings manag
 %endif
 %patch2 -p1 -b .timeout
 %patch3 -p1 -b .keyrepeat
+%patch4 -p1 -b .restore-display
 %patch10 -p1 -b .vendor
 
 %build
@@ -124,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Sat Sep 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-5
+- Add patch for restoring display resolution on login (bug #504908)
+
 * Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-4
 - Fix xfconf channel for keyboard repeat rate setting
 - Avoid timing out xfce4-session on startup (bugzilla.xfce.org #5040)




More information about the fedora-extras-commits mailing list