From a3dab23b61e569758bae06f274a2b173e3925d9e Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Fri, 14 Dec 2012 17:09:00 +0000 Subject: [PATCH] e17/evry: remove logging stuff from api.. SVN revision: 80973 --- src/modules/everything/e_mod_main.c | 12 ------------ src/modules/everything/evry_api.h | 19 +------------------ src/modules/everything/evry_plugin.c | 3 --- 3 files changed, 1 insertion(+), 33 deletions(-) diff --git a/src/modules/everything/e_mod_main.c b/src/modules/everything/e_mod_main.c index de1a94d1c..76e2dcc39 100644 --- a/src/modules/everything/e_mod_main.c +++ b/src/modules/everything/e_mod_main.c @@ -17,7 +17,6 @@ static const char *module_icon = NULL; static E_Config_DD *conf_edd = NULL; static E_Config_DD *plugin_conf_edd = NULL; static E_Config_DD *gadget_conf_edd = NULL; -static int _e_module_evry_log_dom = -1; Evry_API *evry = NULL; Evry_Config *evry_conf = NULL; @@ -38,16 +37,6 @@ e_modapi_init(E_Module *m) Evry_Module *em; char buf[4096]; - _e_module_evry_log_dom = eina_log_domain_register - ("e_module_everything", EINA_LOG_DEFAULT_COLOR); - - if (_e_module_evry_log_dom < 0) - { - EINA_LOG_ERR - ("impossible to create a log domain for everything module"); - return NULL; - } - _mod_evry = m; /* add module supplied action */ @@ -94,7 +83,6 @@ e_modapi_init(E_Module *m) _evry_events[EVRY_EVENT_PLUGIN_SELECTED] = ecore_event_type_new(); evry = E_NEW(Evry_API, 1); - evry->log_dom = _e_module_evry_log_dom; #define SET(func) (evry->func = &evry_##func); SET(api_version_check); SET(item_new); diff --git a/src/modules/everything/evry_api.h b/src/modules/everything/evry_api.h index 07d9c2f46..1b83e00c4 100644 --- a/src/modules/everything/evry_api.h +++ b/src/modules/everything/evry_api.h @@ -3,7 +3,7 @@ #include "evry_types.h" -#define EVRY_API_VERSION 30 +#define EVRY_API_VERSION 31 #define EVRY_ACTION_OTHER 0 #define EVRY_ACTION_FINISHED 1 @@ -120,8 +120,6 @@ struct _Evry_API int (*history_item_usage_set)(Evry_Item *it, const char *input, const char *ctxt); Ecore_Event_Handler *(*event_handler_add)(int type, Eina_Bool (*func) (void *data, int type, void *event), const void *data); - - int log_dom; }; struct _Evry_Event_Item_Changed @@ -303,19 +301,4 @@ struct _Evry_Event_Action_Performed } while (0) - -#ifndef EINA_LOG_DEFAULT_COLOR -#define EINA_LOG_DEFAULT_COLOR EINA_COLOR_CYAN -#endif - -#undef DBG -#undef INF -#undef WRN -#undef ERR - -#define DBG(...) EINA_LOG_DOM_DBG(evry->log_dom , __VA_ARGS__) -#define INF(...) EINA_LOG_DOM_INFO(evry->log_dom , __VA_ARGS__) -#define WRN(...) EINA_LOG_DOM_WARN(evry->log_dom , __VA_ARGS__) -#define ERR(...) EINA_LOG_DOM_ERR(evry->log_dom , __VA_ARGS__) - #endif diff --git a/src/modules/everything/evry_plugin.c b/src/modules/everything/evry_plugin.c index 9972b3bc3..8e9cbedce 100644 --- a/src/modules/everything/evry_plugin.c +++ b/src/modules/everything/evry_plugin.c @@ -33,7 +33,6 @@ _evry_plugin_free(Evry_Item *it) evry_plugin_unregister(p); - DBG("%s", p->name); if (p->config) p->config->plugin = NULL; if (p->name) eina_stringshare_del(p->name); @@ -203,8 +202,6 @@ evry_plugin_unregister(Evry_Plugin *p) { Eina_List *l = evry_conf->conf_subjects; - DBG("%s", p->name); - if (l && eina_list_data_find_list(l, p->config)) { char buf[256];