From 5e9cf9ad9a646921f36c49e9f2a40d3b66e0a49f Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 18 Sep 2018 12:23:00 -0300 Subject: Do more fixes at Camorama's schema There was still a mismatch between Camorama's schema file and the interface used internally. Sync them. Signed-off-by: Mauro Carvalho Chehab --- data/camorama.schemas.in | 13 +++++++++++++ src/interface.h | 45 +++++++++++++++++++++++---------------------- 2 files changed, 36 insertions(+), 22 deletions(-) diff --git a/data/camorama.schemas.in b/data/camorama.schemas.in index 4453f15..a902ce2 100644 --- a/data/camorama.schemas.in +++ b/data/camorama.schemas.in @@ -111,6 +111,19 @@ + + /schemas/apps/camorama/preferences/remote_uri + /apps/camorama/preferences/remote_uri + camorama + string + your-username + + Complete URI used to store image snapshots remotely + The complete URI of the last successful access to a remote + server, including protocol, host and remote directory + + + /schemas/apps/camorama/preferences/remote_append_ts_to_file /apps/camorama/preferences/remote_append_ts_to_file diff --git a/src/interface.h b/src/interface.h index 6c89cd5..639b0a3 100644 --- a/src/interface.h +++ b/src/interface.h @@ -1,24 +1,25 @@ -#define GCONF_PARENT "/apps/camorama/preferences" +#define GCONF_PARENT "/apps/camorama" +#define GCONF_PREFS GCONF_PARENT "/preferences" #define GCONF_DEVICE GCONF_PARENT "/device" -#define GCONF_SAVE_DIR GCONF_PARENT "/save_dir" -#define GCONF_SAVE_FILE GCONF_PARENT "/save_file" -#define GCONF_FILE_TYPE GCONF_PARENT "/file_type" -#define GCONF_TIMESTAMP GCONF_PARENT "/timestamp" -#define GCONF_HOSTNAME GCONF_PARENT "/hostname" -#define GCONF_REMOTE_PROTO GCONF_PARENT "/remote_proto" -#define GCONF_REMOTE_SAVE_DIR GCONF_PARENT "/remote_save_dir" -#define GCONF_REMOTE_SAVE_FILE GCONF_PARENT "/remote_save_file" -#define GCONF_REMOTE_FILE_TYPE GCONF_PARENT "/remote_file_type" -#define GCONF_REMOTE_TIMESTAMP GCONF_PARENT "/remote_timestamp" -#define GCONF_LOCAL_CAPTURE GCONF_PARENT "/local_capture" -#define GCONF_REMOTE_CAPTURE GCONF_PARENT "/remote_capture" -#define GCONF_LOCAL_APPEND_TS GCONF_PARENT "/append_ts_to_file" -#define GCONF_REMOTE_APPEND_TS GCONF_PARENT "/remote_append_ts_to_file" -#define GCONF_TIMESTAMP_STRING GCONF_PARENT "/timestamp_string" -#define GCONF_USE_CUSTOM_STRING GCONF_PARENT "/use_custom_string" -#define GCONF_DRAWDATE GCONF_PARENT "/drawdate" -#define GCONF_AUTO_CAPTURE GCONF_PARENT "/auto_capture" -#define GCONF_AUTO_CAPTURE_INTERVAL GCONF_PARENT "/auto_capture_interval" -#define GCONF_SHOW_ADJUSTMENTS GCONF_PARENT "/show_adjustments" -#define GCONF_SHOW_EFFECTS GCONF_PARENT "/show_effects" +#define GCONF_SAVE_DIR GCONF_PREFS "/save_dir" +#define GCONF_SAVE_FILE GCONF_PREFS "/save_file" +#define GCONF_FILE_TYPE GCONF_PREFS "/file_type" +#define GCONF_TIMESTAMP GCONF_PREFS "/timestamp" +#define GCONF_HOSTNAME GCONF_PREFS "/hostname" +#define GCONF_REMOTE_PROTO GCONF_PREFS "/remote_proto" +#define GCONF_REMOTE_SAVE_DIR GCONF_PREFS "/remote_save_dir" +#define GCONF_REMOTE_SAVE_FILE GCONF_PREFS "/remote_save_file" +#define GCONF_REMOTE_FILE_TYPE GCONF_PREFS "/remote_file_type" +#define GCONF_REMOTE_TIMESTAMP GCONF_PREFS "/remote_timestamp" +#define GCONF_LOCAL_CAPTURE GCONF_PREFS "/local_capture" +#define GCONF_REMOTE_CAPTURE GCONF_PREFS "/remote_capture" +#define GCONF_LOCAL_APPEND_TS GCONF_PREFS "/append_ts_to_file" +#define GCONF_REMOTE_APPEND_TS GCONF_PREFS "/remote_append_ts_to_file" +#define GCONF_TIMESTAMP_STRING GCONF_PREFS "/timestamp_string" +#define GCONF_USE_CUSTOM_STRING GCONF_PREFS "/use_custom_string" +#define GCONF_DRAWDATE GCONF_PREFS "/drawdate" +#define GCONF_AUTO_CAPTURE GCONF_PREFS "/auto_capture" +#define GCONF_AUTO_CAPTURE_INTERVAL GCONF_PREFS "/auto_capture_interval" +#define GCONF_SHOW_ADJUSTMENTS GCONF_PREFS "/show_adjustments" +#define GCONF_SHOW_EFFECTS GCONF_PREFS "/show_effects" -- cgit v1.2.1