diff options
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | configure.ac | 32 | ||||
-rw-r--r-- | managers/Makefile.am (renamed from matchbox/managers/Makefile.am) | 0 | ||||
-rw-r--r-- | managers/maemo/Makefile.am (renamed from matchbox/managers/maemo/Makefile.am) | 0 | ||||
-rw-r--r-- | managers/maemo/maemo-input.c (renamed from matchbox/managers/maemo/maemo-input.c) | 0 | ||||
-rw-r--r-- | managers/maemo/maemo-input.h (renamed from matchbox/managers/maemo/maemo-input.h) | 4 | ||||
-rw-r--r-- | managers/maemo/maemo-toolbar.c (renamed from matchbox/managers/maemo/maemo-toolbar.c) | 0 | ||||
-rw-r--r-- | managers/maemo/maemo-toolbar.h (renamed from matchbox/managers/maemo/maemo-toolbar.h) | 4 | ||||
-rw-r--r-- | managers/maemo/maemo-window-manager.c (renamed from matchbox/managers/maemo/maemo-window-manager.c) | 0 | ||||
-rw-r--r-- | managers/maemo/maemo-window-manager.h (renamed from matchbox/managers/maemo/maemo-window-manager.h) | 2 | ||||
-rw-r--r-- | managers/maemo/matchbox-window-manager-2-maemo.c (renamed from matchbox/managers/maemo/matchbox-window-manager-2-maemo.c) | 0 | ||||
-rw-r--r-- | managers/maemo/theme/Makefile.am (renamed from matchbox/managers/maemo/theme/Makefile.am) | 0 | ||||
-rw-r--r-- | managers/maemo/theme/template.png (renamed from matchbox/managers/maemo/theme/template.png) | bin | 24222 -> 24222 bytes | |||
-rw-r--r-- | managers/maemo/theme/theme.xml (renamed from matchbox/managers/maemo/theme/theme.xml) | 0 | ||||
-rw-r--r-- | managers/simple/Makefile.am (renamed from matchbox/managers/simple/Makefile.am) | 0 | ||||
-rw-r--r-- | managers/simple/matchbox-window-manager-2-simple.c (renamed from matchbox/managers/simple/matchbox-window-manager-2-simple.c) | 0 | ||||
-rw-r--r-- | matchbox2/Makefile.am (renamed from matchbox/Makefile.am) | 2 | ||||
-rw-r--r-- | matchbox2/client-types/Makefile.am (renamed from matchbox/client-types/Makefile.am) | 0 | ||||
-rw-r--r-- | matchbox2/client-types/mb-wm-client-app.c (renamed from matchbox/client-types/mb-wm-client-app.c) | 0 | ||||
-rw-r--r-- | matchbox2/client-types/mb-wm-client-app.h (renamed from matchbox/client-types/mb-wm-client-app.h) | 2 | ||||
-rw-r--r-- | matchbox2/client-types/mb-wm-client-desktop.c (renamed from matchbox/client-types/mb-wm-client-desktop.c) | 0 | ||||
-rw-r--r-- | matchbox2/client-types/mb-wm-client-desktop.h (renamed from matchbox/client-types/mb-wm-client-desktop.h) | 2 | ||||
-rw-r--r-- | matchbox2/client-types/mb-wm-client-dialog.c (renamed from matchbox/client-types/mb-wm-client-dialog.c) | 0 | ||||
-rw-r--r-- | matchbox2/client-types/mb-wm-client-dialog.h (renamed from matchbox/client-types/mb-wm-client-dialog.h) | 2 | ||||
-rw-r--r-- | matchbox2/client-types/mb-wm-client-input.c (renamed from matchbox/client-types/mb-wm-client-input.c) | 0 | ||||
-rw-r--r-- | matchbox2/client-types/mb-wm-client-input.h (renamed from matchbox/client-types/mb-wm-client-input.h) | 2 | ||||
-rw-r--r-- | matchbox2/client-types/mb-wm-client-menu.c (renamed from matchbox/client-types/mb-wm-client-menu.c) | 0 | ||||
-rw-r--r-- | matchbox2/client-types/mb-wm-client-menu.h (renamed from matchbox/client-types/mb-wm-client-menu.h) | 2 | ||||
-rw-r--r-- | matchbox2/client-types/mb-wm-client-note.c (renamed from matchbox/client-types/mb-wm-client-note.c) | 0 | ||||
-rw-r--r-- | matchbox2/client-types/mb-wm-client-note.h (renamed from matchbox/client-types/mb-wm-client-note.h) | 4 | ||||
-rw-r--r-- | matchbox2/client-types/mb-wm-client-override.c (renamed from matchbox/client-types/mb-wm-client-override.c) | 0 | ||||
-rw-r--r-- | matchbox2/client-types/mb-wm-client-override.h (renamed from matchbox/client-types/mb-wm-client-override.h) | 2 | ||||
-rw-r--r-- | matchbox2/client-types/mb-wm-client-panel.c (renamed from matchbox/client-types/mb-wm-client-panel.c) | 0 | ||||
-rw-r--r-- | matchbox2/client-types/mb-wm-client-panel.h (renamed from matchbox/client-types/mb-wm-client-panel.h) | 2 | ||||
-rw-r--r-- | matchbox2/comp-mgr/Makefile.am (renamed from matchbox/comp-mgr/Makefile.am) | 0 | ||||
-rw-r--r-- | matchbox2/comp-mgr/README (renamed from matchbox/comp-mgr/README) | 0 | ||||
-rw-r--r-- | matchbox2/comp-mgr/mb-wm-comp-mgr-clutter.c (renamed from matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c) | 0 | ||||
-rw-r--r-- | matchbox2/comp-mgr/mb-wm-comp-mgr-clutter.h (renamed from matchbox/comp-mgr/mb-wm-comp-mgr-clutter.h) | 2 | ||||
-rw-r--r-- | matchbox2/comp-mgr/mb-wm-comp-mgr-xrender.c (renamed from matchbox/comp-mgr/mb-wm-comp-mgr-xrender.c) | 0 | ||||
-rw-r--r-- | matchbox2/comp-mgr/mb-wm-comp-mgr-xrender.h (renamed from matchbox/comp-mgr/mb-wm-comp-mgr-xrender.h) | 2 | ||||
-rw-r--r-- | matchbox2/comp-mgr/mb-wm-comp-mgr.c (renamed from matchbox/comp-mgr/mb-wm-comp-mgr.c) | 0 | ||||
-rw-r--r-- | matchbox2/comp-mgr/mb-wm-comp-mgr.h (renamed from matchbox/comp-mgr/mb-wm-comp-mgr.h) | 0 | ||||
-rw-r--r-- | matchbox2/core/Makefile.am (renamed from matchbox/core/Makefile.am) | 0 | ||||
-rw-r--r-- | matchbox2/core/mb-window-manager.c (renamed from matchbox/core/mb-window-manager.c) | 0 | ||||
-rw-r--r-- | matchbox2/core/mb-window-manager.h (renamed from matchbox/core/mb-window-manager.h) | 8 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-atoms.c (renamed from matchbox/core/mb-wm-atoms.c) | 0 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-atoms.h (renamed from matchbox/core/mb-wm-atoms.h) | 0 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-client-base.c (renamed from matchbox/core/mb-wm-client-base.c) | 0 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-client-base.h (renamed from matchbox/core/mb-wm-client-base.h) | 0 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-client-window.c (renamed from matchbox/core/mb-wm-client-window.c) | 0 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-client-window.h (renamed from matchbox/core/mb-wm-client-window.h) | 0 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-client.c (renamed from matchbox/core/mb-wm-client.c) | 0 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-client.h (renamed from matchbox/core/mb-wm-client.h) | 2 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-debug.c (renamed from matchbox/core/mb-wm-debug.c) | 0 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-debug.h (renamed from matchbox/core/mb-wm-debug.h) | 0 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-decor.c (renamed from matchbox/core/mb-wm-decor.c) | 0 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-decor.h (renamed from matchbox/core/mb-wm-decor.h) | 0 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-keys.c (renamed from matchbox/core/mb-wm-keys.c) | 0 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-keys.h (renamed from matchbox/core/mb-wm-keys.h) | 2 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-layout.c (renamed from matchbox/core/mb-wm-layout.c) | 0 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-layout.h (renamed from matchbox/core/mb-wm-layout.h) | 2 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-macros.h (renamed from matchbox/core/mb-wm-macros.h) | 0 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-main-context.c (renamed from matchbox/core/mb-wm-main-context.c) | 0 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-main-context.h (renamed from matchbox/core/mb-wm-main-context.h) | 2 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-object-props.h (renamed from matchbox/core/mb-wm-object-props.h) | 2 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-object.c (renamed from matchbox/core/mb-wm-object.c) | 0 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-object.h (renamed from matchbox/core/mb-wm-object.h) | 2 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-props.c (renamed from matchbox/core/mb-wm-props.c) | 0 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-props.h (renamed from matchbox/core/mb-wm-props.h) | 0 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-root-window.c (renamed from matchbox/core/mb-wm-root-window.c) | 0 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-root-window.h (renamed from matchbox/core/mb-wm-root-window.h) | 0 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-stack.c (renamed from matchbox/core/mb-wm-stack.c) | 0 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-stack.h (renamed from matchbox/core/mb-wm-stack.h) | 0 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-types.h (renamed from matchbox/core/mb-wm-types.h) | 2 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-util.c (renamed from matchbox/core/mb-wm-util.c) | 0 | ||||
-rw-r--r-- | matchbox2/core/mb-wm-util.h (renamed from matchbox/core/mb-wm-util.h) | 2 | ||||
-rw-r--r-- | matchbox2/core/mb-wm.h (renamed from matchbox/core/mb-wm.h) | 38 | ||||
-rw-r--r-- | matchbox2/core/xas.c (renamed from matchbox/core/xas.c) | 0 | ||||
-rw-r--r-- | matchbox2/core/xas.h (renamed from matchbox/core/xas.h) | 0 | ||||
-rw-r--r-- | matchbox2/mb-wm-config.h.in (renamed from matchbox/mb-wm-config.h.in) | 0 | ||||
-rw-r--r-- | matchbox2/theme-engines/Makefile.am (renamed from matchbox/theme-engines/Makefile.am) | 0 | ||||
-rw-r--r-- | matchbox2/theme-engines/mb-wm-theme-png.c (renamed from matchbox/theme-engines/mb-wm-theme-png.c) | 0 | ||||
-rw-r--r-- | matchbox2/theme-engines/mb-wm-theme-png.h (renamed from matchbox/theme-engines/mb-wm-theme-png.h) | 4 | ||||
-rw-r--r-- | matchbox2/theme-engines/mb-wm-theme-xml.c (renamed from matchbox/theme-engines/mb-wm-theme-xml.c) | 0 | ||||
-rw-r--r-- | matchbox2/theme-engines/mb-wm-theme-xml.h (renamed from matchbox/theme-engines/mb-wm-theme-xml.h) | 4 | ||||
-rw-r--r-- | matchbox2/theme-engines/mb-wm-theme.c (renamed from matchbox/theme-engines/mb-wm-theme.c) | 0 | ||||
-rw-r--r-- | matchbox2/theme-engines/mb-wm-theme.h (renamed from matchbox/theme-engines/mb-wm-theme.h) | 4 |
87 files changed, 71 insertions, 71 deletions
diff --git a/Makefile.am b/Makefile.am index c95ea0a..09cd46c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = matchbox data doc util +SUBDIRS = matchbox2 managers data doc util # Extra clean files so that maintainer-clean removes *everything* diff --git a/configure.ac b/configure.ac index b528150..ccf094a 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ m4_define([mbwm2_api_version], AC_PREREQ(2.59) AC_INIT([matchbox-window-manager-2], mbwm2_version, [mallum@handhelds.org]) -AC_CONFIG_SRCDIR([matchbox/core/mb-window-manager.c]) +AC_CONFIG_SRCDIR([matchbox2/core/mb-window-manager.c]) AM_INIT_AUTOMAKE() @@ -279,11 +279,11 @@ if test x$have_xcursor = xyes; then AC_DEFINE(HAVE_XCURSOR, [1], [Use XCursor to sync pointer themes]) fi -MBWM_INCS='-I$(top_srcdir) -I$(top_srcdir)/matchbox/core -I$(top_srcdir)/matchbox/client-types -I$(top_srcdir)/matchbox/theme-engines -I$(top_srcdir)/matchbox/comp-mgr -I$(top_builddir)' -MBWM_CORE_LIB='$(top_builddir)/matchbox/core/libmatchbox-window-manager-2-core.la' -MBWM_CLIENT_BUILDDIR='$(top_builddir)/matchbox/client-types' -MBWM_THEME_BUILDDIR='$(top_builddir)/matchbox/theme-engines' -MBWM_COMPMGR_BUILDDIR='$(top_builddir)/matchbox/comp-mgr' +MBWM_INCS='-I$(top_srcdir) -I$(top_srcdir)/matchbox2/core -I$(top_srcdir)/matchbox2/client-types -I$(top_srcdir)/matchbox2/theme-engines -I$(top_srcdir)/matchbox2/comp-mgr -I$(top_builddir)' +MBWM_CORE_LIB='$(top_builddir)/matchbox2/core/libmatchbox-window-manager-2-core.la' +MBWM_CLIENT_BUILDDIR='$(top_builddir)/matchbox2/client-types' +MBWM_THEME_BUILDDIR='$(top_builddir)/matchbox2/theme-engines' +MBWM_COMPMGR_BUILDDIR='$(top_builddir)/matchbox2/comp-mgr' MBWM_CFLAGS="$MBWM_CFLAGS $MBWM_DEBUG_CFLAGS $XFIXES_CFLAGS $XEXT_CFLAGS $XCURSOR_CFLAGS" MBWM_LIBS="$MBWM_LIBS $XFIXES_LIBS $XEXT_LIBS $XCURSOR_LIBS $MBWM_EXTRA_LIBS" @@ -299,16 +299,16 @@ AC_SUBST([MBWM_DEBUG_LDFLAGS]) AC_OUTPUT([ Makefile -matchbox/Makefile -matchbox/mb-wm-config.h -matchbox/core/Makefile -matchbox/client-types/Makefile -matchbox/comp-mgr/Makefile -matchbox/managers/Makefile -matchbox/managers/simple/Makefile -matchbox/managers/maemo/Makefile -matchbox/managers/maemo/theme/Makefile -matchbox/theme-engines/Makefile +matchbox2/Makefile +matchbox2/mb-wm-config.h +matchbox2/core/Makefile +matchbox2/client-types/Makefile +matchbox2/comp-mgr/Makefile +matchbox2/theme-engines/Makefile +managers/Makefile +managers/simple/Makefile +managers/maemo/Makefile +managers/maemo/theme/Makefile data/Makefile data/themes/Makefile data/themes/Default/Makefile diff --git a/matchbox/managers/Makefile.am b/managers/Makefile.am index 07e2f28..07e2f28 100644 --- a/matchbox/managers/Makefile.am +++ b/managers/Makefile.am diff --git a/matchbox/managers/maemo/Makefile.am b/managers/maemo/Makefile.am index 46d32b5..46d32b5 100644 --- a/matchbox/managers/maemo/Makefile.am +++ b/managers/maemo/Makefile.am diff --git a/matchbox/managers/maemo/maemo-input.c b/managers/maemo/maemo-input.c index 52e1940..52e1940 100644 --- a/matchbox/managers/maemo/maemo-input.c +++ b/managers/maemo/maemo-input.c diff --git a/matchbox/managers/maemo/maemo-input.h b/managers/maemo/maemo-input.h index cd4998c..77f4164 100644 --- a/matchbox/managers/maemo/maemo-input.h +++ b/managers/maemo/maemo-input.h @@ -21,8 +21,8 @@ #ifndef _HAVE_MAEMO_INPUT_H #define _HAVE_MAEMO_INPUT_H -#include <matchbox/core/mb-wm.h> -#include <matchbox/client-types/mb-wm-client-input.h> +#include <matchbox2/core/mb-wm.h> +#include <matchbox2/client-types/mb-wm-client-input.h> typedef struct MaemoInput MaemoInput; typedef struct MaemoInputClass MaemoInputClass; diff --git a/matchbox/managers/maemo/maemo-toolbar.c b/managers/maemo/maemo-toolbar.c index 436d8c4..436d8c4 100644 --- a/matchbox/managers/maemo/maemo-toolbar.c +++ b/managers/maemo/maemo-toolbar.c diff --git a/matchbox/managers/maemo/maemo-toolbar.h b/managers/maemo/maemo-toolbar.h index 5aa9015..c2dbc6b 100644 --- a/matchbox/managers/maemo/maemo-toolbar.h +++ b/managers/maemo/maemo-toolbar.h @@ -21,8 +21,8 @@ #ifndef _HAVE_MAEMO_TOOLBAR_H #define _HAVE_MAEMO_TOOLBAR_H -#include <matchbox/core/mb-wm.h> -#include <matchbox/client-types/mb-wm-client-panel.h> +#include <matchbox2/core/mb-wm.h> +#include <matchbox2/client-types/mb-wm-client-panel.h> typedef struct MaemoToolbar MaemoToolbar; typedef struct MaemoToolbarClass MaemoToolbarClass; diff --git a/matchbox/managers/maemo/maemo-window-manager.c b/managers/maemo/maemo-window-manager.c index 656a1ae..656a1ae 100644 --- a/matchbox/managers/maemo/maemo-window-manager.c +++ b/managers/maemo/maemo-window-manager.c diff --git a/matchbox/managers/maemo/maemo-window-manager.h b/managers/maemo/maemo-window-manager.h index 1492991..996ce26 100644 --- a/matchbox/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 <matchbox/core/mb-wm.h> +#include <matchbox2/core/mb-wm.h> typedef struct MaemoWindowManager MaemoWindowManager; typedef struct MaemoWindowManagerClass MaemoWindowManagerClass; diff --git a/matchbox/managers/maemo/matchbox-window-manager-2-maemo.c b/managers/maemo/matchbox-window-manager-2-maemo.c index 0667c7d..0667c7d 100644 --- a/matchbox/managers/maemo/matchbox-window-manager-2-maemo.c +++ b/managers/maemo/matchbox-window-manager-2-maemo.c diff --git a/matchbox/managers/maemo/theme/Makefile.am b/managers/maemo/theme/Makefile.am index 3c32322..3c32322 100644 --- a/matchbox/managers/maemo/theme/Makefile.am +++ b/managers/maemo/theme/Makefile.am diff --git a/matchbox/managers/maemo/theme/template.png b/managers/maemo/theme/template.png Binary files differindex 5ebb9be..5ebb9be 100644 --- a/matchbox/managers/maemo/theme/template.png +++ b/managers/maemo/theme/template.png diff --git a/matchbox/managers/maemo/theme/theme.xml b/managers/maemo/theme/theme.xml index 83bbfb9..83bbfb9 100644 --- a/matchbox/managers/maemo/theme/theme.xml +++ b/managers/maemo/theme/theme.xml diff --git a/matchbox/managers/simple/Makefile.am b/managers/simple/Makefile.am index d232593..d232593 100644 --- a/matchbox/managers/simple/Makefile.am +++ b/managers/simple/Makefile.am diff --git a/matchbox/managers/simple/matchbox-window-manager-2-simple.c b/managers/simple/matchbox-window-manager-2-simple.c index a27313f..a27313f 100644 --- a/matchbox/managers/simple/matchbox-window-manager-2-simple.c +++ b/managers/simple/matchbox-window-manager-2-simple.c diff --git a/matchbox/Makefile.am b/matchbox2/Makefile.am index b9d157b..0ccbac3 100644 --- a/matchbox/Makefile.am +++ b/matchbox2/Makefile.am @@ -9,7 +9,7 @@ MAINTAINERCLEANFILES = Makefile.in pkgincludedir = $(includedir)/$(MBWM2_INCDIR) -SUBDIRS = core client-types theme-engines $(comp) managers +SUBDIRS = core client-types theme-engines $(comp) if ENABLE_LIBMATCHBOX lib_LTLIBRARIES = libmatchbox2-@MBWM2_API_VERSION@.la diff --git a/matchbox/client-types/Makefile.am b/matchbox2/client-types/Makefile.am index 8bb7990..8bb7990 100644 --- a/matchbox/client-types/Makefile.am +++ b/matchbox2/client-types/Makefile.am diff --git a/matchbox/client-types/mb-wm-client-app.c b/matchbox2/client-types/mb-wm-client-app.c index 3aa9d2e..3aa9d2e 100644 --- a/matchbox/client-types/mb-wm-client-app.c +++ b/matchbox2/client-types/mb-wm-client-app.c diff --git a/matchbox/client-types/mb-wm-client-app.h b/matchbox2/client-types/mb-wm-client-app.h index 935a99c..c058d0c 100644 --- a/matchbox/client-types/mb-wm-client-app.h +++ b/matchbox2/client-types/mb-wm-client-app.h @@ -21,7 +21,7 @@ #ifndef _HAVE_MB_CLIENT_APP_H #define _HAVE_MB_CLIENT_APP_H -#include <matchbox/core/mb-wm.h> +#include <matchbox2/core/mb-wm.h> typedef struct MBWMClientApp MBWMClientApp; typedef struct MBWMClientAppClass MBWMClientAppClass; diff --git a/matchbox/client-types/mb-wm-client-desktop.c b/matchbox2/client-types/mb-wm-client-desktop.c index 81ce628..81ce628 100644 --- a/matchbox/client-types/mb-wm-client-desktop.c +++ b/matchbox2/client-types/mb-wm-client-desktop.c diff --git a/matchbox/client-types/mb-wm-client-desktop.h b/matchbox2/client-types/mb-wm-client-desktop.h index 128c450..c132cdb 100644 --- a/matchbox/client-types/mb-wm-client-desktop.h +++ b/matchbox2/client-types/mb-wm-client-desktop.h @@ -21,7 +21,7 @@ #ifndef _HAVE_MB_CLIENT_DESKTOP_H #define _HAVE_MB_CLIENT_DESKTOP_H -#include <matchbox/core/mb-wm.h> +#include <matchbox2/core/mb-wm.h> typedef struct MBWMClientDesktop MBWMClientDesktop; typedef struct MBWMClientDesktopClass MBWMClientDesktopClass; diff --git a/matchbox/client-types/mb-wm-client-dialog.c b/matchbox2/client-types/mb-wm-client-dialog.c index e4bcdfb..e4bcdfb 100644 --- a/matchbox/client-types/mb-wm-client-dialog.c +++ b/matchbox2/client-types/mb-wm-client-dialog.c diff --git a/matchbox/client-types/mb-wm-client-dialog.h b/matchbox2/client-types/mb-wm-client-dialog.h index fd0eee3..de9db01 100644 --- a/matchbox/client-types/mb-wm-client-dialog.h +++ b/matchbox2/client-types/mb-wm-client-dialog.h @@ -21,7 +21,7 @@ #ifndef _HAVE_MB_CLIENT_DIALOG_H #define _HAVE_MB_CLIENT_DIALOG_H -#include <matchbox/core/mb-wm.h> +#include <matchbox2/core/mb-wm.h> typedef struct MBWMClientDialog MBWMClientDialog; typedef struct MBWMClientDialogClass MBWMClientDialogClass; diff --git a/matchbox/client-types/mb-wm-client-input.c b/matchbox2/client-types/mb-wm-client-input.c index 3a63d40..3a63d40 100644 --- a/matchbox/client-types/mb-wm-client-input.c +++ b/matchbox2/client-types/mb-wm-client-input.c diff --git a/matchbox/client-types/mb-wm-client-input.h b/matchbox2/client-types/mb-wm-client-input.h index 05ffabd..ea63bd6 100644 --- a/matchbox/client-types/mb-wm-client-input.h +++ b/matchbox2/client-types/mb-wm-client-input.h @@ -21,7 +21,7 @@ #ifndef _HAVE_MB_CLIENT_INPUT_H #define _HAVE_MB_CLIENT_INPUT_H -#include <matchbox/core/mb-wm.h> +#include <matchbox2/core/mb-wm.h> typedef struct MBWMClientInput MBWMClientInput; typedef struct MBWMClientInputClass MBWMClientInputClass; diff --git a/matchbox/client-types/mb-wm-client-menu.c b/matchbox2/client-types/mb-wm-client-menu.c index b68f771..b68f771 100644 --- a/matchbox/client-types/mb-wm-client-menu.c +++ b/matchbox2/client-types/mb-wm-client-menu.c diff --git a/matchbox/client-types/mb-wm-client-menu.h b/matchbox2/client-types/mb-wm-client-menu.h index 4908736..ac54e86 100644 --- a/matchbox/client-types/mb-wm-client-menu.h +++ b/matchbox2/client-types/mb-wm-client-menu.h @@ -21,7 +21,7 @@ #ifndef _HAVE_MB_CLIENT_MENU_H #define _HAVE_MB_CLIENT_MENU_H -#include <matchbox/core/mb-wm.h> +#include <matchbox2/core/mb-wm.h> typedef struct MBWMClientMenu MBWMClientMenu; typedef struct MBWMClientMenuClass MBWMClientMenuClass; diff --git a/matchbox/client-types/mb-wm-client-note.c b/matchbox2/client-types/mb-wm-client-note.c index d0bb770..d0bb770 100644 --- a/matchbox/client-types/mb-wm-client-note.c +++ b/matchbox2/client-types/mb-wm-client-note.c diff --git a/matchbox/client-types/mb-wm-client-note.h b/matchbox2/client-types/mb-wm-client-note.h index 3a7d5ba..d2390ae 100644 --- a/matchbox/client-types/mb-wm-client-note.h +++ b/matchbox2/client-types/mb-wm-client-note.h @@ -21,8 +21,8 @@ #ifndef _HAVE_MB_CLIENT_NOTE_H #define _HAVE_MB_CLIENT_NOTE_H -#include <matchbox/core/mb-wm.h> -#include <matchbox/client-types/mb-wm-client-dialog.h> +#include <matchbox2/core/mb-wm.h> +#include <matchbox2/client-types/mb-wm-client-dialog.h> typedef struct MBWMClientNote MBWMClientNote; typedef struct MBWMClientNoteClass MBWMClientNoteClass; diff --git a/matchbox/client-types/mb-wm-client-override.c b/matchbox2/client-types/mb-wm-client-override.c index 238ce73..238ce73 100644 --- a/matchbox/client-types/mb-wm-client-override.c +++ b/matchbox2/client-types/mb-wm-client-override.c diff --git a/matchbox/client-types/mb-wm-client-override.h b/matchbox2/client-types/mb-wm-client-override.h index 7bf896a..a804a39 100644 --- a/matchbox/client-types/mb-wm-client-override.h +++ b/matchbox2/client-types/mb-wm-client-override.h @@ -21,7 +21,7 @@ #ifndef _HAVE_MB_CLIENT_OVERRIDE_H #define _HAVE_MB_CLIENT_OVERRIDE_H -#include <matchbox/core/mb-wm.h> +#include <matchbox2/core/mb-wm.h> typedef struct MBWMClientOverride MBWMClientOverride; typedef struct MBWMClientOverrideClass MBWMClientOverrideClass; diff --git a/matchbox/client-types/mb-wm-client-panel.c b/matchbox2/client-types/mb-wm-client-panel.c index c915d6b..c915d6b 100644 --- a/matchbox/client-types/mb-wm-client-panel.c +++ b/matchbox2/client-types/mb-wm-client-panel.c diff --git a/matchbox/client-types/mb-wm-client-panel.h b/matchbox2/client-types/mb-wm-client-panel.h index e0b7d77..4be2585 100644 --- a/matchbox/client-types/mb-wm-client-panel.h +++ b/matchbox2/client-types/mb-wm-client-panel.h @@ -21,7 +21,7 @@ #ifndef _HAVE_MB_CLIENT_PANEL_H #define _HAVE_MB_CLIENT_PANEL_H -#include <matchbox/core/mb-wm.h> +#include <matchbox2/core/mb-wm.h> typedef struct MBWMClientPanel MBWMClientPanel; typedef struct MBWMClientPanelClass MBWMClientPanelClass; diff --git a/matchbox/comp-mgr/Makefile.am b/matchbox2/comp-mgr/Makefile.am index e0384a6..e0384a6 100644 --- a/matchbox/comp-mgr/Makefile.am +++ b/matchbox2/comp-mgr/Makefile.am diff --git a/matchbox/comp-mgr/README b/matchbox2/comp-mgr/README index fb53cf1..fb53cf1 100644 --- a/matchbox/comp-mgr/README +++ b/matchbox2/comp-mgr/README diff --git a/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c b/matchbox2/comp-mgr/mb-wm-comp-mgr-clutter.c index c1aaf8d..c1aaf8d 100644 --- a/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c +++ b/matchbox2/comp-mgr/mb-wm-comp-mgr-clutter.c diff --git a/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.h b/matchbox2/comp-mgr/mb-wm-comp-mgr-clutter.h index f67f46c..8c719d9 100644 --- a/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.h +++ b/matchbox2/comp-mgr/mb-wm-comp-mgr-clutter.h @@ -21,7 +21,7 @@ #ifndef _HAVE_MB_WM_COMP_MGR_CLUTTER_H #define _HAVE_MB_WM_COMP_MGR_CLUTTER_H -#include <matchbox/mb-wm-config.h> +#include <matchbox2/mb-wm-config.h> #include <clutter/clutter.h> #define MB_WM_COMP_MGR_CLUTTER(c) ((MBWMCompMgrClutter*)(c)) diff --git a/matchbox/comp-mgr/mb-wm-comp-mgr-xrender.c b/matchbox2/comp-mgr/mb-wm-comp-mgr-xrender.c index fe7f75b..fe7f75b 100644 --- a/matchbox/comp-mgr/mb-wm-comp-mgr-xrender.c +++ b/matchbox2/comp-mgr/mb-wm-comp-mgr-xrender.c diff --git a/matchbox/comp-mgr/mb-wm-comp-mgr-xrender.h b/matchbox2/comp-mgr/mb-wm-comp-mgr-xrender.h index 8e09fd2..0a36bbc 100644 --- a/matchbox/comp-mgr/mb-wm-comp-mgr-xrender.h +++ b/matchbox2/comp-mgr/mb-wm-comp-mgr-xrender.h @@ -22,7 +22,7 @@ #ifndef _HAVE_MB_WM_COMP_MGR_DEFAULT_H #define _HAVE_MB_WM_COMP_MGR_DEFAULT_H -#include <matchbox/mb-wm-config.h> +#include <matchbox2/mb-wm-config.h> #define MB_WM_COMP_MGR_DEFAULT(c) ((MBWMCompMgrDefault*)(c)) #define MB_WM_COMP_MGR_DEFAULT_CLASS(c) ((MBWMCompMgrDefaultClass*)(c)) diff --git a/matchbox/comp-mgr/mb-wm-comp-mgr.c b/matchbox2/comp-mgr/mb-wm-comp-mgr.c index 68063c3..68063c3 100644 --- a/matchbox/comp-mgr/mb-wm-comp-mgr.c +++ b/matchbox2/comp-mgr/mb-wm-comp-mgr.c diff --git a/matchbox/comp-mgr/mb-wm-comp-mgr.h b/matchbox2/comp-mgr/mb-wm-comp-mgr.h index 98e9cbd..98e9cbd 100644 --- a/matchbox/comp-mgr/mb-wm-comp-mgr.h +++ b/matchbox2/comp-mgr/mb-wm-comp-mgr.h diff --git a/matchbox/core/Makefile.am b/matchbox2/core/Makefile.am index ba4774b..ba4774b 100644 --- a/matchbox/core/Makefile.am +++ b/matchbox2/core/Makefile.am diff --git a/matchbox/core/mb-window-manager.c b/matchbox2/core/mb-window-manager.c index c1a19f2..c1a19f2 100644 --- a/matchbox/core/mb-window-manager.c +++ b/matchbox2/core/mb-window-manager.c diff --git a/matchbox/core/mb-window-manager.h b/matchbox2/core/mb-window-manager.h index 3e83532..e82b931 100644 --- a/matchbox/core/mb-window-manager.h +++ b/matchbox2/core/mb-window-manager.h @@ -21,10 +21,10 @@ #ifndef _HAVE_MB_WM_WINDOW_MANAGER_H #define _HAVE_MB_WM_WINDOW_MANAGER_H -#include <matchbox/mb-wm-config.h> -#include <matchbox/core/mb-wm-object.h> -#include <matchbox/core/mb-wm-root-window.h> -#include <matchbox/core/xas.h> +#include <matchbox2/mb-wm-config.h> +#include <matchbox2/core/mb-wm-object.h> +#include <matchbox2/core/mb-wm-root-window.h> +#include <matchbox2/core/xas.h> typedef struct MBWindowManagerClass MBWindowManagerClass; typedef struct MBWindowManagerPriv MBWindowManagerPriv; diff --git a/matchbox/core/mb-wm-atoms.c b/matchbox2/core/mb-wm-atoms.c index 5d7e805..5d7e805 100644 --- a/matchbox/core/mb-wm-atoms.c +++ b/matchbox2/core/mb-wm-atoms.c diff --git a/matchbox/core/mb-wm-atoms.h b/matchbox2/core/mb-wm-atoms.h index ef06083..ef06083 100644 --- a/matchbox/core/mb-wm-atoms.h +++ b/matchbox2/core/mb-wm-atoms.h diff --git a/matchbox/core/mb-wm-client-base.c b/matchbox2/core/mb-wm-client-base.c index daa679d..daa679d 100644 --- a/matchbox/core/mb-wm-client-base.c +++ b/matchbox2/core/mb-wm-client-base.c diff --git a/matchbox/core/mb-wm-client-base.h b/matchbox2/core/mb-wm-client-base.h index edc8008..edc8008 100644 --- a/matchbox/core/mb-wm-client-base.h +++ b/matchbox2/core/mb-wm-client-base.h diff --git a/matchbox/core/mb-wm-client-window.c b/matchbox2/core/mb-wm-client-window.c index f2dbc74..f2dbc74 100644 --- a/matchbox/core/mb-wm-client-window.c +++ b/matchbox2/core/mb-wm-client-window.c diff --git a/matchbox/core/mb-wm-client-window.h b/matchbox2/core/mb-wm-client-window.h index a898b6e..a898b6e 100644 --- a/matchbox/core/mb-wm-client-window.h +++ b/matchbox2/core/mb-wm-client-window.h diff --git a/matchbox/core/mb-wm-client.c b/matchbox2/core/mb-wm-client.c index f88a8d8..f88a8d8 100644 --- a/matchbox/core/mb-wm-client.c +++ b/matchbox2/core/mb-wm-client.c diff --git a/matchbox/core/mb-wm-client.h b/matchbox2/core/mb-wm-client.h index 8127b07..6b63c8e 100644 --- a/matchbox/core/mb-wm-client.h +++ b/matchbox2/core/mb-wm-client.h @@ -21,7 +21,7 @@ #ifndef _HAVE_MB_CLIENT_H #define _HAVE_MB_CLIENT_H -#include <matchbox/mb-wm-config.h> +#include <matchbox2/mb-wm-config.h> #define MB_WM_CLIENT(c) ((MBWindowManagerClient*)(c)) #define MB_WM_CLIENT_CLASS(c) ((MBWindowManagerClientClass*)(c)) diff --git a/matchbox/core/mb-wm-debug.c b/matchbox2/core/mb-wm-debug.c index 75d6e63..75d6e63 100644 --- a/matchbox/core/mb-wm-debug.c +++ b/matchbox2/core/mb-wm-debug.c diff --git a/matchbox/core/mb-wm-debug.h b/matchbox2/core/mb-wm-debug.h index 4c10be4..4c10be4 100644 --- a/matchbox/core/mb-wm-debug.h +++ b/matchbox2/core/mb-wm-debug.h diff --git a/matchbox/core/mb-wm-decor.c b/matchbox2/core/mb-wm-decor.c index f4f171b..f4f171b 100644 --- a/matchbox/core/mb-wm-decor.c +++ b/matchbox2/core/mb-wm-decor.c diff --git a/matchbox/core/mb-wm-decor.h b/matchbox2/core/mb-wm-decor.h index 6adeadf..6adeadf 100644 --- a/matchbox/core/mb-wm-decor.h +++ b/matchbox2/core/mb-wm-decor.h diff --git a/matchbox/core/mb-wm-keys.c b/matchbox2/core/mb-wm-keys.c index 7c32105..7c32105 100644 --- a/matchbox/core/mb-wm-keys.c +++ b/matchbox2/core/mb-wm-keys.c diff --git a/matchbox/core/mb-wm-keys.h b/matchbox2/core/mb-wm-keys.h index af4dc02..0269274 100644 --- a/matchbox/core/mb-wm-keys.h +++ b/matchbox2/core/mb-wm-keys.h @@ -21,7 +21,7 @@ #ifndef _HAVE_MB_WM_KEYS_H #define _HAVE_MB_WM_KEYS_H -#include <matchbox/core/mb-wm.h> +#include <matchbox2/core/mb-wm.h> void mb_wm_keys_binding_remove_all (MBWindowManager *wm); diff --git a/matchbox/core/mb-wm-layout.c b/matchbox2/core/mb-wm-layout.c index 793276c..793276c 100644 --- a/matchbox/core/mb-wm-layout.c +++ b/matchbox2/core/mb-wm-layout.c diff --git a/matchbox/core/mb-wm-layout.h b/matchbox2/core/mb-wm-layout.h index 7ee61d6..81db28d 100644 --- a/matchbox/core/mb-wm-layout.h +++ b/matchbox2/core/mb-wm-layout.h @@ -21,7 +21,7 @@ #ifndef _HAVE_MB_WM_LAYOUT_MANAGER_H #define _HAVE_MB_WM_LAYOUT_MANAGER_H -#include <matchbox/core/mb-wm.h> +#include <matchbox2/core/mb-wm.h> #define MB_WM_LAYOUT(c) ((MBWMLayout*)(c)) #define MB_WM_LAYOUT_CLASS(c) ((MBWMLayoutClass*)(c)) diff --git a/matchbox/core/mb-wm-macros.h b/matchbox2/core/mb-wm-macros.h index 5c8ab4b..5c8ab4b 100644 --- a/matchbox/core/mb-wm-macros.h +++ b/matchbox2/core/mb-wm-macros.h diff --git a/matchbox/core/mb-wm-main-context.c b/matchbox2/core/mb-wm-main-context.c index 71d5d6c..71d5d6c 100644 --- a/matchbox/core/mb-wm-main-context.c +++ b/matchbox2/core/mb-wm-main-context.c diff --git a/matchbox/core/mb-wm-main-context.h b/matchbox2/core/mb-wm-main-context.h index d93574c..d9ce7b0 100644 --- a/matchbox/core/mb-wm-main-context.h +++ b/matchbox2/core/mb-wm-main-context.h @@ -21,7 +21,7 @@ #ifndef _HAVE_MB_MAIN_CONTEXT_H #define _HAVE_MB_MAIN_CONTEXT_H -#include <matchbox/core/mb-wm.h> +#include <matchbox2/core/mb-wm.h> #include <poll.h> #define MB_WM_MAIN_CONTEXT(c) ((MBWMMainContext*)(c)) diff --git a/matchbox/core/mb-wm-object-props.h b/matchbox2/core/mb-wm-object-props.h index bc1f753..c2d9fb4 100644 --- a/matchbox/core/mb-wm-object-props.h +++ b/matchbox2/core/mb-wm-object-props.h @@ -2,7 +2,7 @@ #ifndef _HAVE_MB_OBJECT_PROPS_H #define _HAVE_MB_OBJECT_PROPS_H -#include <matchbox/core/mb-wm-types.h> +#include <matchbox2/core/mb-wm-types.h> /* * MBWMObject construction properties diff --git a/matchbox/core/mb-wm-object.c b/matchbox2/core/mb-wm-object.c index 09a6ad4..09a6ad4 100644 --- a/matchbox/core/mb-wm-object.c +++ b/matchbox2/core/mb-wm-object.c diff --git a/matchbox/core/mb-wm-object.h b/matchbox2/core/mb-wm-object.h index 2df9ea5..62a04ae 100644 --- a/matchbox/core/mb-wm-object.h +++ b/matchbox2/core/mb-wm-object.h @@ -22,7 +22,7 @@ #define _HAVE_MB_OBJECT_H #include <stdarg.h> -#include <matchbox/core/mb-wm-object-props.h> +#include <matchbox2/core/mb-wm-object-props.h> typedef struct MBWMObject MBWMObject; typedef struct MBWMObjectClass MBWMObjectClass; diff --git a/matchbox/core/mb-wm-props.c b/matchbox2/core/mb-wm-props.c index 01a74bb..01a74bb 100644 --- a/matchbox/core/mb-wm-props.c +++ b/matchbox2/core/mb-wm-props.c diff --git a/matchbox/core/mb-wm-props.h b/matchbox2/core/mb-wm-props.h index 07418ca..07418ca 100644 --- a/matchbox/core/mb-wm-props.h +++ b/matchbox2/core/mb-wm-props.h diff --git a/matchbox/core/mb-wm-root-window.c b/matchbox2/core/mb-wm-root-window.c index 62016bb..62016bb 100644 --- a/matchbox/core/mb-wm-root-window.c +++ b/matchbox2/core/mb-wm-root-window.c diff --git a/matchbox/core/mb-wm-root-window.h b/matchbox2/core/mb-wm-root-window.h index 7d3cdbe..7d3cdbe 100644 --- a/matchbox/core/mb-wm-root-window.h +++ b/matchbox2/core/mb-wm-root-window.h diff --git a/matchbox/core/mb-wm-stack.c b/matchbox2/core/mb-wm-stack.c index f75b228..f75b228 100644 --- a/matchbox/core/mb-wm-stack.c +++ b/matchbox2/core/mb-wm-stack.c diff --git a/matchbox/core/mb-wm-stack.h b/matchbox2/core/mb-wm-stack.h index 58afc45..58afc45 100644 --- a/matchbox/core/mb-wm-stack.h +++ b/matchbox2/core/mb-wm-stack.h diff --git a/matchbox/core/mb-wm-types.h b/matchbox2/core/mb-wm-types.h index 249c875..9c1c71a 100644 --- a/matchbox/core/mb-wm-types.h +++ b/matchbox2/core/mb-wm-types.h @@ -21,7 +21,7 @@ #ifndef _HAVE_MB_WM_TYPES_H #define _HAVE_MB_WM_TYPES_H -#include <matchbox/mb-wm-config.h> +#include <matchbox2/mb-wm-config.h> #if USE_GLIB_MAINLOOP #include <glib.h> diff --git a/matchbox/core/mb-wm-util.c b/matchbox2/core/mb-wm-util.c index 792cb81..792cb81 100644 --- a/matchbox/core/mb-wm-util.c +++ b/matchbox2/core/mb-wm-util.c diff --git a/matchbox/core/mb-wm-util.h b/matchbox2/core/mb-wm-util.h index 07e193d..c9bd6b5 100644 --- a/matchbox/core/mb-wm-util.h +++ b/matchbox2/core/mb-wm-util.h @@ -1,7 +1,7 @@ #ifndef _MB_HAVE_UTIL_H #define _MB_HAVE_UTIL_H -#include <matchbox/core/mb-wm.h> +#include <matchbox2/core/mb-wm.h> /* See http://rlove.org/log/2005102601 */ #if __GNUC__ >= 3 diff --git a/matchbox/core/mb-wm.h b/matchbox2/core/mb-wm.h index 0edbb04..0643510 100644 --- a/matchbox/core/mb-wm.h +++ b/matchbox2/core/mb-wm.h @@ -31,8 +31,8 @@ #include <X11/Xatom.h> /* for XA_ATOM etc */ #include <X11/keysym.h> /* key mask defines */ -#include <matchbox/mb-wm-config.h> -#include <matchbox/core/xas.h> /* async stuff not needed for xlib on xcb */ +#include <matchbox2/mb-wm-config.h> +#include <matchbox2/core/xas.h> /* async stuff not needed for xlib on xcb */ #ifndef TRUE #define TRUE 1 @@ -42,21 +42,21 @@ #define FALSE 0 #endif -#include <matchbox/core/mb-wm-macros.h> -#include <matchbox/core/mb-wm-debug.h> -#include <matchbox/core/mb-wm-types.h> -#include <matchbox/core/mb-wm-util.h> -#include <matchbox/core/mb-wm-object.h> -#include <matchbox/core/mb-wm-atoms.h> -#include <matchbox/core/mb-wm-props.h> -#include <matchbox/core/mb-wm-keys.h> -#include <matchbox/core/mb-wm-decor.h> -#include <matchbox/core/mb-wm-client-window.h> -#include <matchbox/core/mb-wm-root-window.h> -#include <matchbox/core/mb-wm-client.h> -#include <matchbox/core/mb-wm-client-base.h> -#include <matchbox/core/mb-wm-layout.h> -#include <matchbox/core/mb-wm-stack.h> -#include <matchbox/core/mb-window-manager.h> -#include <matchbox/core/mb-wm-main-context.h> +#include <matchbox2/core/mb-wm-macros.h> +#include <matchbox2/core/mb-wm-debug.h> +#include <matchbox2/core/mb-wm-types.h> +#include <matchbox2/core/mb-wm-util.h> +#include <matchbox2/core/mb-wm-object.h> +#include <matchbox2/core/mb-wm-atoms.h> +#include <matchbox2/core/mb-wm-props.h> +#include <matchbox2/core/mb-wm-keys.h> +#include <matchbox2/core/mb-wm-decor.h> +#include <matchbox2/core/mb-wm-client-window.h> +#include <matchbox2/core/mb-wm-root-window.h> +#include <matchbox2/core/mb-wm-client.h> +#include <matchbox2/core/mb-wm-client-base.h> +#include <matchbox2/core/mb-wm-layout.h> +#include <matchbox2/core/mb-wm-stack.h> +#include <matchbox2/core/mb-window-manager.h> +#include <matchbox2/core/mb-wm-main-context.h> #endif diff --git a/matchbox/core/xas.c b/matchbox2/core/xas.c index 47329dc..47329dc 100644 --- a/matchbox/core/xas.c +++ b/matchbox2/core/xas.c diff --git a/matchbox/core/xas.h b/matchbox2/core/xas.h index e9b7ca8..e9b7ca8 100644 --- a/matchbox/core/xas.h +++ b/matchbox2/core/xas.h diff --git a/matchbox/mb-wm-config.h.in b/matchbox2/mb-wm-config.h.in index 8c8de50..8c8de50 100644 --- a/matchbox/mb-wm-config.h.in +++ b/matchbox2/mb-wm-config.h.in diff --git a/matchbox/theme-engines/Makefile.am b/matchbox2/theme-engines/Makefile.am index ee7f594..ee7f594 100644 --- a/matchbox/theme-engines/Makefile.am +++ b/matchbox2/theme-engines/Makefile.am diff --git a/matchbox/theme-engines/mb-wm-theme-png.c b/matchbox2/theme-engines/mb-wm-theme-png.c index a747691..a747691 100644 --- a/matchbox/theme-engines/mb-wm-theme-png.c +++ b/matchbox2/theme-engines/mb-wm-theme-png.c diff --git a/matchbox/theme-engines/mb-wm-theme-png.h b/matchbox2/theme-engines/mb-wm-theme-png.h index 3e25714..bfc4c18 100644 --- a/matchbox/theme-engines/mb-wm-theme-png.h +++ b/matchbox2/theme-engines/mb-wm-theme-png.h @@ -21,8 +21,8 @@ #ifndef _HAVE_MB_WM_THEME_PNG_H #define _HAVE_MB_WM_THEME_PNG_H -#include <matchbox/mb-wm-config.h> -#include <matchbox/theme-engines/mb-wm-theme.h> +#include <matchbox2/mb-wm-config.h> +#include <matchbox2/theme-engines/mb-wm-theme.h> #include <X11/extensions/Xrender.h> diff --git a/matchbox/theme-engines/mb-wm-theme-xml.c b/matchbox2/theme-engines/mb-wm-theme-xml.c index e075b7b..e075b7b 100644 --- a/matchbox/theme-engines/mb-wm-theme-xml.c +++ b/matchbox2/theme-engines/mb-wm-theme-xml.c diff --git a/matchbox/theme-engines/mb-wm-theme-xml.h b/matchbox2/theme-engines/mb-wm-theme-xml.h index d4e3841..8388985 100644 --- a/matchbox/theme-engines/mb-wm-theme-xml.h +++ b/matchbox2/theme-engines/mb-wm-theme-xml.h @@ -1,8 +1,8 @@ #ifndef _HAVE_MB_WM_THEME_PRIVATE_H #define _HAVE_MB_WM_THEME_PRIVATE_H -#include <matchbox/core/mb-wm.h> -#include <matchbox/theme-engines/mb-wm-theme.h> +#include <matchbox2/core/mb-wm.h> +#include <matchbox2/theme-engines/mb-wm-theme.h> /* * Helper structs for xml theme */ diff --git a/matchbox/theme-engines/mb-wm-theme.c b/matchbox2/theme-engines/mb-wm-theme.c index 93e8fe7..93e8fe7 100644 --- a/matchbox/theme-engines/mb-wm-theme.c +++ b/matchbox2/theme-engines/mb-wm-theme.c diff --git a/matchbox/theme-engines/mb-wm-theme.h b/matchbox2/theme-engines/mb-wm-theme.h index 4dbd60a..4c25297 100644 --- a/matchbox/theme-engines/mb-wm-theme.h +++ b/matchbox2/theme-engines/mb-wm-theme.h @@ -21,8 +21,8 @@ #ifndef _HAVE_MB_WM_THEME_H #define _HAVE_MB_WM_THEME_H -#include <matchbox/mb-wm-config.h> -#include <matchbox/core/mb-wm.h> +#include <matchbox2/mb-wm-config.h> +#include <matchbox2/core/mb-wm.h> #define MB_WM_THEME(c) ((MBWMTheme*)(c)) #define MB_WM_THEME_CLASS(c) ((MBWMThemeClass*)(c)) |