summaryrefslogtreecommitdiff
path: root/gdk/gdk.c
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2003-08-01 19:28:19 +0000
committerOwen Taylor <otaylor@src.gnome.org>2003-08-01 19:28:19 +0000
commit4fbca22e4a81c570a86765ee3375fe22a80806bb (patch)
tree32891820d40af9153c490716b1956e4d38b8a34c /gdk/gdk.c
parentf47431b226d5fc65541accc7b22f34c1bbfc7b4d (diff)
downloadgtk+-4fbca22e4a81c570a86765ee3375fe22a80806bb.tar.gz
g_set_prgname("<unknown>") if argc is 0 as well, instead of leaving it
Fri Aug 1 15:06:25 2003 Owen Taylor <otaylor@redhat.com> * gdk/gdk.c (gdk_parse_args): g_set_prgname("<unknown>") if argc is 0 as well, instead of leaving it unset. (#116023, Michael Meeks)
Diffstat (limited to 'gdk/gdk.c')
-rw-r--r--gdk/gdk.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/gdk/gdk.c b/gdk/gdk.c
index 87d12ea469..0835aba512 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -103,7 +103,6 @@ gdk_arg_context_parse (GdkArgContext *context, gint *argc, gchar ***argv)
{
int i, j, k;
- /* Save a copy of the original argc and argv */
if (argc && argv)
{
for (i = 1; i < *argc; i++)
@@ -294,6 +293,7 @@ gdk_parse_args (int *argc,
gdk_initialized = TRUE;
+ /* Save a copy of the original argc and argv */
if (argc && argv)
{
gdk_argc = *argc;
@@ -302,17 +302,17 @@ gdk_parse_args (int *argc,
for (i = 0; i < gdk_argc; i++)
gdk_argv[i] = g_strdup ((*argv)[i]);
gdk_argv[gdk_argc] = NULL;
+ }
- if (*argc > 0)
- {
- gchar *d;
-
- d = strrchr((*argv)[0], G_DIR_SEPARATOR);
- if (d != NULL)
- g_set_prgname (d + 1);
- else
- g_set_prgname ((*argv)[0]);
- }
+ if (argc && argv && *argc > 0)
+ {
+ gchar *d;
+
+ d = strrchr((*argv)[0], G_DIR_SEPARATOR);
+ if (d != NULL)
+ g_set_prgname (d + 1);
+ else
+ g_set_prgname ((*argv)[0]);
}
else
{