Update upstream source from tag 'upstream/0.32.4'

Update to upstream version '0.32.4'
with Debian dir 51798a6af1c9b7e48f979c020d72f3c5ddd964a6

2 files changed, 27 insertions, 0 deletions

diff --git a/src/config/ConfigurationInterfaces.vala b/src/config/ConfigurationInterfaces.vala
index 12c7da1..ffd0d31 100644
--- a/src/config/ConfigurationInterfaces.vala
+++ b/src/config/ConfigurationInterfaces.vala
@@ -89,6 +89,7 @@ public enum ConfigurableProperty {
     SLIDESHOW_TRANSITION_DELAY,
     SLIDESHOW_TRANSITION_EFFECT_ID,
     SLIDESHOW_SHOW_TITLE,
+    SLIDESHOW_SHUFFLE,
     USE_24_HOUR_TIME,
     USE_LOWERCASE_FILENAMES,
     
@@ -304,6 +305,9 @@ public enum ConfigurableProperty {
             case SLIDESHOW_SHOW_TITLE:
                 return "SLIDESHOW_SHOW_TITLE";
                 
+            case SLIDESHOW_SHUFFLE:
+                return "SLIDESHOW_SHUFFLE";
+                
             case USE_24_HOUR_TIME:
                 return "USE_24_HOUR_TIME";
                 
@@ -1782,6 +1786,27 @@ public abstract class ConfigurationFacade : Object {
     }
     
     //
+    // Slideshow shuffle
+    //
+    public virtual bool get_slideshow_shuffle() {
+        try {
+            return get_engine().get_bool_property(ConfigurableProperty.SLIDESHOW_SHUFFLE);
+        } catch (ConfigurationError err) {
+            on_configuration_error(err);
+            
+            return false;
+        }
+    }
+    
+    public virtual void set_slideshow_shuffle(bool shuffle) {
+        try {
+            get_engine().set_bool_property(ConfigurableProperty.SLIDESHOW_SHUFFLE, shuffle);
+        } catch (ConfigurationError err) {
+            on_configuration_error(err);
+        }
+    }
+    
+    //
     // use 24 hour time
     //
     public virtual bool get_use_24_hour_time() {
diff --git a/src/config/GSettingsEngine.vala b/src/config/GSettingsEngine.vala
index d4d95c6..8bf53ec 100644
--- a/src/config/GSettingsEngine.vala
+++ b/src/config/GSettingsEngine.vala
@@ -101,6 +101,7 @@ public class GSettingsConfigurationEngine : ConfigurationEngine, GLib.Object {
         schema_names[ConfigurableProperty.SLIDESHOW_TRANSITION_DELAY] = SLIDESHOW_PREFS_SCHEMA_NAME;
         schema_names[ConfigurableProperty.SLIDESHOW_TRANSITION_EFFECT_ID] = SLIDESHOW_PREFS_SCHEMA_NAME;
         schema_names[ConfigurableProperty.SLIDESHOW_SHOW_TITLE] = SLIDESHOW_PREFS_SCHEMA_NAME;
+        schema_names[ConfigurableProperty.SLIDESHOW_SHUFFLE] = SLIDESHOW_PREFS_SCHEMA_NAME;
         schema_names[ConfigurableProperty.USE_24_HOUR_TIME] = UI_PREFS_SCHEMA_NAME;
         schema_names[ConfigurableProperty.USE_LOWERCASE_FILENAMES] = FILES_PREFS_SCHEMA_NAME;
         
@@ -175,6 +176,7 @@ public class GSettingsConfigurationEngine : ConfigurationEngine, GLib.Object {
         key_names[ConfigurableProperty.SLIDESHOW_TRANSITION_DELAY] = "transition-delay";
         key_names[ConfigurableProperty.SLIDESHOW_TRANSITION_EFFECT_ID] = "transition-effect-id";
         key_names[ConfigurableProperty.SLIDESHOW_SHOW_TITLE] = "show-title";
+        key_names[ConfigurableProperty.SLIDESHOW_SHUFFLE] = "shuffle";
         key_names[ConfigurableProperty.USE_24_HOUR_TIME] = "use-24-hour-time";
         key_names[ConfigurableProperty.USE_LOWERCASE_FILENAMES] = "use-lowercase-filenames";
     }