xsettings: Remove XSettingsList type

[~andy/gtk] / gdk / x11 / xsettings-common.c

diff --git a/gdk/x11/xsettings-common.c b/gdk/x11/xsettings-common.c
index 1831324fa7d6eca89d12460958003956fde07858..3e1ebd17f65c09f624d8372580db6398a5e373fa 100644 (file)
--- a/gdk/x11/xsettings-common.c
+++ b/gdk/x11/xsettings-common.c
@@ -20,15 +20,17 @@
  *
  * Author:  Owen Taylor, Red Hat, Inc.
  */
+
 #include "config.h"
+
+#include "xsettings-common.h"
+
 #include "string.h"
 #include "stdlib.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xmd.h>           /* For CARD32 */
 
-#include "xsettings-common.h"
-
 XSettingsSetting *
 xsettings_setting_copy (XSettingsSetting *setting)
 {
@@ -78,45 +80,6 @@ xsettings_setting_copy (XSettingsSetting *setting)
   return NULL;
 }
 
-XSettingsList *
-xsettings_list_copy (XSettingsList *list)
-{
-  XSettingsList *new = NULL;
-  XSettingsList *old_iter = list;
-  XSettingsList *new_iter = NULL;
-
-  while (old_iter)
-    {
-      XSettingsList *new_node;
-
-      new_node = malloc (sizeof *new_node);
-      if (!new_node)
-       goto error;
-
-      new_node->setting = xsettings_setting_copy (old_iter->setting);
-      if (!new_node->setting)
-       {
-         free (new_node);
-         goto error;
-       }
-
-      if (new_iter)
-       new_iter->next = new_node;
-      else
-       new = new_node;
-
-      new_iter = new_node;
-      
-      old_iter = old_iter->next;
-    }
-
-  return new;
-
- error:
-  xsettings_list_free (new);
-  return NULL;
-}
-
 int
 xsettings_setting_equal (XSettingsSetting *setting_a,
                         XSettingsSetting *setting_b)
@@ -155,111 +118,3 @@ xsettings_setting_free (XSettingsSetting *setting)
   free (setting);
 }
 
-void
-xsettings_list_free (XSettingsList *list)
-{
-  while (list)
-    {
-      XSettingsList *next = list->next;
-
-      xsettings_setting_free (list->setting);
-      free (list);
-
-      list = next;
-    }
-}
-
-XSettingsResult
-xsettings_list_insert (XSettingsList    **list,
-                      XSettingsSetting  *setting)
-{
-  XSettingsList *node;
-  XSettingsList *iter;
-  XSettingsList *last = NULL;
-
-  node = malloc (sizeof *node);
-  if (!node)
-    return XSETTINGS_NO_MEM;
-  node->setting = setting;
-
-  iter = *list;
-  while (iter)
-    {
-      int cmp = strcmp (setting->name, iter->setting->name);
-
-      if (cmp < 0)
-       break;
-      else if (cmp == 0)
-       {
-         free (node);
-         return XSETTINGS_DUPLICATE_ENTRY;
-       }
-
-      last = iter;
-      iter = iter->next;
-    }
-  
-  if (last)
-    last->next = node;
-  else
-    *list = node;
-  
-  node->next = iter;
-  
-  return XSETTINGS_SUCCESS;
-}
-
-XSettingsResult
-xsettings_list_delete (XSettingsList **list,
-                      const char     *name)
-{
-  XSettingsList *iter;
-  XSettingsList *last = NULL;
-
-  iter = *list;
-  while (iter)
-    {
-      if (strcmp (name, iter->setting->name) == 0)
-       {
-         if (last)
-           last->next = iter->next;
-         else
-           *list = iter->next;
-  
-         xsettings_setting_free (iter->setting);
-         free (iter);
-
-         return XSETTINGS_SUCCESS;
-       }
-
-      last = iter;
-      iter = iter->next;
-    }
-
-  return XSETTINGS_FAILED;
-}
-
-XSettingsSetting *
-xsettings_list_lookup (XSettingsList *list,
-                      const char    *name)
-{
-  XSettingsList *iter;
-
-  iter = list;
-  while (iter)
-    {
-      if (strcmp (name, iter->setting->name) == 0)
-       return iter->setting;
-
-      iter = iter->next;
-    }
-
-  return NULL;
-}
-
-char
-xsettings_byte_order (void)
-{
-  CARD32 myint = 0x01020304;
-  return (*(char *)&myint == 1) ? MSBFirst : LSBFirst;
-}