Commit d1871edb authored by Anders Carlsson's avatar Anders Carlsson Committed by Anders Carlsson

Set program name before calling the pre-parse hooks.

2004-09-01  Anders Carlsson  <andersca@gnome.org>

	* glib/goption.c: (g_option_context_parse):
	Set program name before calling the pre-parse hooks.
parent 338d9495
2004-09-01 Anders Carlsson <andersca@gnome.org>
* glib/goption.c: (g_option_context_parse):
Set program name before calling the pre-parse hooks.
2004-09-01 Anders Carlsson <andersca@gnome.org>
* glib/goption.c: (g_option_context_free), (print_help),
......
2004-09-01 Anders Carlsson <andersca@gnome.org>
* glib/goption.c: (g_option_context_parse):
Set program name before calling the pre-parse hooks.
2004-09-01 Anders Carlsson <andersca@gnome.org>
* glib/goption.c: (g_option_context_free), (print_help),
......
2004-09-01 Anders Carlsson <andersca@gnome.org>
* glib/goption.c: (g_option_context_parse):
Set program name before calling the pre-parse hooks.
2004-09-01 Anders Carlsson <andersca@gnome.org>
* glib/goption.c: (g_option_context_free), (print_help),
......
2004-09-01 Anders Carlsson <andersca@gnome.org>
* glib/goption.c: (g_option_context_parse):
Set program name before calling the pre-parse hooks.
2004-09-01 Anders Carlsson <andersca@gnome.org>
* glib/goption.c: (g_option_context_free), (print_help),
......
2004-09-01 Anders Carlsson <andersca@gnome.org>
* glib/goption.c: (g_option_context_parse):
Set program name before calling the pre-parse hooks.
2004-09-01 Anders Carlsson <andersca@gnome.org>
* glib/goption.c: (g_option_context_free), (print_help),
......
......@@ -822,6 +822,24 @@ g_option_context_parse (GOptionContext *context,
gint i, j, k;
GList *list;
/* Set program name */
if (argc && argv)
{
gchar *prgname;
prgname = strrchr ((*argv)[0], G_DIR_SEPARATOR);
if (prgname)
prgname++;
else
prgname = (*argv)[0];
g_set_prgname (prgname);
}
else
{
g_set_prgname ("<unknown>");
}
/* Call pre-parse hooks */
list = context->groups;
while (list)
......@@ -847,16 +865,6 @@ g_option_context_parse (GOptionContext *context,
if (argc && argv)
{
gchar *prgname;
prgname = strrchr ((*argv)[0], G_DIR_SEPARATOR);
if (prgname)
prgname++;
else
prgname = (*argv)[0];
g_set_prgname (prgname);
for (i = 1; i < *argc; i++)
{
gchar *arg;
......@@ -1062,10 +1070,6 @@ g_option_context_parse (GOptionContext *context,
}
}
}
else
{
g_set_prgname ("<unknown>");
}
return TRUE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment