merge with master

diff --git a/packaging/org.tizen.calculator.spec b/packaging/org.tizen.calculator.spec
index b270a28..12e1af1 100644 (file)
--- a/packaging/org.tizen.calculator.spec
+++ b/packaging/org.tizen.calculator.spec
@@ -1,7 +1,7 @@
 #sbs-git:slp/apps/c/calculator calculator 0.1.3 3ce35911eff2a8f151a092f346ab7239d7d0658e
 %define PREFIX /usr/apps/org.tizen.calculator
 Name: org.tizen.calculator
-Version:    0.1.30
+Version:    0.1.31
 Release:    1
 Summary: SLP Calculator application
 URL: http://slp-source.sec.samsung.net

diff --git a/src/calculator_edje.c b/src/calculator_edje.c
index 9670bbf..bec0503 100644 (file)
--- a/src/calculator_edje.c
+++ b/src/calculator_edje.c
@@ -2656,6 +2656,9 @@ __calc_view_clear_clicked_cb(void *data, Evas_Object *obj, void *event_info)
        elm_entry_entry_set(ad->hist_area, "");
        elm_entry_entry_set(ad->input_entry, "");
        _calc_view_clear_histroy(ad->hist_area);
+       /* Set input entry as initial state */
+       _calc_entry_clear(ad->input_entry);
+       calculator_state = CALCULATOR_WAITING_INPUT;
        CALC_FUN_END();
 }