x11: Remove XSettingsAction type

Use GdkSettingAction instead.

diff --git a/gdk/x11/xsettings-client.c b/gdk/x11/xsettings-client.c
index 7e7bc9d2ba4adf40a9b626f2a0242f0b11128aca..479ac9d865501e96854cc6efe33a89d98c724a61 100644 (file)
--- 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 5ba4673d91f0012c5bf503c71211635a2fed8331..5d9d82eafdaf1dc1e1c1ede0f7921e17fc510ab3 100644 (file)
--- 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;