[Xfce4-commits] r30431 - in xfce4-settings/branches/xfce_4_6: . xfce4-settings-helper

[Nick Schermer]

Author: nick
Date: 2009-08-05 08:38:34 +0000 (Wed, 05 Aug 2009)
New Revision: 30431

Modified:
   xfce4-settings/branches/xfce_4_6/NEWS
   xfce4-settings/branches/xfce_4_6/xfce4-settings-helper/displays.c
Log:
Always restore the default displa scheme on startup (bug #5311).


Modified: xfce4-settings/branches/xfce_4_6/NEWS
===================================================================
--- xfce4-settings/branches/xfce_4_6/NEWS	2009-08-05 08:36:50 UTC (rev 30430)
+++ xfce4-settings/branches/xfce_4_6/NEWS	2009-08-05 08:38:34 UTC (rev 30431)
@@ -4,6 +4,7 @@
 - Fix type in xfconf property name (debian bug #527238).
 - Fix mnemonic widgets in accessibility dialog (bug #5550).
 - Fix translation macros in settings helper (bug #5554).
+- Always restore the default displa scheme on startup (bug #5311).
 
 4.6.1
 =====

Modified: xfce4-settings/branches/xfce_4_6/xfce4-settings-helper/displays.c
===================================================================
--- xfce4-settings/branches/xfce_4_6/xfce4-settings-helper/displays.c	2009-08-05 08:36:50 UTC (rev 30430)
+++ xfce4-settings/branches/xfce_4_6/xfce4-settings-helper/displays.c	2009-08-05 08:38:34 UTC (rev 30431)
@@ -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 @@
             /* 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
         {