Ubuntu Pastebin

Paste from Marco Trevisan (3v1n0) at Mon, 12 Oct 2015 08:35:01 +0000

Download as text 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
Index: gtk+3.0-3.10.8/unity-settings-daemon-14.04.0+14.04.20150825/plugins/xsettings/gsd-xsettings-manager.c
===================================================================
--- gtk+3.0-3.10.8.orig/unity-settings-daemon-14.04.0+14.04.20150825/plugins/xsettings/gsd-xsettings-manager.c	2015-10-10 12:43:18.676452521 +0200
+++ gtk+3.0-3.10.8/unity-settings-daemon-14.04.0+14.04.20150825/plugins/xsettings/gsd-xsettings-manager.c	2015-10-10 12:53:27.926141072 +0200
@@ -61,6 +61,7 @@
 #define TEXT_SCALING_FACTOR_KEY "text-scaling-factor"
 #define SCALING_FACTOR_KEY "scaling-factor"
 #define CURSOR_SIZE_KEY "cursor-size"
+#define CURSOR_THEME_KEY "cursor-theme"
 
 #define FONT_ANTIALIASING_KEY "antialiasing"
 #define FONT_HINTING_KEY      "hinting"
@@ -441,6 +442,7 @@
         int         dpi;
         int         window_scale;
         int         cursor_size;
+        gchar      *cursor_theme;
         const char *rgba;
         const char *hintstyle;
 } GnomeXftSettings;
@@ -457,6 +459,7 @@
         gboolean use_rgba = FALSE;
         double dpi;
         int cursor_size;
+        gchar* cursor_theme;
 
 	interface_settings = g_hash_table_lookup (manager->priv->settings, INTERFACE_SETTINGS_SCHEMA);
 
@@ -472,6 +475,7 @@
         settings->scaled_dpi = dpi * settings->window_scale * 1024;
         cursor_size = g_settings_get_int (interface_settings, CURSOR_SIZE_KEY);
         settings->cursor_size = cursor_size * settings->window_scale;
+        settings->cursor_theme = g_settings_get_string (interface_settings, CURSOR_THEME_KEY);
         settings->rgba = "rgb";
         settings->hintstyle = "hintfull";
 
@@ -542,6 +546,7 @@
                 xsettings_manager_set_int (manager->priv->managers [i], "Xft/DPI", settings->scaled_dpi);
                 xsettings_manager_set_string (manager->priv->managers [i], "Xft/RGBA", settings->rgba);
                 xsettings_manager_set_int (manager->priv->managers [i], "Gtk/CursorThemeSize", settings->cursor_size);
+                xsettings_manager_set_string (manager->priv->managers [i], "Gtk/CursorThemeName", settings->cursor_theme);
         }
         gnome_settings_profile_end (NULL);
 }
@@ -605,6 +610,8 @@
                                 settings->rgba);
         update_property (add_string, "Xcursor.size",
                                 g_ascii_dtostr (dpibuf, sizeof (dpibuf), (double) settings->cursor_size));
+        update_property (add_string, "Xcursor.theme",
+                                settings->cursor_theme);
 
         g_debug("xft_settings_set_xresources: new res '%s'", add_string->str);
 
@@ -633,6 +640,8 @@
         xft_settings_set_xresources (&settings);
 
         gnome_settings_profile_end (NULL);
+
+        g_free (settings.cursor_theme);
 }
 
 static void
@@ -856,7 +865,8 @@
 
         if (g_str_equal (key, TEXT_SCALING_FACTOR_KEY) ||
             g_str_equal (key, SCALING_FACTOR_KEY) ||
-            g_str_equal (key, CURSOR_SIZE_KEY)) {
+            g_str_equal (key, CURSOR_SIZE_KEY) ||
+            g_str_equal (key, CURSOR_THEME_KEY)) {
         	xft_callback (NULL, key, manager);
         	return;
 	}
Download as text