1 files changed, 17 insertions, 17 deletions

diff --git a/managers/maemo/maemo-window-manager.c b/managers/maemo/maemo-window-manager.c
index 62e0107..0a1ce86 100644
--- a/managers/maemo/maemo-window-manager.c
+++ b/managers/maemo/maemo-window-manager.c
@@ -26,14 +26,14 @@
 #include <stdarg.h>
 
 static void
-maemo_window_manager_process_cmdline (MBWindowManager *, int, char **);
+maemo_window_manager_process_cmdline (MBWMManager *, int, char **);
 
 static Bool
-maemo_window_manager_client_activate (MBWindowManager * wm,
+maemo_window_manager_client_activate (MBWMManager * wm,
 				      MBWindowManagerClient *c);
 
 static MBWindowManagerClient*
-maemo_window_manager_client_new_func (MBWindowManager *wm,
+maemo_window_manager_client_new_func (MBWMManager *wm,
 				      MBWMClientWindow *win)
 {
   if (win->override_redirect)
@@ -104,11 +104,11 @@ maemo_window_manager_client_new_func (MBWindowManager *wm,
 static void
 maemo_window_manager_class_init (MBWMObjectClass *klass)
 {
-  MBWindowManagerClass *wm_class;
+  MBWMManagerClass *wm_class;
 
   MBWM_MARK();
 
-  wm_class = (MBWindowManagerClass *)klass;
+  wm_class = (MBWMManagerClass *)klass;
 
   wm_class->process_cmdline = maemo_window_manager_process_cmdline;
   wm_class->client_new      = maemo_window_manager_client_new_func;
@@ -127,7 +127,7 @@ maemo_window_manager_destroy (MBWMObject *this)
 static int
 maemo_window_manager_init (MBWMObject *this, va_list vap)
 {
-  MBWindowManager *wm = MB_WINDOW_MANAGER (this);
+  MBWMManager *wm = MB_WM_MANAGER (this);
   wm->modality_type = MBWMModalitySystem;
 
   return 1;
@@ -148,18 +148,18 @@ maemo_window_manager_class_type ()
 	maemo_window_manager_class_init
       };
 
-      type = mb_wm_object_register_class (&info, MB_TYPE_WINDOW_MANAGER, 0);
+      type = mb_wm_object_register_class (&info, MB_WM_TYPE_MANAGER, 0);
     }
 
   return type;
 }
 
-MBWindowManager*
+MBWMManager*
 maemo_window_manager_new (int argc, char **argv)
 {
-  MBWindowManager      *wm = NULL;
+  MBWMManager      *wm = NULL;
 
-  wm = MB_WINDOW_MANAGER (mb_wm_object_new (MB_TYPE_MAEMO_WINDOW_MANAGER,
+  wm = MB_WM_MANAGER (mb_wm_object_new (MB_TYPE_MAEMO_WINDOW_MANAGER,
 					    MBWMObjectPropArgc, argc,
 					    MBWMObjectPropArgv, argv,
 					    NULL));
@@ -171,26 +171,26 @@ maemo_window_manager_new (int argc, char **argv)
 }
 
 static void
-maemo_window_manager_process_cmdline (MBWindowManager *wm,
+maemo_window_manager_process_cmdline (MBWMManager *wm,
 				      int argc, char **argv)
 {
-  MBWindowManagerClass * wm_class =
-    MB_WINDOW_MANAGER_CLASS(MB_WM_OBJECT_GET_PARENT_CLASS(MB_WM_OBJECT(wm)));
+  MBWMManagerClass * wm_class =
+    MB_WM_MANAGER_CLASS(MB_WM_OBJECT_GET_PARENT_CLASS(MB_WM_OBJECT(wm)));
 
   if (wm_class->process_cmdline)
     wm_class->process_cmdline (wm);
 }
 
 static Bool
-maemo_window_manager_client_activate (MBWindowManager * wm,
+maemo_window_manager_client_activate (MBWMManager * wm,
 				      MBWindowManagerClient *c)
 {
-  MBWindowManagerClass  *parent_klass;
+  MBWMManagerClass  *parent_klass;
   MBWMClientType         c_type;
 
   /* Get parent klass so we can chain up to the parent method */
   parent_klass =
-    MB_WINDOW_MANAGER_CLASS(MB_WM_OBJECT_GET_PARENT_CLASS(MB_WM_OBJECT(wm)));
+    MB_WM_MANAGER_CLASS(MB_WM_OBJECT_GET_PARENT_CLASS(MB_WM_OBJECT(wm)));
 
   MBWM_ASSERT (parent_klass->client_activate);
 
@@ -199,7 +199,7 @@ maemo_window_manager_client_activate (MBWindowManager * wm,
 
   c_type = MB_WM_CLIENT_CLIENT_TYPE (c);
 
-  if (c_type == MBWMClientTypeApp && c != mb_wm_get_visible_main_client (wm))
+  if (c_type == MBWMClientTypeApp && c != mb_wm_manager_manager_get_visible_main_window (wm))
     {
       /* Agressive ping to weed out any hungup applications */
       mb_wm_client_ping_start (c);