commit 87149bc48ea406b411005ca1ef75a2d4b664344a
parent d6b7ae3768301940910f32a84eef644a80cd5fbc
Author: Kyle Milz <kmilz@ucalgary.ca>
Date: Sun, 13 Jan 2013 15:17:58 -0700
main: nuke ecore_options parsing
Diffstat:
M | src/main.c | | | 34 | ++-------------------------------- |
1 file changed, 2 insertions(+), 32 deletions(-)
diff --git a/src/main.c b/src/main.c
@@ -69,23 +69,6 @@ end:
return ECORE_CALLBACK_RENEW;
}
-static const Ecore_Getopt options = {
- PACKAGE_NAME,
- "%prog [options] [url]",
- PACKAGE_VERSION " Revision: ", // VREV,
- "(C) 2012 Kyle Milz",
- "GPL-2",
- "WebKit-EFL browser for full keyboard computers.",
- EINA_TRUE,
- {
- ECORE_GETOPT_VERSION('V', "version"),
- ECORE_GETOPT_COPYRIGHT('C', "copyright"),
- ECORE_GETOPT_LICENSE('L', "license"),
- ECORE_GETOPT_HELP('h', "help"),
- ECORE_GETOPT_SENTINEL
- }
-};
-
static Eina_Bool
session_restore(App_Data *ad)
{
@@ -360,24 +343,11 @@ elm_main(int argc, char *argv[])
Hist *hist;
Session *session;
size_t dirlen;
- int args;
Ecore_Timer *session_save_timer = NULL;
- Eina_Bool quit_option = EINA_FALSE;
Ecore_Con_Server *svr;
- Ecore_Getopt_Value values[] = {
- ECORE_GETOPT_VALUE_BOOL(quit_option),
- ECORE_GETOPT_VALUE_BOOL(quit_option),
- ECORE_GETOPT_VALUE_BOOL(quit_option),
- ECORE_GETOPT_VALUE_BOOL(quit_option),
- ECORE_GETOPT_VALUE_NONE
- };
-
- args = ecore_getopt_parse(&options, values, argc, argv);
- if (args < 0) ERR("Could not parse command line options.");
-
- if (args < argc)
- uri = uri_sanitize(argv[args]);
+ if (argc == 2)
+ uri = uri_sanitize(argv[1]);
ecore_con_init();
if ((svr = ecore_con_server_connect(ECORE_CON_LOCAL_USER, "viking", 0, NULL))) {