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 2a8becdb86ddf73be466b092b4181c8e8bde0108
Author: Carsten Haitzler <[email protected]>
AuthorDate: Mon Jan 5 19:49:51 2026 +0000
clipboard - remove custom logger
---
src/modules/clipboard/clip_log.c | 81 --------------------------------------
src/modules/clipboard/clip_log.h | 24 -----------
src/modules/clipboard/common.h | 4 +-
src/modules/clipboard/e_mod_main.c | 11 ------
src/modules/clipboard/meson.build | 2 -
5 files changed, 1 insertion(+), 121 deletions(-)
diff --git a/src/modules/clipboard/clip_log.c b/src/modules/clipboard/clip_log.c
deleted file mode 100644
index ca9122cf6..000000000
--- a/src/modules/clipboard/clip_log.c
+++ /dev/null
@@ -1,81 +0,0 @@
-#include "e.h"
-#include "clip_log.h"
-#include "e_mod_main.h"
-
-// XXX: nuke this - no custom log
-
-/* The fn cb_mod_log was adapted from Elive's e17 module productivity.
- * https://github.com/Elive/emodule-productivity
- * Thanks to princeamd for implementing this.
- *
- * The MIT License:
- * https://opensource.org/licenses/MIT
- */
-int clipboard_log = -1;
-
-Eina_Bool
-logger_init(char *package)
-{
- if (clipboard_log < 0)
- {
- clip_cfg->log_name = eina_stringshare_add(package);
- clipboard_log = eina_log_domain_register(clip_cfg->log_name, EINA_COLOR_CYAN);
- if (clipboard_log < 0) {
- EINA_LOG_CRIT("Could not register log domain %s", package);
- return EINA_FALSE;
- }
- eina_log_domain_level_set(clip_cfg->log_name, EINA_LOG_LEVEL_DBG);
- }
- return EINA_TRUE;
-}
-
-int
-logger_shutdown(char *package)
-{
- Eina_Stringshare *temp;
-
- if ((temp = eina_stringshare_add(package))) eina_stringshare_del(temp);
-
- if (clipboard_log >= 0)
- {
- eina_log_domain_unregister(clipboard_log);
- clipboard_log = -1;
- }
- return clipboard_log;
-}
-
-void
-cb_mod_log(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file,
- const char *fnc, int line, const char *fmt, void *data EINA_UNUSED, va_list args)
-{
- if ((d->name) && (d->namelen == sizeof(clip_cfg->log_name) - 1) &&
- (memcmp(d->name, clip_cfg->log_name, sizeof(clip_cfg->log_name) - 1) == 0))
- {
- const char *prefix;
- Eina_Bool use_color = !eina_log_color_disable_get();
-
- if (use_color) fputs(eina_log_level_color_get(level), stderr);
-
- switch (level)
- {
- case EINA_LOG_LEVEL_CRITICAL:
- prefix = "Critical. ";
- break;
- case EINA_LOG_LEVEL_ERR:
- prefix = "Error. ";
- break;
- case EINA_LOG_LEVEL_WARN:
- prefix = "Warning. ";
- break;
- default:
- prefix = "";
- }
- fprintf(stderr, "%s: %s", "E_CLIPBOARD", prefix);
-
- if (use_color) fputs(EINA_COLOR_RESET, stderr);
-
- vfprintf(stderr, fmt, args);
- putc('\n', stderr);
- }
- else eina_log_print_cb_stderr(d, level, file, fnc, line, fmt, NULL, args);
-}
diff --git a/src/modules/clipboard/clip_log.h b/src/modules/clipboard/clip_log.h
deleted file mode 100644
index 1e9be0c46..000000000
--- a/src/modules/clipboard/clip_log.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef CLIP_LOG_H
-#define CLIP_LOG_H
-
-// XXX: nuke this custom log stuff
-
-extern int clipboard_log;
-
-// 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__)
-
-Eina_Bool logger_init(char *package);
-int logger_shutdown(char *package);
-void cb_mod_log(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args);
-
-#endif /* CLIP_LOG_H */
diff --git a/src/modules/clipboard/common.h b/src/modules/clipboard/common.h
index e42b9a214..b27814d35 100644
--- a/src/modules/clipboard/common.h
+++ b/src/modules/clipboard/common.h
@@ -1,10 +1,8 @@
#ifndef CLIPBOARD_COMMON_H
#define CLIPBOARD_COMMON_H
-#include <string.h>
-#include <e.h>
+#include "e.h"
#include "config.h"
-#include "clip_log.h"
#define MAGIC_LABEL_SIZE 50
#define MAGIC_HIST_SIZE 20
diff --git a/src/modules/clipboard/e_mod_main.c b/src/modules/clipboard/e_mod_main.c
index a28cb3af6..7859feced 100644
--- a/src/modules/clipboard/e_mod_main.c
+++ b/src/modules/clipboard/e_mod_main.c
@@ -1,11 +1,6 @@
-/* This is a test */
-
#include "e_mod_main.h"
#include "config_defaults.h"
#include "history.h"
-#include "clip_log.h"
-
-#define CLIP_LOG_NAME "MOD:CLIP"
/* Stuff for convenience to compress code */
#define CLIP_TRIM_MODE(x) (x->trim_nl + 2 * (x->trim_ws))
@@ -663,10 +658,6 @@ e_modapi_init(E_Module *m)
// If we don't have a config yet, or it got erased above,
// then create a default one
if (!clip_cfg) _clip_config_new(m);
-
- // Initialize Einna_log for developers
- logger_init(CLIP_LOG_NAME);
-
INF("Initialized Clipboard Module");
// add Module Key Binding actions
@@ -809,8 +800,6 @@ noconfig:
E_CONFIG_DD_FREE(conf_edd);
E_CONFIG_DD_FREE(conf_item_edd);
INF("Shutting down Clipboard Module");
- // shutdown Logger XXX: we dont need this!
- logger_shutdown(CLIP_LOG_NAME);
// tell e the module is now unloaded. Gets removed from shelves, etc.
e_gadcon_provider_unregister(&_gadcon_class);
return 1;
diff --git a/src/modules/clipboard/meson.build b/src/modules/clipboard/meson.build
index 9079ea058..721810f14 100644
--- a/src/modules/clipboard/meson.build
+++ b/src/modules/clipboard/meson.build
@@ -1,6 +1,4 @@
src = ""
- 'clip_log.c',
- 'clip_log.h',
'common.h',
'config_defaults.h',
'e_mod_config.c',
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
