diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-07-21 13:59:22 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-07-21 13:59:22 +0000 |
| commit | 8f3399d4109f104c1af13b9f1e966d729e1bbe6c (patch) | |
| tree | 8e065bb52a5dc5813798f300cb56a9874ddeaf71 /gdk/x11/gdkevents-x11.c | |
| parent | 68bcd510478d7c3d54fd31066bd17ed3f6d3bb3e (diff) | |
| download | gdk-pixbuf-8f3399d4109f104c1af13b9f1e966d729e1bbe6c.tar.gz | |
Change machinery for following font rendering xsettings to set cairo font
2005-07-19 Owen Taylor <otaylor@redhat.com>
* gtk/gtksettings.c gtk/gtkwidget.c: Change machinery for
following font rendering xsettings to set cairo font
options on PangoContext
* gdk/x11/gdkxftdefaults.c gdk/x11/gdkevents-x11.c gdkscreen-x11.h
gdkprivate-x11.h: Get default values for rendering options
(such as antialiasing, dpi) from the Xft resources for the
display, borrowing a bit of code from Xft.
* gtk/gtksettings.c (gtk_settings_class_init): Fix docs for
values of gtk-xft-hintstyle.
Diffstat (limited to 'gdk/x11/gdkevents-x11.c')
| -rw-r--r-- | gdk/x11/gdkevents-x11.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c index 74e999135..afbfedb97 100644 --- a/gdk/x11/gdkevents-x11.c +++ b/gdk/x11/gdkevents-x11.c @@ -2895,7 +2895,7 @@ gdk_screen_get_setting (GdkScreen *screen, const char *xsettings_name = NULL; XSettingsResult result; - XSettingsSetting *setting; + XSettingsSetting *setting = NULL; GdkScreenX11 *screen_x11; gboolean success = FALSE; gint i; @@ -2913,12 +2913,12 @@ gdk_screen_get_setting (GdkScreen *screen, } if (!xsettings_name) - return FALSE; + goto out; result = xsettings_client_get_setting (screen_x11->xsettings_client, xsettings_name, &setting); if (result != XSETTINGS_SUCCESS) - return FALSE; + goto out; switch (setting->type) { @@ -2965,9 +2965,14 @@ gdk_screen_get_setting (GdkScreen *screen, g_value_unset (&tmp_val); - xsettings_setting_free (setting); + out: + if (setting) + xsettings_setting_free (setting); - return success; + if (success) + return TRUE; + else + return _gdk_x11_get_xft_setting (screen, name, value); } static GdkFilterReturn |