diff options
30 files changed, 30 insertions, 30 deletions
diff --git a/managers/maemo/maemo-input.h b/managers/maemo/maemo-input.h index b239958..079467f 100644 --- a/managers/maemo/maemo-input.h +++ b/managers/maemo/maemo-input.h @@ -21,7 +21,7 @@ #ifndef _HAVE_MAEMO_INPUT_H #define _HAVE_MAEMO_INPUT_H -#include <matchbox2/mb-wm.h> +#include <matchbox2/matchbox.h> typedef struct MaemoInput MaemoInput; typedef struct MaemoInputClass MaemoInputClass; diff --git a/managers/maemo/maemo-toolbar.h b/managers/maemo/maemo-toolbar.h index 2bc453d..9bfd788 100644 --- a/managers/maemo/maemo-toolbar.h +++ b/managers/maemo/maemo-toolbar.h @@ -21,7 +21,7 @@ #ifndef _HAVE_MAEMO_TOOLBAR_H #define _HAVE_MAEMO_TOOLBAR_H -#include <matchbox2/mb-wm.h> +#include <matchbox2/matchbox.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 19d146c..5660237 100644 --- a/managers/maemo/maemo-window-manager.c +++ b/managers/maemo/maemo-window-manager.c @@ -21,7 +21,7 @@ #include "maemo-window-manager.h" #include "maemo-toolbar.h" #include "maemo-input.h" -#include <matchbox2/mb-wm.h> +#include <matchbox2/matchbox.h> #include <stdarg.h> diff --git a/managers/maemo/maemo-window-manager.h b/managers/maemo/maemo-window-manager.h index 5a3082b..c3ebe78 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/mb-wm.h> +#include <matchbox2/matchbox.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 eec9658..6656e40 100644 --- a/managers/maemo/matchbox-window-manager-2-maemo.c +++ b/managers/maemo/matchbox-window-manager-2-maemo.c @@ -18,7 +18,7 @@ * */ -#include <matchbox2/mb-wm.h> +#include <matchbox2/matchbox.h> #include <signal.h> enum { diff --git a/managers/simple/matchbox-window-manager-2-simple.c b/managers/simple/matchbox-window-manager-2-simple.c index b6dd958..9b4ce11 100644 --- a/managers/simple/matchbox-window-manager-2-simple.c +++ b/managers/simple/matchbox-window-manager-2-simple.c @@ -1,4 +1,4 @@ -#include <matchbox2/mb-wm.h> +#include <matchbox2/matchbox.h> #include <signal.h> #if ENABLE_CLUTTER_COMPOSITE_MANAGER diff --git a/matchbox2/Makefile.am b/matchbox2/Makefile.am index 6114c8c..488acb5 100644 --- a/matchbox2/Makefile.am +++ b/matchbox2/Makefile.am @@ -2,7 +2,7 @@ lib_LTLIBRARIES = libmatchbox2-@MBWM2_API_VERSION@.la source_public_h = \ - mb-wm.h + matchbox.h # Core... source = \ @@ -92,7 +92,7 @@ if THEME_PNG source += mb-wm-theme-png.c mb-wm-theme-png.h endif -pkgincludedir = $(includedir)/$(MBWM2_INCDIR)/matchbox2 +pkgincludedir = $(includedir)/matchbox2-$(MBWM2_API_VERSION)/matchbox2 pkginclude_HEADERS = $(source_public_h) libmatchbox2_@MBWM2_API_VERSION@_la_SOURCES = $(source_public_h) $(source) diff --git a/matchbox2/mb-wm.h b/matchbox2/matchbox.h index 89a7f3a..89a7f3a 100644 --- a/matchbox2/mb-wm.h +++ b/matchbox2/matchbox.h diff --git a/matchbox2/mb-window-manager.c b/matchbox2/mb-window-manager.c index 71485b9..7d1a201 100644 --- a/matchbox2/mb-window-manager.c +++ b/matchbox2/mb-window-manager.c @@ -18,7 +18,7 @@ * GNU General Public License for more details. * */ -#include "mb-wm.h" +#include "matchbox.h" #include "mb-wm-client-app.h" #include "mb-wm-client-panel.h" #include "mb-wm-client-dialog.h" diff --git a/matchbox2/mb-wm-atoms.c b/matchbox2/mb-wm-atoms.c index 5d7e805..4b270a8 100644 --- a/matchbox2/mb-wm-atoms.c +++ b/matchbox2/mb-wm-atoms.c @@ -1,4 +1,4 @@ -#include "mb-wm.h" +#include "matchbox.h" void mb_wm_atoms_init(MBWindowManager *wm) diff --git a/matchbox2/mb-wm-client-app.h b/matchbox2/mb-wm-client-app.h index bb6f05d..d6ae20d 100644 --- a/matchbox2/mb-wm-client-app.h +++ b/matchbox2/mb-wm-client-app.h @@ -21,7 +21,7 @@ #ifndef _HAVE_MB_CLIENT_APP_H #define _HAVE_MB_CLIENT_APP_H -#include <matchbox2/mb-wm.h> +#include <matchbox2/matchbox.h> typedef struct MBWMClientApp MBWMClientApp; typedef struct MBWMClientAppClass MBWMClientAppClass; diff --git a/matchbox2/mb-wm-client-base.c b/matchbox2/mb-wm-client-base.c index daa679d..d9b0446 100644 --- a/matchbox2/mb-wm-client-base.c +++ b/matchbox2/mb-wm-client-base.c @@ -18,7 +18,7 @@ * */ -#include "mb-wm.h" +#include "matchbox.h" #include "mb-wm-theme.h" #include <X11/Xmd.h> diff --git a/matchbox2/mb-wm-client-desktop.h b/matchbox2/mb-wm-client-desktop.h index fc63dbc..bde40f3 100644 --- a/matchbox2/mb-wm-client-desktop.h +++ b/matchbox2/mb-wm-client-desktop.h @@ -21,7 +21,7 @@ #ifndef _HAVE_MB_CLIENT_DESKTOP_H #define _HAVE_MB_CLIENT_DESKTOP_H -#include <matchbox2/mb-wm.h> +#include <matchbox2/matchbox.h> typedef struct MBWMClientDesktop MBWMClientDesktop; typedef struct MBWMClientDesktopClass MBWMClientDesktopClass; diff --git a/matchbox2/mb-wm-client-input.h b/matchbox2/mb-wm-client-input.h index ea8908c..0495845 100644 --- a/matchbox2/mb-wm-client-input.h +++ b/matchbox2/mb-wm-client-input.h @@ -21,7 +21,7 @@ #ifndef _HAVE_MB_CLIENT_INPUT_H #define _HAVE_MB_CLIENT_INPUT_H -#include <matchbox2/mb-wm.h> +#include <matchbox2/matchbox.h> typedef struct MBWMClientInput MBWMClientInput; typedef struct MBWMClientInputClass MBWMClientInputClass; diff --git a/matchbox2/mb-wm-client-menu.h b/matchbox2/mb-wm-client-menu.h index 00552ba..b12178e 100644 --- a/matchbox2/mb-wm-client-menu.h +++ b/matchbox2/mb-wm-client-menu.h @@ -21,7 +21,7 @@ #ifndef _HAVE_MB_CLIENT_MENU_H #define _HAVE_MB_CLIENT_MENU_H -#include <matchbox2/mb-wm.h> +#include <matchbox2/matchbox.h> typedef struct MBWMClientMenu MBWMClientMenu; typedef struct MBWMClientMenuClass MBWMClientMenuClass; diff --git a/matchbox2/mb-wm-client-note.h b/matchbox2/mb-wm-client-note.h index b9d062a..2871bc1 100644 --- a/matchbox2/mb-wm-client-note.h +++ b/matchbox2/mb-wm-client-note.h @@ -21,7 +21,7 @@ #ifndef _HAVE_MB_CLIENT_NOTE_H #define _HAVE_MB_CLIENT_NOTE_H -#include <matchbox2/mb-wm.h> +#include <matchbox2/matchbox.h> #include <matchbox2/mb-wm-client-dialog.h> typedef struct MBWMClientNote MBWMClientNote; diff --git a/matchbox2/mb-wm-client-override.h b/matchbox2/mb-wm-client-override.h index a187bd3..26d5897 100644 --- a/matchbox2/mb-wm-client-override.h +++ b/matchbox2/mb-wm-client-override.h @@ -21,7 +21,7 @@ #ifndef _HAVE_MB_CLIENT_OVERRIDE_H #define _HAVE_MB_CLIENT_OVERRIDE_H -#include <matchbox2/mb-wm.h> +#include <matchbox2/matchbox.h> typedef struct MBWMClientOverride MBWMClientOverride; typedef struct MBWMClientOverrideClass MBWMClientOverrideClass; diff --git a/matchbox2/mb-wm-client-panel.h b/matchbox2/mb-wm-client-panel.h index db38216..0907e5f 100644 --- a/matchbox2/mb-wm-client-panel.h +++ b/matchbox2/mb-wm-client-panel.h @@ -21,7 +21,7 @@ #ifndef _HAVE_MB_CLIENT_PANEL_H #define _HAVE_MB_CLIENT_PANEL_H -#include <matchbox2/mb-wm.h> +#include <matchbox2/matchbox.h> typedef struct MBWMClientPanel MBWMClientPanel; typedef struct MBWMClientPanelClass MBWMClientPanelClass; diff --git a/matchbox2/mb-wm-client-window.c b/matchbox2/mb-wm-client-window.c index f2dbc74..8e8b67d 100644 --- a/matchbox2/mb-wm-client-window.c +++ b/matchbox2/mb-wm-client-window.c @@ -18,7 +18,7 @@ * */ -#include "mb-wm.h" +#include "matchbox.h" /* Via Xatomtype.h */ #define NumPropWMHintsElements 9 /* number of elements in this structure */ diff --git a/matchbox2/mb-wm-comp-mgr-clutter.c b/matchbox2/mb-wm-comp-mgr-clutter.c index c1aaf8d..91163df 100644 --- a/matchbox2/mb-wm-comp-mgr-clutter.c +++ b/matchbox2/mb-wm-comp-mgr-clutter.c @@ -18,7 +18,7 @@ * */ -#include "mb-wm.h" +#include "matchbox.h" #include "mb-wm-client.h" #include "mb-wm-comp-mgr.h" #include "mb-wm-comp-mgr-clutter.h" diff --git a/matchbox2/mb-wm-comp-mgr-xrender.c b/matchbox2/mb-wm-comp-mgr-xrender.c index fe7f75b..b3ae255 100644 --- a/matchbox2/mb-wm-comp-mgr-xrender.c +++ b/matchbox2/mb-wm-comp-mgr-xrender.c @@ -19,7 +19,7 @@ * */ -#include "mb-wm.h" +#include "matchbox.h" #include "mb-wm-client.h" #include "mb-wm-comp-mgr.h" #include "mb-wm-comp-mgr-xrender.h" diff --git a/matchbox2/mb-wm-comp-mgr.c b/matchbox2/mb-wm-comp-mgr.c index 68063c3..5aa6d6b 100644 --- a/matchbox2/mb-wm-comp-mgr.c +++ b/matchbox2/mb-wm-comp-mgr.c @@ -18,7 +18,7 @@ * */ -#include "mb-wm.h" +#include "matchbox.h" #include "mb-wm-client.h" #include "mb-wm-comp-mgr.h" #include "mb-wm-theme.h" diff --git a/matchbox2/mb-wm-decor.c b/matchbox2/mb-wm-decor.c index f4f171b..17a3ece 100644 --- a/matchbox2/mb-wm-decor.c +++ b/matchbox2/mb-wm-decor.c @@ -18,7 +18,7 @@ * */ -#include "mb-wm.h" +#include "matchbox.h" #include "mb-wm-theme.h" static void diff --git a/matchbox2/mb-wm-keys.c b/matchbox2/mb-wm-keys.c index 7c32105..41d416c 100644 --- a/matchbox2/mb-wm-keys.c +++ b/matchbox2/mb-wm-keys.c @@ -1,4 +1,4 @@ -#include "mb-wm.h" +#include "matchbox.h" #include <ctype.h> /* isalpha etc */ struct MBWMKeys /* FIXME: Probably do want to hide these here */ diff --git a/matchbox2/mb-wm-keys.h b/matchbox2/mb-wm-keys.h index 656c6e6..b960e9f 100644 --- a/matchbox2/mb-wm-keys.h +++ b/matchbox2/mb-wm-keys.h @@ -21,7 +21,7 @@ #ifndef _HAVE_MB_WM_KEYS_H #define _HAVE_MB_WM_KEYS_H -#include <matchbox2/mb-wm.h> +#include <matchbox2/matchbox.h> typedef struct MBWMKeys MBWMKeys; typedef struct MBWMKeyBinding MBWMKeyBinding; diff --git a/matchbox2/mb-wm-layout.c b/matchbox2/mb-wm-layout.c index 793276c..7e92998 100644 --- a/matchbox2/mb-wm-layout.c +++ b/matchbox2/mb-wm-layout.c @@ -1,4 +1,4 @@ -#include "mb-wm.h" +#include "matchbox.h" #include "mb-wm-client-input.h" static void diff --git a/matchbox2/mb-wm-props.c b/matchbox2/mb-wm-props.c index 01a74bb..fbf538a 100644 --- a/matchbox2/mb-wm-props.c +++ b/matchbox2/mb-wm-props.c @@ -1,4 +1,4 @@ -#include "mb-wm.h" +#include "matchbox.h" #include "xas.h" MBWMCookie diff --git a/matchbox2/mb-wm-root-window.c b/matchbox2/mb-wm-root-window.c index 8fb9053..21b8617 100644 --- a/matchbox2/mb-wm-root-window.c +++ b/matchbox2/mb-wm-root-window.c @@ -18,7 +18,7 @@ * */ -#include "mb-wm.h" +#include "matchbox.h" #include "mb-wm-theme.h" #include "mb-wm-client-dialog.h" diff --git a/matchbox2/mb-wm-stack.c b/matchbox2/mb-wm-stack.c index f75b228..af5c4a3 100644 --- a/matchbox2/mb-wm-stack.c +++ b/matchbox2/mb-wm-stack.c @@ -18,7 +18,7 @@ * */ -#include "mb-wm.h" +#include "matchbox.h" static void diff --git a/matchbox2/mb-wm-theme-xml.h b/matchbox2/mb-wm-theme-xml.h index 00ea589..8362146 100644 --- a/matchbox2/mb-wm-theme-xml.h +++ b/matchbox2/mb-wm-theme-xml.h @@ -1,7 +1,7 @@ #ifndef _HAVE_MB_WM_THEME_PRIVATE_H #define _HAVE_MB_WM_THEME_PRIVATE_H -#include <matchbox2/mb-wm.h> +#include <matchbox2/matchbox.h> #include <matchbox2/mb-wm-theme.h> /* * Helper structs for xml theme |