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

Use hash-based conversions for XSETTINGS names.

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=692605
This commit is contained in:
John Lindgren
2013-01-26 15:53:58 -05:00
committed by Benjamin Otte
parent 63d87cac44
commit 885b43dd3a
5 changed files with 91 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1356,16 +1356,9 @@ gdk_x11_screen_get_setting (GdkScreen *screen,
XSettingsResult result;
XSettingsSetting *setting = NULL;
gboolean success = FALSE;
gint i;
GValue tmp_val = G_VALUE_INIT;
for (i = 0; i < GDK_SETTINGS_N_ELEMENTS(); i++)
if (strcmp (GDK_SETTINGS_GDK_NAME (i), name) == 0)
{
xsettings_name = GDK_SETTINGS_X_NAME (i);
break;
}
xsettings_name = gdk_to_xsettings_name (name);
if (!xsettings_name)
goto out;
@ -1707,7 +1700,6 @@ gdk_xsettings_notify_cb (const char *name,
GdkEvent new_event;
GdkScreen *screen = data;
GdkX11Screen *x11_screen = data;
int i;
if (x11_screen->xsettings_in_init)
return;
@ -1715,15 +1707,8 @@ gdk_xsettings_notify_cb (const char *name,
new_event.type = GDK_SETTING;
new_event.setting.window = gdk_screen_get_root_window (screen);
new_event.setting.send_event = FALSE;
new_event.setting.name = NULL;
new_event.setting.name = (char*) gdk_from_xsettings_name (name);
for (i = 0; i < GDK_SETTINGS_N_ELEMENTS() ; i++)
if (strcmp (GDK_SETTINGS_X_NAME (i), name) == 0)
{
new_event.setting.name = (char*) GDK_SETTINGS_GDK_NAME (i);
break;
}
if (!new_event.setting.name)
return;