callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x11: Return XSetting without copying

Browse Source
This commit is contained in:
Benjamin Otte
2013-02-10 00:02:53 +01:00
parent 1f95eddbda
commit 63f0797e70
5 changed files with 9 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gdk/x11/gdkscreen-x11.c
View File

@ -1353,8 +1353,7 @@ gdk_x11_screen_get_setting (GdkScreen *screen,
{
GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
const char *xsettings_name = NULL;
XSettingsResult result;
XSettingsSetting *setting = NULL;
const XSettingsSetting *setting;
gboolean success = FALSE;
GValue tmp_val = G_VALUE_INIT;
@ -1362,9 +1361,8 @@ gdk_x11_screen_get_setting (GdkScreen *screen,
if (!xsettings_name)
goto out;
result = xsettings_client_get_setting (x11_screen->xsettings_client,
xsettings_name, &setting);
if (result != XSETTINGS_SUCCESS)
setting = xsettings_client_get_setting (x11_screen->xsettings_client, xsettings_name);
if (setting == NULL)
goto out;
switch (setting->type)
@ -1413,9 +1411,6 @@ gdk_x11_screen_get_setting (GdkScreen *screen,
g_value_unset (&tmp_val);
out:
if (setting)
xsettings_setting_free (setting);
if (success)
return TRUE;
else