summaryrefslogtreecommitdiff
path: root/src/config
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2022-10-01 21:55:21 +0200
committerJörg Frings-Fürst <debian@jff.email>2022-10-01 21:55:21 +0200
commit0ac74d65f16aa7eb70669b07c25cb90114eb9435 (patch)
tree31cd86e358bc70e6d83955fdcc0d8e05fc32c325 /src/config
parent0b99aa7b114b6c8eb0d55742c4be2f3a73f44e39 (diff)
parentf542481df58f3222143bc260feb34b5cf537d8e0 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/config')
-rw-r--r--src/config/Config.vala2
-rw-r--r--src/config/ConfigurationInterfaces.vala27
-rw-r--r--src/config/GSettingsEngine.vala3
3 files changed, 0 insertions, 32 deletions
diff --git a/src/config/Config.vala b/src/config/Config.vala
index 5675567..0e2798a 100644
--- a/src/config/Config.vala
+++ b/src/config/Config.vala
@@ -20,8 +20,6 @@ public class Facade : ConfigurationFacade {
public const int HEIGHT_DEFAULT = 768;
public const int SIDEBAR_MIN_POSITION = 180;
public const int SIDEBAR_MAX_POSITION = 1000;
- public const int NO_VIDEO_INTERPRETER_STATE = -1;
-
private static Facade instance = null;
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) {
diff --git a/src/config/GSettingsEngine.vala b/src/config/GSettingsEngine.vala
index 53c4e3f..d35eb93 100644
--- a/src/config/GSettingsEngine.vala
+++ b/src/config/GSettingsEngine.vala
@@ -13,7 +13,6 @@ public class GSettingsConfigurationEngine : ConfigurationEngine, GLib.Object {
private const string FILES_PREFS_SCHEMA_NAME = PREFS_SCHEMA_NAME + ".files";
private const string EDITING_PREFS_SCHEMA_NAME = PREFS_SCHEMA_NAME + ".editing";
private const string EXPORT_PREFS_SCHEMA_NAME = PREFS_SCHEMA_NAME + ".export";
- private const string VIDEO_SCHEMA_NAME = ROOT_SCHEMA_NAME + ".video";
private const string PRINTING_SCHEMA_NAME = ROOT_SCHEMA_NAME + ".printing";
private const string SHARING_SCHEMA_NAME = ROOT_SCHEMA_NAME + ".sharing";
private const string IMPORTING_SCHEMA_NAME = ROOT_SCHEMA_NAME + ".dataimports";
@@ -100,7 +99,6 @@ public class GSettingsConfigurationEngine : ConfigurationEngine, GLib.Object {
schema_names[ConfigurableProperty.SLIDESHOW_SHOW_TITLE] = 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;
- schema_names[ConfigurableProperty.VIDEO_INTERPRETER_STATE_COOKIE] = VIDEO_SCHEMA_NAME;
key_names = new string[ConfigurableProperty.NUM_PROPERTIES];
@@ -174,7 +172,6 @@ public class GSettingsConfigurationEngine : ConfigurationEngine, GLib.Object {
key_names[ConfigurableProperty.SLIDESHOW_SHOW_TITLE] = "show-title";
key_names[ConfigurableProperty.USE_24_HOUR_TIME] = "use-24-hour-time";
key_names[ConfigurableProperty.USE_LOWERCASE_FILENAMES] = "use-lowercase-filenames";
- key_names[ConfigurableProperty.VIDEO_INTERPRETER_STATE_COOKIE] = "interpreter-state-cookie";
}
private Settings get_settings(string schema) {