From b76275032c0708eba3cecc7ae79e85bb453b16fe Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 17 Jun 2013 09:03:21 +0100 Subject: [PATCH] add global flag to show if teamwork media popup was forced --- src/modules/teamwork/e_mod_main.h | 1 + src/modules/teamwork/e_mod_tw.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/modules/teamwork/e_mod_main.h b/src/modules/teamwork/e_mod_main.h index 679447c30..40b622fce 100644 --- a/src/modules/teamwork/e_mod_main.h +++ b/src/modules/teamwork/e_mod_main.h @@ -35,6 +35,7 @@ typedef struct Mod Eina_Hash *media; E_Popup *pop; Eina_Bool sticky : 1; + Eina_Bool force : 1; } Mod; extern Teamwork_Config *tw_config; diff --git a/src/modules/teamwork/e_mod_tw.c b/src/modules/teamwork/e_mod_tw.c index 2c870c27b..71cb3b13a 100644 --- a/src/modules/teamwork/e_mod_tw.c +++ b/src/modules/teamwork/e_mod_tw.c @@ -353,6 +353,7 @@ dbus_link_show_helper(const char *uri, Eina_Bool signal_open) break; } } + if (tw_mod->pop) tw_mod->force = signal_open; } static Eldbus_Message * @@ -376,7 +377,10 @@ dbus_link_hide_cb(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbu if (eldbus_message_arguments_get(msg, "s", &uri)) { if (tw_mod->pop && (!tw_mod->sticky) && (!e_util_strcmp(e_object_data_get(E_OBJECT(tw_mod->pop)), uri))) - tw_hide(NULL); + { + tw_hide(NULL); + tw_mod->force = 0; + } } return eldbus_message_method_return_new(msg); } @@ -409,6 +413,7 @@ dbus_link_mouse_out_cb(const Eldbus_Service_Interface *iface EINA_UNUSED, const } else tw_hide(NULL); + tw_mod->force = 0; } } return eldbus_message_method_return_new(msg);