mv theme.c ..

diff --git a/include/theme/theme.h b/include/theme.h
similarity index 100%
rename from include/theme/theme.h
rename to include/theme.h

diff --git a/src/deco.c b/src/deco.c
index 4536a50eb467a270334d559792f76d38e6d25014..49b87ef9bb1b83605e01be66e692b5fcbd783d4f 100644 (file)
--- a/src/deco.c
+++ b/src/deco.c
@@ -7,7 +7,6 @@
 #include <assert.h>
 #include "config/rcxml.h"
 #include "labwc.h"
-#include "theme/theme.h"
 
 #define BORDER_WIDTH (2)
 

diff --git a/src/main.c b/src/main.c
index 35d16671cf2ed75c16a75314d9ffc3c30a8ea60c..29b7f6cd222850f52a890f0bfefe7573af3d11a9 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -3,7 +3,7 @@
 #include "common/spawn.h"
 #include "config/session.h"
 #include "labwc.h"
-#include "theme/theme.h"
+#include "theme.h"
 #include "xbm/xbm.h"
 #include "menu/menu.h"
 

diff --git a/src/menu/menu.c b/src/menu/menu.c
index 207dce106d7ee06c52f72eab8eceb13623ec0718..e1692749db574e174a3acac1ad8e8b2a48cd636d 100644 (file)
--- a/src/menu/menu.c
+++ b/src/menu/menu.c
@@ -16,7 +16,7 @@
 #include "common/string-helpers.h"
 #include "labwc.h"
 #include "menu/menu.h"
-#include "theme/theme.h"
+#include "theme.h"
 
 static const char font[] = "Sans 8";
 

diff --git a/src/meson.build b/src/meson.build
index a21999715d8cf8d40a6bb979b1eb4ee462f7ebf5..8808657af6afcdb4037b5790b4d53095b5321284 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -12,6 +12,7 @@ labwc_sources = files(
   'output.c',
   'seat.c',
   'server.c',
+  'theme.c',
   'view.c',
   'xdg.c',
 )
@@ -26,6 +27,5 @@ endif
 
 subdir('common')
 subdir('config')
-subdir('theme')
 subdir('xbm')
 subdir('menu')

diff --git a/src/output.c b/src/output.c
index 142400189477b5e6a4205cb23bb0583d66564a3d..fbf3d7be283c7f0b7cc15f217dc9a63bdae02aa6 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -12,7 +12,7 @@
 #include <wlr/util/region.h>
 #include "labwc.h"
 #include "menu/menu.h"
-#include "theme/theme.h"
+#include "theme.h"
 #include "layers.h"
 
 //#define DEBUG 1

diff --git a/src/server.c b/src/server.c
index 7bd1da751bad1bcc414263d63e037c2e28c1f1a7..8d262c08f6f401ee08085dd492b9dbf475d6189c 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -12,7 +12,7 @@
 #include "labwc.h"
 #include "layers.h"
 #include "menu/menu.h"
-#include "theme/theme.h"
+#include "theme.h"
 
 static struct wlr_compositor *compositor;
 static struct wl_event_source *sighup_source;

diff --git a/src/theme/theme.c b/src/theme.c
similarity index 99%
rename from src/theme/theme.c
rename to src/theme.c
index 6944851676852bbb7196e80dfb2529ffb65693d2..f07afbd1ff80bd5fae3e82160f295b2ac3b8c493 100644 (file)
--- a/src/theme/theme.c
+++ b/src/theme.c
@@ -10,7 +10,7 @@
 #include "common/log.h"
 #include "common/string-helpers.h"
 #include "common/zfree.h"
-#include "theme/theme.h"
+#include "theme.h"
 #include "xbm/xbm.h"
 
 static int

diff --git a/src/theme/meson.build b/src/theme/meson.build
deleted file mode 100644 (file)
index a9bef66..0000000
--- a/src/theme/meson.build
+++ /dev/null
@@ -1,4 +0,0 @@
-labwc_sources += files(
-  'theme.c',
-)
-

diff --git a/src/xbm/xbm.c b/src/xbm/xbm.c
index 44c74753e442b657d7fb5a795a341e9d8af308ce..af5aae703424f83e2edc85219bc2e6b19126853d 100644 (file)
--- a/src/xbm/xbm.c
+++ b/src/xbm/xbm.c
@@ -10,7 +10,7 @@
 #include "common/dir.h"
 #include "common/grab-file.h"
 #include "config/rcxml.h"
-#include "theme/theme.h"
+#include "theme.h"
 #include "xbm/parse.h"
 #include "xbm/xbm.h"