e_info: code clean up of deiconify_approve option

option change from [0/1] to [on/off/show] and, clean up inner logic

Change-Id: I6986c0e54d070fb653f1ffa535ff82e91202cecb

diff --git a/src/bin/e_info_client.c b/src/bin/e_info_client.c
index 2612bc02b5bbfbf9845bc4e9d66bf1d3a3c14e4c..79f5df5703d830d9eb616868254cbf4e9b0ae41d 100644 (file)
--- a/src/bin/e_info_client.c
+++ b/src/bin/e_info_client.c
@@ -4369,29 +4369,51 @@ finish:
 static void
 _e_info_client_proc_deiconify_approve(int argc, char **argv)
 {
-   int deiconify_approve_option = -1;
-   if ((argc != 3) || ((argv[2][0] != '0') && (argv[2][0] != '1')))
+   Eina_Bool res = EINA_FALSE;
+
+   EINA_SAFETY_ON_FALSE_GOTO((argc == 3), usage);
+   EINA_SAFETY_ON_FALSE_GOTO((!strcmp(argv[2], "on")) ||
+                             (!strcmp(argv[2], "off")) ||
+                             (!strcmp(argv[2], "show")), usage);
+
+   if (!strcmp(argv[2], "on"))
      {
-        _e_info_client_eldbus_message_with_args("deiconify_approve",
-                                                _e_info_client_cb_deiconify_approve,
-                                                "i",
-                                                2);
-        goto usage;
+        res = _e_info_client_eldbus_message_with_args("deiconify_approve",
+                                                      _e_info_client_cb_deiconify_approve,
+                                                      "i",
+                                                      1);
      }
-   else
+   else if (!strcmp(argv[2], "off"))
      {
-        deiconify_approve_option = atoi(argv[2]);
-        _e_info_client_eldbus_message_with_args("deiconify_approve",
-                                                _e_info_client_cb_deiconify_approve,
-                                                "i",
-                                                deiconify_approve_option);
-        goto finish;
+        res = _e_info_client_eldbus_message_with_args("deiconify_approve",
+                                                      _e_info_client_cb_deiconify_approve,
+                                                      "i",
+                                                      0);
+     }
+   else if (!strcmp(argv[2], "show"))
+     {
+        res = _e_info_client_eldbus_message_with_args("deiconify_approve",
+                                                      _e_info_client_cb_deiconify_approve,
+                                                      "i",
+                                                      2);
      }
+   else
+     goto usage;
+
+   EINA_SAFETY_ON_FALSE_GOTO(res, error);
+
+   return;
+
+error:
+   printf("Error occured while send send message\n\n");
 
 usage:
-   printf("Usage : %s %s [<0:off>/<1:on>]\n", argv[0], argv[1]);
+   printf("Usage : %s %s [on / off / show]\n\n"
+          "\t on : turn on deiconify_approve option\n"
+          "\t off : turn off deiconify_approve option\n"
+          "\t show : show deiconify_approve configuration\n",
+          argv[0], argv[1]);
 
-finish:
    return;
 }
 
@@ -4657,7 +4679,7 @@ static struct
    },
    {
       "deiconify_approve",
-      "[0:off / 1:on]",
+      "[on / off / show]",
       "set deiconify_approve configure",
       _e_info_client_proc_deiconify_approve
    },

diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c
index b071524743f6d4aba9a3fb23f9a8597d9fa8eb77..55ce60597d3ec9c32116b8ba5809cc531f1f1d9b 100644 (file)
--- a/src/bin/e_info_server.c
+++ b/src/bin/e_info_server.c
@@ -5290,12 +5290,12 @@ _e_info_server_cb_deiconify_approve(const Eldbus_Service_Interface *iface EINA_U
                 {
                    ec->exp_iconify.deiconify_update = msg_from_client;
                 }
-              snprintf(msg_to_client, sizeof(msg_to_client), "Successfully changed!  e_config->deiconify_approve : %d",
-                       e_config->deiconify_approve);
+              snprintf(msg_to_client, sizeof(msg_to_client), "Successfully changed!  e_config->deiconify_approve : %s",
+                       e_config->deiconify_approve ? "on" : "off");
               break;
            default:
-              snprintf(msg_to_client, sizeof(msg_to_client), "Not changed!  e_config->deiconify_approve : %d",
-                       e_config->deiconify_approve);
+              snprintf(msg_to_client, sizeof(msg_to_client), "Current option: e_config->deiconify_approve : %s",
+                       e_config->deiconify_approve ? "on" : "off");
               break;
           }
      }