This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository enlightenment.
View the commit online.
commit 581eea065d8eb81611761197bdff15a3f6aba744
Author: Carsten Haitzler <[email protected]>
AuthorDate: Mon Jan 5 19:54:40 2026 +0000
rationalize includes to use single master e_mod_main.h
---
src/modules/clipboard/common.h | 16 +++-------------
src/modules/clipboard/e_mod_main.c | 1 -
src/modules/clipboard/e_mod_main.h | 3 ---
src/modules/clipboard/history.c | 2 +-
src/modules/clipboard/history.h | 3 +--
src/modules/clipboard/utility.c | 2 +-
src/modules/clipboard/utility.h | 3 +--
7 files changed, 7 insertions(+), 23 deletions(-)
diff --git a/src/modules/clipboard/common.h b/src/modules/clipboard/common.h
index b27814d35..061f781cf 100644
--- a/src/modules/clipboard/common.h
+++ b/src/modules/clipboard/common.h
@@ -3,6 +3,9 @@
#include "e.h"
#include "config.h"
+#include "e_mod_config.h"
+#include "history.h"
+#include "utility.h"
#define MAGIC_LABEL_SIZE 50
#define MAGIC_HIST_SIZE 20
@@ -16,19 +19,6 @@ do { \
if (exp) return; \
} while(0)
-/* EINA_LOG support macros and global */
-
-#undef DBG
-#undef INF
-#undef WRN
-#undef ERR
-#undef CRI
-#define DBG(...) EINA_LOG_DOM_DBG(clipboard_log, __VA_ARGS__)
-#define INF(...) EINA_LOG_DOM_INFO(clipboard_log, __VA_ARGS__)
-#define WRN(...) EINA_LOG_DOM_WARN(clipboard_log, __VA_ARGS__)
-#define ERR(...) EINA_LOG_DOM_ERR(clipboard_log, __VA_ARGS__)
-#define CRI(...) EINA_LOG_DOM_CRIT(clipboard_log, __VA_ARGS__)
-
typedef struct _Clip_Data
{ // structure used for storing clipboard data in
char *name;
diff --git a/src/modules/clipboard/e_mod_main.c b/src/modules/clipboard/e_mod_main.c
index 7859feced..b47c54d9f 100644
--- a/src/modules/clipboard/e_mod_main.c
+++ b/src/modules/clipboard/e_mod_main.c
@@ -1,6 +1,5 @@
#include "e_mod_main.h"
#include "config_defaults.h"
-#include "history.h"
/* Stuff for convenience to compress code */
#define CLIP_TRIM_MODE(x) (x->trim_nl + 2 * (x->trim_ws))
diff --git a/src/modules/clipboard/e_mod_main.h b/src/modules/clipboard/e_mod_main.h
index 03320e3ca..a7b8f7bc3 100644
--- a/src/modules/clipboard/e_mod_main.h
+++ b/src/modules/clipboard/e_mod_main.h
@@ -2,9 +2,6 @@
#define E_MOD_MAIN_H
#include "common.h"
-#include "e_mod_config.h"
-#include "history.h"
-#include "utility.h"
/* Key Board Bindings action names */
#define ACT_FLOAT _("Show History")
diff --git a/src/modules/clipboard/history.c b/src/modules/clipboard/history.c
index d35330d6c..3087ae430 100644
--- a/src/modules/clipboard/history.c
+++ b/src/modules/clipboard/history.c
@@ -1,4 +1,4 @@
-#include "history.h"
+#include "e_mod_main.h"
#define CLIPBOARD_MOD_NAME "clipboard"
#define DATA_DIR CLIPBOARD_MOD_NAME
diff --git a/src/modules/clipboard/history.h b/src/modules/clipboard/history.h
index 8879f5194..92e457400 100644
--- a/src/modules/clipboard/history.h
+++ b/src/modules/clipboard/history.h
@@ -1,8 +1,7 @@
#ifndef CLIPBOARD_HISTORY_H
#define CLIPBOARD_HISTORY_H
-#include "common.h"
-#include "utility.h"
+#include "e_mod_main.h"
Eet_Error read_history(Eina_List **items, unsigned int ignore_ws, unsigned int label_length);
Eet_Error save_history(Eina_List *items);
diff --git a/src/modules/clipboard/utility.c b/src/modules/clipboard/utility.c
index 197ed67fa..ae20f2432 100644
--- a/src/modules/clipboard/utility.c
+++ b/src/modules/clipboard/utility.c
@@ -1,4 +1,4 @@
-#include "utility.h"
+#include "e_mod_main.h"
#define TRIM_SPACES 0
#define TRIM_NEWLINES 1
diff --git a/src/modules/clipboard/utility.h b/src/modules/clipboard/utility.h
index 1a0466a67..2ab9dacb3 100644
--- a/src/modules/clipboard/utility.h
+++ b/src/modules/clipboard/utility.h
@@ -1,8 +1,7 @@
#ifndef CLIPBOARD_UTILITY_H
#define CLIPBOARD_UTILITY_H
-#include <string.h>
-#include <common.h>
+#include "e_mod_main.h"
Eina_Bool set_clip_content(char **content, char *text, int mode);
Eina_Bool set_clip_name(char **name, char *text, int mode, int n);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
