aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2006-02-04 05:03:47 +0800
committerChristian Persch <chpe@src.gnome.org>2006-02-04 05:03:47 +0800
commit224c497ea0ea71a25388133f3e433ac89316531f (patch)
tree0d812bd2211d9811c5909158b4d6906d34fe43c8 /src
parentf95ec1ca17aab420d465b653a1a849ade28217d8 (diff)
downloadgsoc2013-epiphany-224c497ea0ea71a25388133f3e433ac89316531f.tar
gsoc2013-epiphany-224c497ea0ea71a25388133f3e433ac89316531f.tar.gz
gsoc2013-epiphany-224c497ea0ea71a25388133f3e433ac89316531f.tar.bz2
gsoc2013-epiphany-224c497ea0ea71a25388133f3e433ac89316531f.tar.lz
gsoc2013-epiphany-224c497ea0ea71a25388133f3e433ac89316531f.tar.xz
gsoc2013-epiphany-224c497ea0ea71a25388133f3e433ac89316531f.tar.zst
gsoc2013-epiphany-224c497ea0ea71a25388133f3e433ac89316531f.zip
Free the option context on error too, and don't duplicate the
2006-02-03 Christian Persch <chpe@cvs.gnome.org> * src/ephy-main.c: (main): Free the option context on error too, and don't duplicate the private-instance option.
Diffstat (limited to 'src')
-rw-r--r--src/ephy-main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ephy-main.c b/src/ephy-main.c
index 176bbf66b..ce56277c5 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -86,8 +86,6 @@ static const GOptionEntry option_entries[] =
N_("Load the given session file"), N_("FILE") },
{ "add-bookmark", 't', 0, G_OPTION_ARG_STRING, &bookmark_url,
N_("Add a bookmark"), N_("URL") },
- { "private-instance", 0, 0, G_OPTION_ARG_NONE, &private_instance,
- N_("Start a private instance"), NULL },
{ G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_STRING_ARRAY, &extra_arguments,
"", "" },
{ NULL }
@@ -119,7 +117,7 @@ static GOptionEntry debug_option_entries[] =
{
{ "private-instance", 0, 0, G_OPTION_ARG_NONE, &private_instance,
"Start a private instance", NULL },
- { "profile", 'p', 0, G_OPTION_ARG_STRING, &profile_directory,
+ { "profile", 0, 0, G_OPTION_ARG_STRING, &profile_directory,
"Profile directory to use in the private instance (default: a newly created directory in tmpdir)", "DIR" },
{ "keep-profile", 0, 0, G_OPTION_ARG_NONE, &keep_profile_directory,
"Don't delete the profile directory on exit (default: delete the temp profile on exit)", NULL },
@@ -516,6 +514,8 @@ main (int argc,
if (!g_option_context_parse (option_context, &argc, &argv, &error))
{
+ g_option_context_free (option_context);
+
g_print ("%s\n", error->message);
g_error_free (error);
exit (1);