aboutsummaryrefslogtreecommitdiffstats
path: root/managers
diff options
context:
space:
mode:
authorRobert Bragg <robert@linux.intel.com>2010-08-17 03:05:02 +0100
committerRobert Bragg <robert@linux.intel.com>2010-12-09 22:38:46 +0000
commit0f0c5a9d6e56816daaf8b5d03829fd719d90f6dd (patch)
treedfd6ad01fe3fcfd50845149f918b0f2496df7a2e /managers
parentc44faf93394efc69a9f74f33bfe73d3c3b58cfb4 (diff)
downloadlibmatchboxwm2-0f0c5a9d6e56816daaf8b5d03829fd719d90f6dd.tar.gz
libmatchboxwm2-0f0c5a9d6e56816daaf8b5d03829fd719d90f6dd.tar.bz2
libmatchboxwm2-0f0c5a9d6e56816daaf8b5d03829fd719d90f6dd.zip
build: fix the build for managers/maemo
Some misc #include fixes to enable managers/maemo to build again
Diffstat (limited to 'managers')
-rw-r--r--managers/maemo/maemo-input.h3
-rw-r--r--managers/maemo/maemo-toolbar.h3
-rw-r--r--managers/maemo/maemo-window-manager.c11
-rw-r--r--managers/maemo/maemo-window-manager.h2
-rw-r--r--managers/maemo/matchbox-window-manager-2-maemo.c2
5 files changed, 5 insertions, 16 deletions
diff --git a/managers/maemo/maemo-input.h b/managers/maemo/maemo-input.h
index 77f4164..b239958 100644
--- a/managers/maemo/maemo-input.h
+++ b/managers/maemo/maemo-input.h
@@ -21,8 +21,7 @@
#ifndef _HAVE_MAEMO_INPUT_H
#define _HAVE_MAEMO_INPUT_H
-#include <matchbox2/core/mb-wm.h>
-#include <matchbox2/client-types/mb-wm-client-input.h>
+#include <matchbox2/mb-wm.h>
typedef struct MaemoInput MaemoInput;
typedef struct MaemoInputClass MaemoInputClass;
diff --git a/managers/maemo/maemo-toolbar.h b/managers/maemo/maemo-toolbar.h
index c2dbc6b..2bc453d 100644
--- a/managers/maemo/maemo-toolbar.h
+++ b/managers/maemo/maemo-toolbar.h
@@ -21,8 +21,7 @@
#ifndef _HAVE_MAEMO_TOOLBAR_H
#define _HAVE_MAEMO_TOOLBAR_H
-#include <matchbox2/core/mb-wm.h>
-#include <matchbox2/client-types/mb-wm-client-panel.h>
+#include <matchbox2/mb-wm.h>
typedef struct MaemoToolbar MaemoToolbar;
typedef struct MaemoToolbarClass MaemoToolbarClass;
diff --git a/managers/maemo/maemo-window-manager.c b/managers/maemo/maemo-window-manager.c
index 656a1ae..19d146c 100644
--- a/managers/maemo/maemo-window-manager.c
+++ b/managers/maemo/maemo-window-manager.c
@@ -21,16 +21,7 @@
#include "maemo-window-manager.h"
#include "maemo-toolbar.h"
#include "maemo-input.h"
-#include "mb-wm-client-app.h"
-#include "mb-wm-client-panel.h"
-#include "mb-wm-client-dialog.h"
-#include "mb-wm-client-desktop.h"
-#include "mb-wm-client-input.h"
-#include "mb-window-manager.h"
-
-#if ENABLE_COMPOSITE
-#include "mb-wm-client-override.h"
-#endif
+#include <matchbox2/mb-wm.h>
#include <stdarg.h>
diff --git a/managers/maemo/maemo-window-manager.h b/managers/maemo/maemo-window-manager.h
index 996ce26..5a3082b 100644
--- a/managers/maemo/maemo-window-manager.h
+++ b/managers/maemo/maemo-window-manager.h
@@ -21,7 +21,7 @@
#ifndef _HAVE_MAEMO_WINDOW_MANAGER_H
#define _HAVE_MAEMO_WINDOW_MANAGER_H
-#include <matchbox2/core/mb-wm.h>
+#include <matchbox2/mb-wm.h>
typedef struct MaemoWindowManager MaemoWindowManager;
typedef struct MaemoWindowManagerClass MaemoWindowManagerClass;
diff --git a/managers/maemo/matchbox-window-manager-2-maemo.c b/managers/maemo/matchbox-window-manager-2-maemo.c
index 0667c7d..eec9658 100644
--- a/managers/maemo/matchbox-window-manager-2-maemo.c
+++ b/managers/maemo/matchbox-window-manager-2-maemo.c
@@ -18,7 +18,7 @@
*
*/
-#include "mb-wm.h"
+#include <matchbox2/mb-wm.h>
#include <signal.h>
enum {