diff options
| author | infirit <[email protected]> | 2015-08-29 11:59:53 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2015-08-29 12:01:19 +0200 |
| commit | fd4d42a3ee5f95efc9ffc0c0df4dc4f2b8c29d6a (patch) | |
| tree | f955bcedaaa51bf106ac42ba897ca3acb5d0c956 /capplets/appearance | |
| parent | 2a73e722a55bc8e2dd2a6159b9d9ea107d8924fd (diff) | |
| download | mate-control-center-fd4d42a3ee5f95efc9ffc0c0df4dc4f2b8c29d6a.tar.bz2 mate-control-center-fd4d42a3ee5f95efc9ffc0c0df4dc4f2b8c29d6a.tar.xz | |
appearance-font: No more usage of Xft2
We require pango already so no need to conditionally build.
Diffstat (limited to 'capplets/appearance')
| -rw-r--r-- | capplets/appearance/appearance-main.c | 4 | ||||
| -rw-r--r-- | capplets/appearance/appearance.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/capplets/appearance/appearance-main.c b/capplets/appearance/appearance-main.c index be4f3682..c8256005 100644 --- a/capplets/appearance/appearance-main.c +++ b/capplets/appearance/appearance-main.c @@ -72,9 +72,7 @@ init_appearance_data (int *argc, char ***argv, GOptionContext *context) data->interface_settings = g_settings_new (INTERFACE_SCHEMA); data->marco_settings = g_settings_new (MARCO_SCHEMA); data->mouse_settings = g_settings_new (MOUSE_SCHEMA); -#ifdef HAVE_XFT2 data->font_settings = g_settings_new (FONT_RENDER_SCHEMA); -#endif /* HAVE_XFT2 */ data->ui = ui; data->thumb_factory = mate_desktop_thumbnail_factory_new (MATE_DESKTOP_THUMBNAIL_SIZE_NORMAL); } @@ -108,9 +106,7 @@ main_window_response (GtkWidget *widget, g_object_unref (data->interface_settings); g_object_unref (data->marco_settings); g_object_unref (data->mouse_settings); -#ifdef HAVE_XFT2 g_object_unref (data->font_settings); -#endif /* HAVE_XFT2 */ g_object_unref (data->ui); } else if (response_id == GTK_RESPONSE_HELP) diff --git a/capplets/appearance/appearance.h b/capplets/appearance/appearance.h index 2091324c..6f68a5c5 100644 --- a/capplets/appearance/appearance.h +++ b/capplets/appearance/appearance.h @@ -65,13 +65,11 @@ #define CURSOR_THEME_KEY "cursor-theme" #define CURSOR_SIZE_KEY "cursor-size" -#ifdef HAVE_XFT2 #define FONT_RENDER_SCHEMA "org.mate.font-rendering" #define FONT_ANTIALIASING_KEY "antialiasing" #define FONT_HINTING_KEY "hinting" #define FONT_RGBA_ORDER_KEY "rgba-order" #define FONT_DPI_KEY "dpi" -#endif /* HAVE_XFT2 */ typedef struct { GSettings* settings; @@ -80,9 +78,7 @@ typedef struct { GSettings* interface_settings; GSettings* marco_settings; GSettings* mouse_settings; -#ifdef HAVE_XFT2 GSettings* font_settings; -#endif /* HAVE_XFT2 */ GtkBuilder* ui; MateDesktopThumbnailFactory* thumb_factory; gulong screen_size_handler; |