Hello community, here is the log from the commit of package slick-greeter for openSUSE:Factory checked in at 2017-11-19 11:12:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/slick-greeter (Old) and /work/SRC/openSUSE:Factory/.slick-greeter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "slick-greeter" Sun Nov 19 11:12:58 2017 rev:7 rq:542731 version:1.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/slick-greeter/slick-greeter.changes 2017-11-10 14:56:19.938389622 +0100 +++ /work/SRC/openSUSE:Factory/.slick-greeter.new/slick-greeter.changes 2017-11-19 11:13:03.407743598 +0100 @@ -1,0 +2,6 @@ +Sat Nov 18 00:00:12 UTC 2017 - [email protected] + +- Update to version 1.1.1: + * Settings: Reset config keys to default if not in config file. + +------------------------------------------------------------------- Old: ---- slick-greeter-1.1.0.tar.gz New: ---- slick-greeter-1.1.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ slick-greeter.spec ++++++ --- /var/tmp/diff_new_pack.R9lFcS/_old 2017-11-19 11:13:04.295711223 +0100 +++ /var/tmp/diff_new_pack.R9lFcS/_new 2017-11-19 11:13:04.299711077 +0100 @@ -18,7 +18,7 @@ %define _name lightdm-slick-greeter Name: slick-greeter -Version: 1.1.0 +Version: 1.1.1 Release: 0 Summary: The slick-looking login screen application License: GPL-3.0 AND CC-BY-SA-3.0 ++++++ slick-greeter-1.1.0.tar.gz -> slick-greeter-1.1.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.1.0/configure.ac new/slick-greeter-1.1.1/configure.ac --- old/slick-greeter-1.1.0/configure.ac 2017-11-03 22:30:18.000000000 +0100 +++ new/slick-greeter-1.1.1/configure.ac 2017-11-17 12:06:31.000000000 +0100 @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(slick-greeter, 1.1.0) +AC_INIT(slick-greeter, 1.1.1) AC_CONFIG_MACRO_DIR(m4) AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign subdir-objects]) AM_PROG_CC_C_O diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.1.0/debian/changelog new/slick-greeter-1.1.1/debian/changelog --- old/slick-greeter-1.1.0/debian/changelog 2017-11-03 22:30:18.000000000 +0100 +++ new/slick-greeter-1.1.1/debian/changelog 2017-11-17 12:06:31.000000000 +0100 @@ -1,3 +1,10 @@ +slick-greeter (1.1.1) sylvia; urgency=medium + + [ Björn Esser ] + * Settings: Reset config keys to default if not in config file (#79) + + -- Clement Lefebvre <[email protected]> Fri, 17 Nov 2017 11:06:00 +0000 + slick-greeter (1.1.0) sylvia; urgency=medium * l10n: Update translations diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slick-greeter-1.1.0/src/settings.vala new/slick-greeter-1.1.1/src/settings.vala --- old/slick-greeter-1.1.0/src/settings.vala 2017-11-03 22:30:18.000000000 +0100 +++ new/slick-greeter-1.1.1/src/settings.vala 2017-11-17 12:06:31.000000000 +0100 @@ -107,108 +107,122 @@ { try { var path = "/etc/lightdm/slick-greeter.conf"; + var gsettings = new Settings (SCHEMA); + var keyfile = new KeyFile (); + if (FileUtils.test (path, FileTest.EXISTS)) { - var gsettings = new Settings (SCHEMA); - var keyfile = new KeyFile (); keyfile.load_from_file (path, KeyFileFlags.NONE); + } - if (keyfile.has_group (GROUP_NAME)) { + var string_keys = new List<string> (); + string_keys.append (KEY_BACKGROUND); + string_keys.append (KEY_BACKGROUND_COLOR); + string_keys.append (KEY_LOGO); + string_keys.append (KEY_OTHER_MONITORS_LOGO); + string_keys.append (KEY_THEME_NAME); + string_keys.append (KEY_ICON_THEME_NAME); + string_keys.append (KEY_FONT_NAME); + string_keys.append (KEY_PLAY_READY_SOUND); + string_keys.append (KEY_XFT_HINTSTYLE); + string_keys.append (KEY_XFT_RGBA); + string_keys.append (KEY_ENABLE_HIDPI); + + var bool_keys = new List<string> (); + bool_keys.append (KEY_DRAW_USER_BACKGROUNDS); + bool_keys.append (KEY_DRAW_GRID); + bool_keys.append (KEY_SHOW_HOSTNAME); + bool_keys.append (KEY_SHOW_POWER); + bool_keys.append (KEY_SHOW_A11Y); + bool_keys.append (KEY_SHOW_CLOCK); + bool_keys.append (KEY_SHOW_KEYBOARD); + bool_keys.append (KEY_SHOW_QUIT); + bool_keys.append (KEY_XFT_ANTIALIAS); + bool_keys.append (KEY_ACTIVATE_NUMLOCK); + + var int_keys = new List<string> (); + int_keys.append (KEY_XFT_DPI); + + var strv_keys = new List<string> (); + strv_keys.append (KEY_HIDDEN_USERS); + strv_keys.append (KEY_GROUP_FILTER); - var string_keys = new List<string> (); - string_keys.append (KEY_BACKGROUND); - string_keys.append (KEY_BACKGROUND_COLOR); - string_keys.append (KEY_LOGO); - string_keys.append (KEY_OTHER_MONITORS_LOGO); - string_keys.append (KEY_THEME_NAME); - string_keys.append (KEY_ICON_THEME_NAME); - string_keys.append (KEY_FONT_NAME); - string_keys.append (KEY_PLAY_READY_SOUND); - string_keys.append (KEY_XFT_HINTSTYLE); - string_keys.append (KEY_XFT_RGBA); - string_keys.append (KEY_ENABLE_HIDPI); - - var bool_keys = new List<string> (); - bool_keys.append (KEY_DRAW_USER_BACKGROUNDS); - bool_keys.append (KEY_DRAW_GRID); - bool_keys.append (KEY_SHOW_HOSTNAME); - bool_keys.append (KEY_SHOW_POWER); - bool_keys.append (KEY_SHOW_A11Y); - bool_keys.append (KEY_SHOW_CLOCK); - bool_keys.append (KEY_SHOW_KEYBOARD); - bool_keys.append (KEY_SHOW_QUIT); - bool_keys.append (KEY_XFT_ANTIALIAS); - bool_keys.append (KEY_ACTIVATE_NUMLOCK); - - var int_keys = new List<string> (); - int_keys.append (KEY_XFT_DPI); - - var strv_keys = new List<string> (); - strv_keys.append (KEY_HIDDEN_USERS); - strv_keys.append (KEY_GROUP_FILTER); - - foreach (string key in string_keys) - { - if (keyfile.has_key (GROUP_NAME, key)) { - try { - var value = keyfile.get_string (GROUP_NAME, key); - debug ("Overriding dconf setting for %s with %s", key, value); - gsettings.set_string (key, value); - } - catch (Error e) { - warning ("Failed to apply %s from configuration file: %s", key, e.message); - } + foreach (string key in string_keys) + { + if (keyfile.has_group (GROUP_NAME) && keyfile.has_key (GROUP_NAME, key)) { + try { + var value = keyfile.get_string (GROUP_NAME, key); + debug ("Overriding dconf setting for %s with %s", key, value); + gsettings.set_string (key, value); } + catch (Error e) { + warning ("Failed to apply %s from configuration file: %s", key, e.message); } + } + else { + gsettings.reset(key); + debug ("Resetting dconf setting for %s to default", key); + } + } - foreach (string key in bool_keys) - { - if (keyfile.has_key (GROUP_NAME, key)) { - try { - var value = keyfile.get_boolean (GROUP_NAME, key); - debug ("Overriding dconf setting for %s", key); - gsettings.set_boolean (key, value); - } - catch (Error e) { - warning ("Failed to apply %s from configuration file: %s", key, e.message); - } - } + foreach (string key in bool_keys) + { + if (keyfile.has_group (GROUP_NAME) && keyfile.has_key (GROUP_NAME, key)) { + try { + var value = keyfile.get_boolean (GROUP_NAME, key); + debug ("Overriding dconf setting for %s", key); + gsettings.set_boolean (key, value); + } + catch (Error e) { + warning ("Failed to apply %s from configuration file: %s", key, e.message); } + } + else { + gsettings.reset(key); + debug ("Resetting dconf setting for %s to default", key); + } + } - foreach (string key in int_keys) - { - if (keyfile.has_key (GROUP_NAME, key)) { - try { - var value = keyfile.get_integer (GROUP_NAME, key); - debug ("Overriding dconf setting for %s with %d", key, value); - gsettings.set_int (key, value); - } - catch (Error e) { - warning ("Failed to apply %s from configuration file: %s", key, e.message); - } - } + foreach (string key in int_keys) + { + if (keyfile.has_group (GROUP_NAME) && keyfile.has_key (GROUP_NAME, key)) { + try { + var value = keyfile.get_integer (GROUP_NAME, key); + debug ("Overriding dconf setting for %s with %d", key, value); + gsettings.set_int (key, value); + } + catch (Error e) { + warning ("Failed to apply %s from configuration file: %s", key, e.message); } + } + else { + gsettings.reset(key); + debug ("Resetting dconf setting for %s to default", key); + } + } - foreach (string key in strv_keys) - { - if (keyfile.has_key (GROUP_NAME, key)) { - try { - var value = keyfile.get_string_list (GROUP_NAME, key); - debug ("Overriding dconf setting for %s", key); - gsettings.set_strv (key, value); - } - catch (Error e) { - warning ("Failed to apply %s from configuration file: %s", key, e.message); - } - } + foreach (string key in strv_keys) + { + if (keyfile.has_group (GROUP_NAME) && keyfile.has_key (GROUP_NAME, key)) { + try { + var value = keyfile.get_string_list (GROUP_NAME, key); + debug ("Overriding dconf setting for %s", key); + gsettings.set_strv (key, value); + } + catch (Error e) { + warning ("Failed to apply %s from configuration file: %s", key, e.message); } } + else { + gsettings.reset(key); + debug ("Resetting dconf setting for %s to default", key); + } } - } catch (Error e) { + } + catch (Error e) { warning ("Error in apply_conf_settings (): %s", e.message); } } - private const string SCHEMA = "x.dm.slick-greeter"; private const string GROUP_NAME = "Greeter"; }
