1 files changed, 8 insertions, 8 deletions

diff --git a/matchbox/mb-wm-theme.c b/matchbox/mb-wm-theme.c
index f496c24..2ba1f0a 100644
--- a/matchbox/mb-wm-theme.c
+++ b/matchbox/mb-wm-theme.c
@@ -107,7 +107,7 @@ static int
 mb_wm_theme_init (MBWMObject *obj, va_list vap)
 {
   MBWMTheme        *theme = MB_WM_THEME (obj);
-  MBWindowManager  *wm = NULL;
+  MBWMManager  *wm = NULL;
   MBWMObjectProp    prop;
   GList         *xml_clients = NULL;
   char             *path = NULL;
@@ -120,7 +120,7 @@ mb_wm_theme_init (MBWMObject *obj, va_list vap)
       switch (prop)
 	{
 	case MBWMObjectPropWm:
-	  wm = va_arg(vap, MBWindowManager *);
+	  wm = va_arg(vap, MBWMManager *);
 	  break;
 	case MBWMObjectPropThemePath:
 	  path = va_arg(vap, char *);
@@ -381,7 +381,7 @@ struct expat_data
 };
 
 MBWMTheme *
-mb_wm_theme_new (MBWindowManager * wm, const char * theme_path)
+mb_wm_theme_new (MBWMManager * wm, const char * theme_path)
 {
   MBWMTheme     *theme = NULL;
   int            theme_type = 0;
@@ -1380,7 +1380,7 @@ construct_buttons (MBWMTheme * theme,
 		   MBWMDecor * decor, MBWMXmlDecor *d)
 {
   MBWindowManagerClient *client = decor->parent_client;
-  MBWindowManager       *wm     = client->wmref;
+  MBWMManager       *wm     = client->wmref;
   MBWMDecorButton       *button;
 
   if (d)
@@ -1497,7 +1497,7 @@ mb_wm_theme_simple_create_decor (MBWMTheme             *theme,
 {
   MBWMClientType   c_type = MB_WM_CLIENT_CLIENT_TYPE (client);
   MBWMDecor       *decor = NULL;
-  MBWindowManager *wm = client->wmref;
+  MBWMManager *wm = client->wmref;
   MBWMXmlClient   *c;
 
   if (MB_WM_THEME (theme)->xml_clients &&
@@ -1749,7 +1749,7 @@ xft_load_font (MBWMDecor * decor, MBWMXmlDecor *d)
 
   if (!d || d->font_units == MBWMXmlFontUnitsPixels)
     {
-      font_size = mb_wm_util_pixels_to_points (decor->parent_client->wmref,
+      font_size = mb_wm_manager_util_pixels_to_points (decor->parent_client->wmref,
 					       font_size);
     }
 
@@ -1769,7 +1769,7 @@ mb_wm_theme_simple_paint_decor (MBWMTheme *theme, MBWMDecor *decor)
   const MBGeometry      *geom;
   MBWindowManagerClient *client;
   Window                 xwin;
-  MBWindowManager       *wm = theme->wm;
+  MBWMManager       *wm = theme->wm;
   MBWMColor              clr_bg;
   MBWMColor              clr_fg;
   MBWMClientType         c_type;
@@ -1896,7 +1896,7 @@ mb_wm_theme_simple_paint_button (MBWMTheme *theme, MBWMDecorButton *button)
   MBWMDecor             *decor;
   MBWindowManagerClient *client;
   Window                 xwin;
-  MBWindowManager       *wm = theme->wm;
+  MBWMManager       *wm = theme->wm;
   int                    x, y, w, h;
   MBWMColor              clr_bg;
   MBWMColor              clr_fg;