From de88b69d62b3dea02d3b3cd588172654d2b1b0c0 Mon Sep 17 00:00:00 2001
From: Johan Malm <jgm323@gmail.com>
Date: Sun, 21 Feb 2021 22:18:34 +0000
Subject: [PATCH] mv theme.c ..

---
 include/{theme => }/theme.h | 0
 src/deco.c                  | 1 -
 src/main.c                  | 2 +-
 src/menu/menu.c             | 2 +-
 src/meson.build             | 2 +-
 src/output.c                | 2 +-
 src/server.c                | 2 +-
 src/{theme => }/theme.c     | 2 +-
 src/theme/meson.build       | 4 ----
 src/xbm/xbm.c               | 2 +-
 10 files changed, 7 insertions(+), 12 deletions(-)
 rename include/{theme => }/theme.h (100%)
 rename src/{theme => }/theme.c (99%)
 delete mode 100644 src/theme/meson.build

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 4536a50e..49b87ef9 100644
--- 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 35d16671..29b7f6cd 100644
--- 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 207dce10..e1692749 100644
--- 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 a2199971..8808657a 100644
--- 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 14240018..fbf3d7be 100644
--- 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 7bd1da75..8d262c08 100644
--- 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 69448516..f07afbd1 100644
--- 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
index a9bef667..00000000
--- 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 44c74753..af5aae70 100644
--- 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"