1 files changed, 22 insertions, 22 deletions

diff --git a/matchbox/mb-wm-theme.c b/matchbox/mb-wm-theme.c
index 93e8fe7..f496c24 100644
--- a/matchbox/mb-wm-theme.c
+++ b/matchbox/mb-wm-theme.c
@@ -46,7 +46,7 @@ static void
 xml_element_end_cb (void *data, const char *tag);
 
 static void
-xml_stack_free (MBWMList *stack);
+xml_stack_free (GList *stack);
 
 static void
 mb_wm_theme_simple_paint_decor (MBWMTheme *theme, MBWMDecor *decor);
@@ -90,12 +90,12 @@ mb_wm_theme_destroy (MBWMObject *obj)
   if (theme->path)
     free (theme->path);
 
-  MBWMList *l = theme->xml_clients;
+  GList *l = theme->xml_clients;
 
   while (l)
     {
       MBWMXmlClient * c = l->data;
-      MBWMList * n = l->next;
+      GList * n = l->next;
       mb_wm_xml_client_free (c);
       free (l);
 
@@ -109,7 +109,7 @@ mb_wm_theme_init (MBWMObject *obj, va_list vap)
   MBWMTheme        *theme = MB_WM_THEME (obj);
   MBWindowManager  *wm = NULL;
   MBWMObjectProp    prop;
-  MBWMList         *xml_clients = NULL;
+  GList         *xml_clients = NULL;
   char             *path = NULL;
   MBWMColor        *clr_lowlight = NULL;
   MBWMColor        *clr_shadow = NULL;
@@ -126,7 +126,7 @@ mb_wm_theme_init (MBWMObject *obj, va_list vap)
 	  path = va_arg(vap, char *);
 	  break;
 	case MBWMObjectPropThemeXmlClients:
-	  xml_clients = va_arg(vap, MBWMList *);
+	  xml_clients = va_arg(vap, GList *);
 	  break;
 	case MBWMObjectPropThemeColorLowlight:
 	  clr_lowlight = va_arg(vap, MBWMColor *);
@@ -370,9 +370,9 @@ struct expat_data
   XML_Parser   par;
   int          theme_type;
   int          version;
-  MBWMList     *xml_clients;
+  GList     *xml_clients;
   char         *img;
-  MBWMList     *stack;
+  GList     *stack;
   MBWMColor     color_lowlight;
   MBWMColor     color_shadow;
   MBWMCompMgrShadowType shadow_type;
@@ -389,7 +389,7 @@ mb_wm_theme_new (MBWindowManager * wm, const char * theme_path)
   char           buf[256];
   XML_Parser     par = NULL;
   FILE          *file = NULL;
-  MBWMList      *xml_clients = NULL;
+  GList      *xml_clients = NULL;
   char          *img = NULL;
   MBWMColor      clr_lowlight;
   MBWMColor      clr_shadow;
@@ -800,18 +800,18 @@ mb_wm_theme_use_compositing_mgr (MBWMTheme * theme)
  */
 
 static void
-xml_stack_push (MBWMList ** stack, XmlCtx ctx)
+xml_stack_push (GList ** stack, XmlCtx ctx)
 {
   struct stack_data * s = malloc (sizeof (struct stack_data));
 
   s->ctx = ctx;
   s->data = NULL;
 
-  *stack = mb_wm_util_list_prepend (*stack, s);
+  *stack = g_list_prepend (*stack, s);
 }
 
 static XmlCtx
-xml_stack_top_ctx (MBWMList *stack)
+xml_stack_top_ctx (GList *stack)
 {
   struct stack_data * s = stack->data;
 
@@ -819,7 +819,7 @@ xml_stack_top_ctx (MBWMList *stack)
 }
 
 static void *
-xml_stack_top_data (MBWMList *stack)
+xml_stack_top_data (GList *stack)
 {
   struct stack_data * s = stack->data;
 
@@ -827,7 +827,7 @@ xml_stack_top_data (MBWMList *stack)
 }
 
 static void
-xml_stack_top_set_data (MBWMList *stack, void * data)
+xml_stack_top_set_data (GList *stack, void * data)
 {
   struct stack_data * s = stack->data;
 
@@ -835,9 +835,9 @@ xml_stack_top_set_data (MBWMList *stack, void * data)
 }
 
 static void
-xml_stack_pop (MBWMList ** stack)
+xml_stack_pop (GList ** stack)
 {
-  MBWMList * top = *stack;
+  GList * top = *stack;
   struct stack_data * s = top->data;
 
   *stack = top->next;
@@ -846,12 +846,12 @@ xml_stack_pop (MBWMList ** stack)
 }
 
 static void
-xml_stack_free (MBWMList *stack)
+xml_stack_free (GList *stack)
 {
-  MBWMList * l = stack;
+  GList * l = stack;
   while (l)
     {
-      MBWMList * n = l->next;
+      GList * n = l->next;
       free (l->data);
       free (l);
 
@@ -1082,7 +1082,7 @@ xml_element_start_cb (void *data, const char *tag, const char **expat_attr)
 	mb_wm_xml_client_free (c);
       else
 	{
-	  exd->xml_clients = mb_wm_util_list_prepend (exd->xml_clients, c);
+	  exd->xml_clients = g_list_prepend (exd->xml_clients, c);
 	  xml_stack_top_set_data (exd->stack, c);
 	}
 
@@ -1186,7 +1186,7 @@ xml_element_start_cb (void *data, const char *tag, const char **expat_attr)
 	mb_wm_xml_decor_free (d);
       else
 	{
-	  c->decors = mb_wm_util_list_prepend (c->decors, d);
+	  c->decors = g_list_prepend (c->decors, d);
 	  xml_stack_top_set_data (exd->stack, d);
 	}
 
@@ -1286,7 +1286,7 @@ xml_element_start_cb (void *data, const char *tag, const char **expat_attr)
 	  return;
 	}
 
-      d->buttons = mb_wm_util_list_append (d->buttons, b);
+      d->buttons = g_list_append (d->buttons, b);
 
       xml_stack_top_set_data (exd->stack, b);
 
@@ -1385,7 +1385,7 @@ construct_buttons (MBWMTheme * theme,
 
   if (d)
     {
-      MBWMList * l = d->buttons;
+      GList * l = d->buttons;
       while (l)
 	{
 	  MBWMXmlButton * b = l->data;