forked from enlightenment/enlightenment
parent
d29b65e819
commit
514ed5bad1
|
@ -8,6 +8,8 @@
|
|||
#include <Ecore.h>
|
||||
#include <E_DBus.h>
|
||||
|
||||
#include "log.h"
|
||||
|
||||
/* Ecore Events */
|
||||
extern int E_CONNMAN_EVENT_MANAGER_IN;
|
||||
extern int E_CONNMAN_EVENT_MANAGER_OUT;
|
||||
|
|
|
@ -25,7 +25,7 @@ module_la_SOURCES = e_mod_main.h \
|
|||
e_mod_main.c \
|
||||
e_mod_config.c \
|
||||
e_connman.c \
|
||||
e_connman_private.h \
|
||||
log.h \
|
||||
E_Connman.h
|
||||
|
||||
module_la_LIBADD = @e_libs@ @dlopen_libs@ @ECONNMAN_LIBS@
|
||||
|
|
|
@ -2,10 +2,11 @@
|
|||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include "e_connman_private.h"
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "E_Connman.h"
|
||||
|
||||
#define CONNMAN_BUS_NAME "net.connman"
|
||||
#define CONNMAN_MANAGER_IFACE CONNMAN_BUS_NAME ".Manager"
|
||||
|
||||
|
@ -27,8 +28,6 @@ static E_DBus_Connection *conn;
|
|||
EAPI int E_CONNMAN_EVENT_MANAGER_IN;
|
||||
EAPI int E_CONNMAN_EVENT_MANAGER_OUT;
|
||||
|
||||
int _e_dbus_connman_log_dom = -1;
|
||||
|
||||
static inline void
|
||||
_e_connman_system_name_owner_exit(void)
|
||||
{
|
||||
|
@ -124,15 +123,6 @@ e_connman_system_init(E_DBus_Connection *edbus_conn)
|
|||
if (init_count > 1)
|
||||
return init_count;
|
||||
|
||||
_e_dbus_connman_log_dom = eina_log_domain_register("e_dbus_connman",
|
||||
EINA_LOG_DEFAULT_COLOR);
|
||||
|
||||
if (_e_dbus_connman_log_dom < 0)
|
||||
{
|
||||
EINA_LOG_ERR("impossible to create a log domain for edbus_connman module");
|
||||
return -1;
|
||||
}
|
||||
|
||||
E_CONNMAN_EVENT_MANAGER_IN = ecore_event_type_new();
|
||||
E_CONNMAN_EVENT_MANAGER_OUT = ecore_event_type_new();
|
||||
|
||||
|
@ -182,7 +172,6 @@ e_connman_system_shutdown(void)
|
|||
|
||||
memset(&handlers, 0, sizeof(handlers));
|
||||
|
||||
eina_log_domain_unregister(_e_dbus_connman_log_dom);
|
||||
conn = NULL;
|
||||
|
||||
E_CONNMAN_EVENT_MANAGER_OUT = 0;
|
||||
|
|
|
@ -1,21 +1,10 @@
|
|||
#include <stdio.h>
|
||||
#ifndef _E_CONNMAN_PRIVATE_H_
|
||||
#define _E_CONNMAN_PRIVATE_H_
|
||||
|
||||
#include <stdio.h>
|
||||
#include <Eina.h>
|
||||
#include <eina_safety_checks.h>
|
||||
|
||||
#include "E_Connman.h"
|
||||
|
||||
extern int _e_dbus_connman_log_dom;
|
||||
|
||||
#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(_e_dbus_connman_log_dom, __VA_ARGS__)
|
||||
#define INF(...) EINA_LOG_DOM_INFO(_e_dbus_connman_log_dom, __VA_ARGS__)
|
||||
#define WRN(...) EINA_LOG_DOM_WARN(_e_dbus_connman_log_dom, __VA_ARGS__)
|
||||
#define ERR(...) EINA_LOG_DOM_ERR(_e_dbus_connman_log_dom, __VA_ARGS__)
|
||||
|
|
|
@ -10,12 +10,6 @@
|
|||
#define MOD_CONF_VERSION 3
|
||||
|
||||
extern int _e_connman_log_dom;
|
||||
#undef DBG
|
||||
#undef WRN
|
||||
#undef ERR
|
||||
#define DBG(...) EINA_LOG_DOM_DBG(_e_connman_log_dom, __VA_ARGS__)
|
||||
#define WRN(...) EINA_LOG_DOM_WARN(_e_connman_log_dom, __VA_ARGS__)
|
||||
#define ERR(...) EINA_LOG_DOM_ERR(_e_connman_log_dom, __VA_ARGS__)
|
||||
|
||||
typedef struct E_Connman_Instance E_Connman_Instance;
|
||||
typedef struct E_Connman_Module_Context E_Connman_Module_Context;
|
||||
|
|
|
@ -0,0 +1,14 @@
|
|||
#ifndef _E_CONNMAN_LOG_H_
|
||||
#define _E_CONNMAN_LOG_H_
|
||||
|
||||
extern int _e_connman_log_dom;
|
||||
|
||||
#undef DBG
|
||||
#undef WRN
|
||||
#undef ERR
|
||||
|
||||
#define DBG(...) EINA_LOG_DOM_DBG(_e_connman_log_dom, __VA_ARGS__)
|
||||
#define WRN(...) EINA_LOG_DOM_WARN(_e_connman_log_dom, __VA_ARGS__)
|
||||
#define ERR(...) EINA_LOG_DOM_ERR(_e_connman_log_dom, __VA_ARGS__)
|
||||
|
||||
#endif
|
Loading…
Reference in New Issue