You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
calculate-overlay/profiles/templates/3.6/6_ac_install_patch/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-c...

51 lines
2.2 KiB

# Calculate format=diff merge(x11-misc/lightdm-gtk-greeter)==2.0.1-r1
=== modified file 'src/greeterconfiguration.h'
--- src/greeterconfiguration.h 2015-03-27 05:29:45 +0000
+++ src/greeterconfiguration.h 2017-05-22 08:44:01 +0000
@@ -11,6 +11,8 @@
#define CONFIG_KEY_SCREENSAVER_TIMEOUT "screensaver-timeout"
#define CONFIG_KEY_THEME "theme-name"
#define CONFIG_KEY_ICON_THEME "icon-theme-name"
+#define CONFIG_KEY_CURSOR_THEME "cursor-theme-name"
+#define CONFIG_KEY_CURSOR_THEME_SIZE "cursor-theme-size"
#define CONFIG_KEY_FONT "font-name"
#define CONFIG_KEY_DPI "xft-dpi"
#define CONFIG_KEY_ANTIALIAS "xft-antialias"
=== modified file 'src/lightdm-gtk-greeter.c'
--- src/lightdm-gtk-greeter.c 2016-10-06 09:33:35 +0000
+++ src/lightdm-gtk-greeter.c 2017-05-22 08:44:01 +0000
@@ -275,7 +275,8 @@
/* a11y indicator */
static gchar *default_font_name,
*default_theme_name,
- *default_icon_theme_name;
+ *default_icon_theme_name,
+ *default_cursor_theme_name;
void a11y_font_cb (GtkCheckMenuItem *item);
void a11y_contrast_cb (GtkCheckMenuItem *item);
void a11y_keyboard_cb (GtkCheckMenuItem *item, gpointer user_data);
@@ -2745,6 +2746,21 @@
g_object_get (gtk_settings_get_default (), "gtk-icon-theme-name", &default_icon_theme_name, NULL);
g_debug ("[Configuration] Icons theme: '%s'", default_icon_theme_name);
+ value = config_get_string (NULL, CONFIG_KEY_CURSOR_THEME, NULL);
+ if (value)
+ {
+ g_debug ("[Configuration] Changing cursor theme to '%s'", value);
+ g_object_set (gtk_settings_get_default (), "gtk-cursor-theme-name", value, NULL);
+ g_free (value);
+ }
+ g_object_get (gtk_settings_get_default (), "gtk-cursor-theme-name", &default_cursor_theme_name, NULL);
+ g_debug ("[Configuration] Cursor theme: '%s'", default_cursor_theme_name);
+
+ if (config_has_key(NULL, CONFIG_KEY_CURSOR_THEME_SIZE))
+ {
+ g_object_set (gtk_settings_get_default (), "gtk-cursor-theme-size", config_get_int (NULL, CONFIG_KEY_CURSOR_THEME_SIZE, 16), NULL);
+ }
+
value = config_get_string (NULL, CONFIG_KEY_FONT, "Sans 10");
if (value)
{