diff options
author | monsta <[email protected]> | 2016-11-02 15:38:24 +0300 |
---|---|---|
committer | monsta <[email protected]> | 2016-11-02 15:38:24 +0300 |
commit | b90041cb958032b3307eb19e0fd37831d54c5d9a (patch) | |
tree | bb5c034f7cab7e19d3947bf67ed7fc9cad090b82 /capplets/appearance/appearance-themes.c | |
parent | 7ec8dfe386585a28257a443bcc5c47d937c741fb (diff) | |
download | mate-control-center-b90041cb958032b3307eb19e0fd37831d54c5d9a.tar.bz2 mate-control-center-b90041cb958032b3307eb19e0fd37831d54c5d9a.tar.xz |
build: require XCursor unconditionally
and drop bundled cursor files (.pcf) - they are not used at all
when XCursor library is in use
Diffstat (limited to 'capplets/appearance/appearance-themes.c')
-rw-r--r-- | capplets/appearance/appearance-themes.c | 5 |
1 files changed, 1 insertions, 4 deletions
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); |