diff options
author | Mike Blumenkrantz <zmike@osg.samsung.com> | 2016-05-24 16:18:26 -0400 |
---|---|---|
committer | Mike Blumenkrantz <zmike@osg.samsung.com> | 2016-05-25 12:57:26 -0400 |
commit | 33a5d44dcf36557b13aeba1088461504bae97373 (patch) | |
tree | 540b218cbc6ed753be0e87573a8bb31489223875 | |
parent | 11393cfee3a014ed4ae9bfe267bc76a8a6cc5c20 (diff) | |
download | efl-33a5d44dcf36557b13aeba1088461504bae97373.tar.gz |
elput: remove 'sync' param from device management
unnecessarily complicates code
-rw-r--r-- | src/lib/elput/Elput.h | 2 | ||||
-rw-r--r-- | src/lib/elput/elput_logind.c | 28 | ||||
-rw-r--r-- | src/lib/elput/elput_manager.c | 4 | ||||
-rw-r--r-- | src/lib/elput/elput_private.h | 4 |
4 files changed, 7 insertions, 31 deletions
diff --git a/src/lib/elput/Elput.h b/src/lib/elput/Elput.h index 6a4545d8cd..07ebfa2f97 100644 --- a/src/lib/elput/Elput.h +++ b/src/lib/elput/Elput.h @@ -168,7 +168,7 @@ EAPI int elput_shutdown(void); * @ingroup Elput_Manager_Group * @since 1.18 */ -EAPI Elput_Manager *elput_manager_connect(const char *seat, unsigned int tty, Eina_Bool sync); +EAPI Elput_Manager *elput_manager_connect(const char *seat, unsigned int tty); /** * Disconnect an input manager diff --git a/src/lib/elput/elput_logind.c b/src/lib/elput/elput_logind.c index 394fca5465..3beb8b4eae 100644 --- a/src/lib/elput/elput_logind.c +++ b/src/lib/elput/elput_logind.c @@ -103,7 +103,7 @@ _cb_device_paused(void *data, const Eldbus_Message *msg) if (!strcmp(type, "pause")) _logind_device_pause_complete(em, maj, min); - if ((em->sync) && (maj == 226)) // DRM_MAJOR + if (maj == 226) // DRM_MAJOR _logind_session_active_send(em, EINA_FALSE); } } @@ -125,29 +125,11 @@ _cb_device_resumed(void *data, const Eldbus_Message *msg) if (eldbus_message_arguments_get(msg, "u", &maj)) { - if ((em->sync) && (maj == 226)) // DRM_MAJOR + if (maj == 226) // DRM_MAJOR _logind_session_active_send(em, EINA_TRUE); } } -static void -_cb_property_changed(void *data, Eldbus_Proxy *proxy EINA_UNUSED, void *event) -{ - Elput_Manager *em; - Eldbus_Proxy_Event_Property_Changed *ev; - Eina_Bool active = EINA_FALSE; - - em = data; - ev = event; - - if (!strcmp(ev->name, "Active")) - { - eina_value_get(ev->value, &active); - if ((!em->sync) || (!active)) - _logind_session_active_send(em, active); - } -} - static Eina_Bool _logind_session_vt_get(const char *sid, unsigned int *vt) { @@ -239,9 +221,6 @@ _logind_dbus_setup(Elput_Manager *em) goto proxy_err; } - eldbus_proxy_properties_monitor(proxy, EINA_TRUE); - eldbus_proxy_event_callback_add(proxy, ELDBUS_PROXY_EVENT_PROPERTY_CHANGED, - _cb_property_changed, em); eldbus_proxy_unref(proxy); return EINA_TRUE; @@ -426,7 +405,7 @@ msg_err: } static Eina_Bool -_logind_connect(Elput_Manager **manager, const char *seat, unsigned int tty, Eina_Bool sync) +_logind_connect(Elput_Manager **manager, const char *seat, unsigned int tty) { Elput_Manager *em; int ret = 0; @@ -436,7 +415,6 @@ _logind_connect(Elput_Manager **manager, const char *seat, unsigned int tty, Ein if (!em) return EINA_FALSE; em->interface = &_logind_interface; - em->sync = sync; em->seat = eina_stringshare_add(seat); ret = sd_pid_get_session(getpid(), &em->sid); diff --git a/src/lib/elput/elput_manager.c b/src/lib/elput/elput_manager.c index 9145e9c434..b1378f55b0 100644 --- a/src/lib/elput/elput_manager.c +++ b/src/lib/elput/elput_manager.c @@ -35,7 +35,7 @@ _cb_key_down(void *data, int type EINA_UNUSED, void *event) } EAPI Elput_Manager * -elput_manager_connect(const char *seat, unsigned int tty, Eina_Bool sync) +elput_manager_connect(const char *seat, unsigned int tty) { Elput_Interface **it; @@ -45,7 +45,7 @@ elput_manager_connect(const char *seat, unsigned int tty, Eina_Bool sync) Elput_Manager *em; iface = *it; - if (iface->connect(&em, seat, tty, sync)) + if (iface->connect(&em, seat, tty)) return em; } diff --git a/src/lib/elput/elput_private.h b/src/lib/elput/elput_private.h index 1f6d6084d8..c2f4b007ea 100644 --- a/src/lib/elput/elput_private.h +++ b/src/lib/elput/elput_private.h @@ -68,7 +68,7 @@ typedef enum _Elput_Device_Capability typedef struct _Elput_Interface { - Eina_Bool (*connect)(Elput_Manager **manager, const char *seat, unsigned int tty, Eina_Bool sync); + Eina_Bool (*connect)(Elput_Manager **manager, const char *seat, unsigned int tty); void (*disconnect)(Elput_Manager *manager); int (*open)(Elput_Manager *manager, const char *path, int flags); void (*close)(Elput_Manager *manager, int fd); @@ -234,8 +234,6 @@ struct _Elput_Manager } dbus; Elput_Input input; - - Eina_Bool sync : 1; }; int _evdev_event_process(struct libinput_event *event); |