From 327f9bc68ff49b0839bc8a3cfa94586d6fc1fc02 Mon Sep 17 00:00:00 2001
From: Stephen 'Okra' Houston <smhouston88@gmail.com>
Date: Fri, 10 Feb 2017 11:37:30 -0600
Subject: [PATCH] Sysinfo gadgets: Prevent info popup from getting stuck.

---
 src/modules/sysinfo/batman/batman.c         | 15 +++------------
 src/modules/sysinfo/cpumonitor/cpumonitor.c |  6 +-----
 src/modules/sysinfo/memusage/memusage.c     | 10 ++--------
 src/modules/sysinfo/netstatus/netstatus.c   |  6 +-----
 4 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/src/modules/sysinfo/batman/batman.c b/src/modules/sysinfo/batman/batman.c
index db3befd0b..fcb7fdc24 100644
--- a/src/modules/sysinfo/batman/batman.c
+++ b/src/modules/sysinfo/batman/batman.c
@@ -89,7 +89,6 @@ _batman_popup_create(Instance *inst)
 
    frame = elm_frame_add(popup);
    E_EXPAND(frame); E_FILL(frame);
-   printf("%d\n", inst->cfg->batman.full);
    if (inst->cfg->batman.have_power && (inst->cfg->batman.full < 99))
      elm_object_text_set(frame, _("Battery Charging"));
    else if (inst->cfg->batman.full >= 99)
@@ -144,22 +143,14 @@ _batman_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNU
    if (ev->button != 3)
      {
         if (inst->cfg->batman.popup)
-          {
-             elm_ctxpopup_dismiss(inst->cfg->batman.popup);
-             inst->cfg->batman.popup = NULL;
-          }
+          elm_ctxpopup_dismiss(inst->cfg->batman.popup);
         else
-          {
-             inst->cfg->batman.popup = _batman_popup_create(inst);
-          }
+          inst->cfg->batman.popup = _batman_popup_create(inst);
      }
    else
      {
         if (inst->cfg->batman.popup)
-          {
-             elm_ctxpopup_dismiss(inst->cfg->batman.popup);
-             inst->cfg->batman.popup = NULL;
-          }
+          elm_ctxpopup_dismiss(inst->cfg->batman.popup);
         if (!sysinfo_config) return;
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
         if (inst->cfg->esm != E_SYSINFO_MODULE_BATMAN)
diff --git a/src/modules/sysinfo/cpumonitor/cpumonitor.c b/src/modules/sysinfo/cpumonitor/cpumonitor.c
index 38f89955d..3bda7f924 100644
--- a/src/modules/sysinfo/cpumonitor/cpumonitor.c
+++ b/src/modules/sysinfo/cpumonitor/cpumonitor.c
@@ -74,7 +74,6 @@ _cpumonitor_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA
         if (inst->cfg->cpumonitor.popup)
           {
              elm_ctxpopup_dismiss(inst->cfg->cpumonitor.popup);
-             inst->cfg->cpumonitor.popup = NULL;
              return;
           }
         popup = elm_ctxpopup_add(e_comp->elm);
@@ -106,10 +105,7 @@ _cpumonitor_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA
    else
      {
         if (inst->cfg->cpumonitor.popup)
-          {
-             elm_ctxpopup_dismiss(inst->cfg->cpumonitor.popup);
-             inst->cfg->cpumonitor.popup = NULL;
-          }
+          elm_ctxpopup_dismiss(inst->cfg->cpumonitor.popup);
         if (!sysinfo_config) return;
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
         if (inst->cfg->esm != E_SYSINFO_MODULE_CPUMONITOR)
diff --git a/src/modules/sysinfo/memusage/memusage.c b/src/modules/sysinfo/memusage/memusage.c
index cb987c022..129875723 100644
--- a/src/modules/sysinfo/memusage/memusage.c
+++ b/src/modules/sysinfo/memusage/memusage.c
@@ -239,10 +239,7 @@ _memusage_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_U
    if (ev->button != 3)
      {
         if (inst->cfg->memusage.popup)
-          {
-             elm_ctxpopup_dismiss(inst->cfg->memusage.popup);
-             inst->cfg->memusage.popup = NULL;
-          }
+          elm_ctxpopup_dismiss(inst->cfg->memusage.popup);
         else
           {
              inst->cfg->memusage.popup = _memusage_popup_create(inst);
@@ -252,10 +249,7 @@ _memusage_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_U
    else
      {
         if (inst->cfg->memusage.popup)
-          {
-             elm_ctxpopup_dismiss(inst->cfg->memusage.popup);
-             inst->cfg->memusage.popup = NULL;
-          }
+          elm_ctxpopup_dismiss(inst->cfg->memusage.popup);
         if (!sysinfo_config) return;
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
         if (inst->cfg->esm != E_SYSINFO_MODULE_MEMUSAGE)
diff --git a/src/modules/sysinfo/netstatus/netstatus.c b/src/modules/sysinfo/netstatus/netstatus.c
index eb4f2efa8..078b6b8c2 100644
--- a/src/modules/sysinfo/netstatus/netstatus.c
+++ b/src/modules/sysinfo/netstatus/netstatus.c
@@ -75,7 +75,6 @@ _netstatus_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_
         if (inst->cfg->netstatus.popup)
           {
              elm_ctxpopup_dismiss(inst->cfg->netstatus.popup);
-             inst->cfg->netstatus.popup = NULL;
              return;
           }
         popup = elm_ctxpopup_add(e_comp->elm);
@@ -99,10 +98,7 @@ _netstatus_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_
    else
      {
         if (inst->cfg->netstatus.popup)
-          {
-             elm_ctxpopup_dismiss(inst->cfg->netstatus.popup);
-             inst->cfg->netstatus.popup = NULL;
-          }
+          elm_ctxpopup_dismiss(inst->cfg->netstatus.popup);
         if (!sysinfo_config) return;
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
         if (inst->cfg->esm != E_SYSINFO_MODULE_NETSTATUS)