Merge branch 'feature/upstream' into develop

1 files changed, 0 insertions, 27 deletions

diff --git a/src/config/ConfigurationInterfaces.vala b/src/config/ConfigurationInterfaces.vala
index 8af5a73..a8d8192 100644
--- a/src/config/ConfigurationInterfaces.vala
+++ b/src/config/ConfigurationInterfaces.vala
@@ -90,7 +90,6 @@ public enum ConfigurableProperty {
     SLIDESHOW_SHOW_TITLE,
     USE_24_HOUR_TIME,
     USE_LOWERCASE_FILENAMES,
-    VIDEO_INTERPRETER_STATE_COOKIE,
     
     
     NUM_PROPERTIES;
@@ -307,9 +306,6 @@ public enum ConfigurableProperty {
             case USE_LOWERCASE_FILENAMES:
                 return "USE_LOWERCASE_FILENAMES";
                 
-            case VIDEO_INTERPRETER_STATE_COOKIE:
-                return "VIDEO_INTERPRETER_STATE_COOKIE";
-
             default:
                 error("unknown ConfigurableProperty enumeration value");
         }
@@ -1804,29 +1800,6 @@ public abstract class ConfigurationFacade : Object {
     }
 
     //
-    // video interpreter state cookie
-    //
-    public virtual int get_video_interpreter_state_cookie() {
-        try {
-            return get_engine().get_int_property(
-                ConfigurableProperty.VIDEO_INTERPRETER_STATE_COOKIE);
-        } catch (ConfigurationError err) {
-            on_configuration_error(err);
-
-            return -1;
-        }
-    }
-
-    public virtual void set_video_interpreter_state_cookie(int state_cookie) {
-        try {
-            get_engine().set_int_property(ConfigurableProperty.VIDEO_INTERPRETER_STATE_COOKIE,
-                state_cookie);
-        } catch (ConfigurationError err) {
-            on_configuration_error(err);
-        }
-    }
-
-    //
     // allow plugins to get & set arbitrary properties
     //
     public virtual bool get_plugin_bool(string domain, string id, string key, bool def) {