[gtk+] x11: Remove XSettingsAction type
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] x11: Remove XSettingsAction type
- Date: Tue, 19 Feb 2013 13:48:37 +0000 (UTC)
commit afa3d611d6227f9400103f8d61786cbed82e8425
Author: Benjamin Otte <otte redhat com>
Date: Thu Feb 14 15:10:18 2013 +0100
x11: Remove XSettingsAction type
Use GdkSettingAction instead.
gdk/x11/xsettings-client.c | 22 +++++-----------------
gdk/x11/xsettings-client.h | 7 -------
2 files changed, 5 insertions(+), 24 deletions(-)
---
diff --git a/gdk/x11/xsettings-client.c b/gdk/x11/xsettings-client.c
index 7e7bc9d..479ac9d 100644
--- a/gdk/x11/xsettings-client.c
+++ b/gdk/x11/xsettings-client.c
@@ -64,7 +64,7 @@ struct _XSettingsClient
static void
gdk_xsettings_notify (const char *name,
- XSettingsAction action,
+ GdkSettingAction action,
XSettingsSetting *setting,
GdkScreen *screen)
{
@@ -77,23 +77,11 @@ gdk_xsettings_notify (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.action = action;
new_event.setting.name = (char*) gdk_from_xsettings_name (name);
if (!new_event.setting.name)
return;
-
- switch (action)
- {
- case XSETTINGS_ACTION_NEW:
- new_event.setting.action = GDK_SETTING_ACTION_NEW;
- break;
- case XSETTINGS_ACTION_CHANGED:
- new_event.setting.action = GDK_SETTING_ACTION_CHANGED;
- break;
- case XSETTINGS_ACTION_DELETED:
- new_event.setting.action = GDK_SETTING_ACTION_DELETED;
- break;
- }
gdk_event_put (&new_event);
}
@@ -114,9 +102,9 @@ notify_changes (XSettingsClient *client,
old_setting = old_list ? g_hash_table_lookup (old_list, name) : NULL;
if (old_setting == NULL)
- gdk_xsettings_notify (name, XSETTINGS_ACTION_NEW, setting, client->screen);
+ gdk_xsettings_notify (name, GDK_SETTING_ACTION_NEW, setting, client->screen);
else if (!xsettings_setting_equal (setting, old_setting))
- gdk_xsettings_notify (name, XSETTINGS_ACTION_CHANGED, setting, client->screen);
+ gdk_xsettings_notify (name, GDK_SETTING_ACTION_CHANGED, setting, client->screen);
/* remove setting from old_list */
if (old_setting != NULL)
@@ -129,7 +117,7 @@ notify_changes (XSettingsClient *client,
/* old_list now contains only deleted settings */
g_hash_table_iter_init (&iter, old_list);
while (g_hash_table_iter_next (&iter, (gpointer *) &name, (gpointer*) &old_setting))
- gdk_xsettings_notify (name, XSETTINGS_ACTION_DELETED, NULL, client->screen);
+ gdk_xsettings_notify (name, GDK_SETTING_ACTION_DELETED, NULL, client->screen);
}
}
diff --git a/gdk/x11/xsettings-client.h b/gdk/x11/xsettings-client.h
index 5ba4673..5d9d82e 100644
--- a/gdk/x11/xsettings-client.h
+++ b/gdk/x11/xsettings-client.h
@@ -49,13 +49,6 @@ typedef enum
XSETTINGS_TYPE_COLOR = 2
} XSettingsType;
-typedef enum
-{
- XSETTINGS_ACTION_NEW,
- XSETTINGS_ACTION_CHANGED,
- XSETTINGS_ACTION_DELETED
-} XSettingsAction;
-
struct _XSettingsColor
{
unsigned short red, green, blue, alpha;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]