From b90041cb958032b3307eb19e0fd37831d54c5d9a Mon Sep 17 00:00:00 2001 From: monsta Date: Wed, 2 Nov 2016 15:38:24 +0300 Subject: build: require XCursor unconditionally and drop bundled cursor files (.pcf) - they are not used at all when XCursor library is in use --- capplets/appearance/appearance-style.c | 12 -------- capplets/appearance/appearance-themes.c | 5 +--- capplets/appearance/data/Makefile.am | 6 ---- capplets/appearance/data/appearance.ui | 36 ------------------------ capplets/appearance/data/cursor-large-white.pcf | Bin 18636 -> 0 bytes capplets/appearance/data/cursor-large.pcf | Bin 17432 -> 0 bytes capplets/appearance/data/cursor-white.pcf | Bin 13848 -> 0 bytes capplets/appearance/theme-save.c | 4 --- 8 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 capplets/appearance/data/cursor-large-white.pcf delete mode 100644 capplets/appearance/data/cursor-large.pcf delete mode 100644 capplets/appearance/data/cursor-white.pcf (limited to 'capplets/appearance') diff --git a/capplets/appearance/appearance-style.c b/capplets/appearance/appearance-style.c index fbc090ed..a5ad6730 100644 --- a/capplets/appearance/appearance-style.c +++ b/capplets/appearance/appearance-style.c @@ -509,7 +509,6 @@ icon_theme_changed (GSettings *settings, gchar *key, AppearanceData *data) theme_is_writable (theme)); } -#ifdef HAVE_XCURSOR static void cursor_size_changed_cb (int size, AppearanceData *data) { @@ -536,13 +535,11 @@ cursor_size_scale_value_changed_cb (GtkRange *range, AppearanceData *data) cursor_size_changed_cb (size, data); } } -#endif static void update_cursor_size_scale (MateThemeCursorInfo *theme, AppearanceData *data) { -#ifdef HAVE_XCURSOR GtkWidget *cursor_size_scale; GtkWidget *cursor_size_label; GtkWidget *cursor_size_small_label; @@ -610,7 +607,6 @@ update_cursor_size_scale (MateThemeCursorInfo *theme, if (size != gsettings_size) cursor_size_changed_cb (size, data); -#endif } static void @@ -1090,7 +1086,6 @@ style_init (AppearanceData *data) settings = gtk_settings_get_default (); g_signal_connect (settings, "notify::gtk-color-scheme", (GCallback) color_scheme_changed, data); -#ifdef HAVE_XCURSOR w = appearance_capplet_get_widget (data, "cursor_size_scale"); g_signal_connect (w, "value-changed", (GCallback) cursor_size_scale_value_changed_cb, data); @@ -1103,13 +1098,6 @@ style_init (AppearanceData *data) label = g_strdup_printf ("%s", gtk_label_get_text (GTK_LABEL (w))); gtk_label_set_markup (GTK_LABEL (w), label); g_free (label); -#else - w = appearance_capplet_get_widget (data, "cursor_size_hbox"); - gtk_widget_set_no_show_all (w, TRUE); - gtk_widget_hide (w); - gtk_widget_show (appearance_capplet_get_widget (data, "cursor_message_hbox")); - gtk_box_set_spacing (GTK_BOX (appearance_capplet_get_widget (data, "cursor_vbox")), 12); -#endif /* connect signals */ /* color buttons */ diff --git a/capplets/appearance/appearance-themes.c b/capplets/appearance/appearance-themes.c index 9f8d35be..6669e822 100644 --- a/capplets/appearance/appearance-themes.c +++ b/capplets/appearance/appearance-themes.c @@ -234,9 +234,8 @@ theme_load_from_gsettings (AppearanceData *data) theme->notification_theme_name = NULL; theme->cursor_theme_name = g_settings_get_string (data->mouse_settings, CURSOR_THEME_KEY); -#ifdef HAVE_XCURSOR theme->cursor_size = g_settings_get_int (data->mouse_settings, CURSOR_SIZE_KEY); -#endif + if (theme->cursor_theme_name == NULL) theme->cursor_theme_name = g_strdup ("default"); @@ -1138,9 +1137,7 @@ void themes_init(AppearanceData* data) /* listen to gsettings changes, too */ g_signal_connect (data->marco_settings, "changed::" MARCO_THEME_KEY, G_CALLBACK (theme_gsettings_changed), data); g_signal_connect (data->mouse_settings, "changed::" CURSOR_THEME_KEY, G_CALLBACK (theme_gsettings_changed), data); -#ifdef HAVE_XCURSOR g_signal_connect (data->mouse_settings, "changed::" CURSOR_SIZE_KEY, G_CALLBACK (theme_gsettings_changed), data); -#endif g_signal_connect (data->wp_settings, "changed::" WP_FILE_KEY, G_CALLBACK (background_or_font_changed), data); g_signal_connect (data->interface_settings, "changed::" GTK_FONT_KEY, G_CALLBACK (background_or_font_changed), data); g_signal_connect (data->interface_settings, "changed::" DOCUMENT_FONT_KEY, G_CALLBACK (background_or_font_changed), data); diff --git a/capplets/appearance/data/Makefile.am b/capplets/appearance/data/Makefile.am index 72ace798..ff85ab63 100644 --- a/capplets/appearance/data/Makefile.am +++ b/capplets/appearance/data/Makefile.am @@ -17,12 +17,6 @@ dist_pixmap_DATA = \ mouse-cursor-white.png \ mouse-cursor-white-large.png -cursorfontdir = $(datadir)/mate/cursor-fonts -dist_cursorfont_DATA = \ - cursor-large.pcf \ - cursor-white.pcf \ - cursor-large-white.pcf - @INTLTOOL_DESKTOP_RULE@ desktopdir = $(datadir)/applications diff --git a/capplets/appearance/data/appearance.ui b/capplets/appearance/data/appearance.ui index 91619bb1..bec649ea 100644 --- a/capplets/appearance/data/appearance.ui +++ b/capplets/appearance/data/appearance.ui @@ -2586,42 +2586,6 @@ 12 vertical 6 - - - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - 6 - - - True - gtk-dialog-info - 5 - - - False - 0 - - - - - 280 - True - Changing your cursor theme takes effect the next time you log in. - True - - - False - False - 1 - - - - - False - False - 0 - - 200 diff --git a/capplets/appearance/data/cursor-large-white.pcf b/capplets/appearance/data/cursor-large-white.pcf deleted file mode 100644 index e1d7b631..00000000 Binary files a/capplets/appearance/data/cursor-large-white.pcf and /dev/null differ diff --git a/capplets/appearance/data/cursor-large.pcf b/capplets/appearance/data/cursor-large.pcf deleted file mode 100644 index 6580b33d..00000000 Binary files a/capplets/appearance/data/cursor-large.pcf and /dev/null differ diff --git a/capplets/appearance/data/cursor-white.pcf b/capplets/appearance/data/cursor-white.pcf deleted file mode 100644 index bc9932c3..00000000 Binary files a/capplets/appearance/data/cursor-white.pcf and /dev/null differ diff --git a/capplets/appearance/theme-save.c b/capplets/appearance/theme-save.c index 20904496..cbfccdb3 100644 --- a/capplets/appearance/theme-save.c +++ b/capplets/appearance/theme-save.c @@ -226,14 +226,10 @@ write_theme_to_disk (MateThemeMetaInfo *theme_info, } if (theme_info->cursor_theme_name) { -#ifdef HAVE_XCURSOR str = g_strdup_printf ("CursorTheme=%s\n" "CursorSize=%i\n", theme_info->cursor_theme_name, theme_info->cursor_size); -#else - str = g_strdup_printf ("CursorFont=%s\n", theme_info->cursor_theme_name); -#endif g_output_stream_write (output, str, strlen (str), NULL, NULL); g_free (str); } -- cgit v1.2.1