So far we only had a nice count down until we would restore but we never
restored. Calling the restore function now it countdown is at zero.

Not sure if function re-ordering or declaration is preferred here. Just added a
declaration as some others exist already.

Signed-off-by: Stefan Schmidt <ste...@datenfreihafen.org>
---
 e/src/modules/conf_randr/e_int_config_randr.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/e/src/modules/conf_randr/e_int_config_randr.c 
b/e/src/modules/conf_randr/e_int_config_randr.c
index 0f7247b..6073229 100644
--- a/e/src/modules/conf_randr/e_int_config_randr.c
+++ b/e/src/modules/conf_randr/e_int_config_randr.c
@@ -80,6 +80,8 @@ extern void         
dialog_subdialog_orientation_update_edje(Evas_Object *crtc);
 extern void         
dialog_subdialog_orientation_keep_changes(E_Config_Dialog_Data *cfdata);
 extern void         
dialog_subdialog_orientation_discard_changes(E_Config_Dialog_Data *cfdata);
 
+static void _e_conf_randr_confirmation_dialog_discard_cb(void *data, E_Dialog 
*dia);
+
 /* actual module specifics */
 E_Config_Dialog_Data *e_config_runtime_info = NULL;
 extern E_Module *conf_randr_module;
@@ -182,7 +184,12 @@ _e_conf_randr_confirmation_dialog_timer_cb(void *data)
 
    e_dialog_text_set(cdd->dialog, buf);
 
-   return (cdd->countdown > 0) ? ECORE_CALLBACK_RENEW : ECORE_CALLBACK_CANCEL;
+   if (cdd->countdown == 0)
+      {
+         _e_conf_randr_confirmation_dialog_discard_cb(cdd, cdd->dialog);
+         return ECORE_CALLBACK_CANCEL;
+      }
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
-- 
1.7.7.3


------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure 
contains a definitive record of customers, application performance, 
security threats, fraudulent activity, and more. Splunk takes this 
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Reply via email to