Browse Source

remove trailing slashes from dirpaths

sisyphus
Dustin Falgout 8 years ago
parent
commit
4fc9fb189a
  1. 10
      meson_options.txt
  2. 10
      src/greeter.c

10
meson_options.txt

@ -1,24 +1,24 @@
option('with-theme-dir',
type: 'string',
value: '/usr/share/lightdm-webkit/themes/',
value: '/usr/share/lightdm-webkit/themes',
description: 'Directory to use for greeter themes')
option('with-config-dir',
type: 'string',
value: '/etc/lightdm/',
value: '/etc/lightdm',
description: 'LightDM configuration directory')
option('with-desktop-dir',
type: 'string',
value: '/usr/share/xgreeters/',
value: '/usr/share/xgreeters',
description: 'LightDM greeters directory')
option('with-webext-dir',
type: 'string',
value: '/usr/lib/lightdm-webkit2-greeter/',
value: '/usr/lib/lightdm-webkit2-greeter',
description: 'Directory for the greeter webkit extension')
option('with-locale-dir',
type: 'string',
value: '/usr/share/locale/',
value: '/usr/share/locale',
description: 'Locale directory')

10
src/greeter.c

@ -64,7 +64,6 @@ static gint config_timeout;
static gboolean
debug_mode,
secure_mode,
heartbeat,
heartbeat_exit;
@ -319,9 +318,12 @@ main(int argc, char **argv) {
/* BEGIN Greeter Config File */
keyfile = g_key_file_new();
g_key_file_load_from_file(keyfile,
CONFIG_DIR "lightdm-webkit2-greeter.conf",
G_KEY_FILE_NONE, NULL);
g_key_file_load_from_file(
keyfile,
CONFIG_DIR "/lightdm-webkit2-greeter.conf",
G_KEY_FILE_NONE,
NULL
);
/* TODO: Handle config values and fallbacks some other way, this is garbage! */
theme = g_key_file_get_string(keyfile, "greeter", "webkit_theme", &err);

Loading…
Cancel
Save