Sort #includes

diff --git a/src/action.c b/src/action.c
index b1c8cc3baf480e8ebfbea35ed25712e93d70ceef..5d37653e33c332049146645edc668adad5aca56b 100644 (file)
--- a/src/action.c
+++ b/src/action.c
@@ -1,5 +1,4 @@
 #include <strings.h>
-
 #include "common/log.h"
 #include "common/spawn.h"
 #include "labwc.h"

diff --git a/src/deco.c b/src/deco.c
index e4b5d34652acf3f31eda6c29aeed9a6097815d9c..30cf113f07a4e2dbdb02b4d6f3b0644ff71377ab 100644 (file)
--- a/src/deco.c
+++ b/src/deco.c
@@ -5,7 +5,6 @@
  */
 
 #include <assert.h>
-
 #include "config/rcxml.h"
 #include "labwc.h"
 #include "theme/theme.h"

diff --git a/src/desktop.c b/src/desktop.c
index 7c71667fb43a3299775d97f01965ae7592630270..c3777b1c7837b47cfe83637952dbc4536740dab8 100644 (file)
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -1,5 +1,4 @@
 #include <assert.h>
-
 #include "labwc.h"
 
 static void

diff --git a/src/main.c b/src/main.c
index 0e40af5cf4a665089bdb34f9c4f3b3ade3e82af6..bd2b3ec5966e8b2a876fbb4a7d635c1a815f54eb 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,6 @@
-#include "common/spawn.h"
 #include "common/font.h"
+#include "common/log.h"
+#include "common/spawn.h"
 #include "config/session.h"
 #include "labwc.h"
 #include "theme/theme.h"
@@ -68,8 +69,7 @@ main(int argc, char *argv[])
        rcxml_read(config_file);
 
        if (!getenv("XDG_RUNTIME_DIR")) {
-               wlr_log(WLR_ERROR, "XDG_RUNTIME_DIR is required to be set");
-               return 1;
+               die("XDG_RUNTIME_DIR is unset");
        }
 
        struct server server = { 0 };

diff --git a/src/server.c b/src/server.c
index 3a858f665971f3bb9df5775dd74815e3fb7b6bb3..64d89d01da9c18acbfd9c4618f2f681c5ecead95 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -1,8 +1,4 @@
 #define _POSIX_C_SOURCE 200809L
-#include "config/rcxml.h"
-#include "labwc.h"
-#include "theme/theme.h"
-
 #include <signal.h>
 #include <wlr/types/wlr_data_control_v1.h>
 #include <wlr/types/wlr_export_dmabuf_v1.h>
@@ -10,7 +6,10 @@
 #include <wlr/types/wlr_primary_selection_v1.h>
 #include <wlr/types/wlr_screencopy_v1.h>
 #include "common/log.h"
+#include "config/rcxml.h"
+#include "labwc.h"
 #include "layers.h"
+#include "theme/theme.h"
 
 static struct wlr_compositor *compositor;
 static struct wl_event_source *sighup_source;

diff --git a/src/xwayland.c b/src/xwayland.c
index 809e9ce01f0b98dec94fef511faef46c32c7b5bc..9a6e1be55ffde40907878a43fdfb4f730dd6e2ec 100644 (file)
--- a/src/xwayland.c
+++ b/src/xwayland.c
@@ -1,5 +1,4 @@
 #include <assert.h>
-
 #include "labwc.h"
 
 static void