callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow argument parsing in gtk without G_ENABLE_DEBUG being defined

Browse Source 
Wed Aug 19 00:11:14 1998  Tim Janik  <timj@gtk.org>

        * gtk/gtkmain.c (gtk_init): allow argument parsing in gtk without
        G_ENABLE_DEBUG being defined (specifically --gtk-module= and
        --g-fatal-warnings), noticed by miguel.
This commit is contained in:
Tim Janik 1998-08-18 22:22:22 +00:00 committed by Tim Janik
parent 49dfa78e74
commit 38db8d1951
8 changed files with 93 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Wed Aug 19 00:11:14 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): allow argument parsing in gtk without
G_ENABLE_DEBUG being defined (specifically --gtk-module= and
--g-fatal-warnings), noticed by miguel.
Tue Aug 18 17:54:40 1998 Tim Janik <timj@gtk.org> Tue Aug 18 17:54:40 1998 Tim Janik <timj@gtk.org>
* gtk/gtkrc.c (gtk_rc_parse_file): use g_get_current_dir() instead of * gtk/gtkrc.c (gtk_rc_parse_file): use g_get_current_dir() instead of

6
ChangeLog.pre-2-0
View File

@ -1,3 +1,9 @@
Wed Aug 19 00:11:14 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): allow argument parsing in gtk without
G_ENABLE_DEBUG being defined (specifically --gtk-module= and
--g-fatal-warnings), noticed by miguel.
Tue Aug 18 17:54:40 1998 Tim Janik <timj@gtk.org> Tue Aug 18 17:54:40 1998 Tim Janik <timj@gtk.org>
* gtk/gtkrc.c (gtk_rc_parse_file): use g_get_current_dir() instead of * gtk/gtkrc.c (gtk_rc_parse_file): use g_get_current_dir() instead of

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
Wed Aug 19 00:11:14 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): allow argument parsing in gtk without
G_ENABLE_DEBUG being defined (specifically --gtk-module= and
--g-fatal-warnings), noticed by miguel.
Tue Aug 18 17:54:40 1998 Tim Janik <timj@gtk.org> Tue Aug 18 17:54:40 1998 Tim Janik <timj@gtk.org>
* gtk/gtkrc.c (gtk_rc_parse_file): use g_get_current_dir() instead of * gtk/gtkrc.c (gtk_rc_parse_file): use g_get_current_dir() instead of

6
ChangeLog.pre-2-2
View File

@ -1,3 +1,9 @@
Wed Aug 19 00:11:14 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): allow argument parsing in gtk without
G_ENABLE_DEBUG being defined (specifically --gtk-module= and
--g-fatal-warnings), noticed by miguel.
Tue Aug 18 17:54:40 1998 Tim Janik <timj@gtk.org> Tue Aug 18 17:54:40 1998 Tim Janik <timj@gtk.org>
* gtk/gtkrc.c (gtk_rc_parse_file): use g_get_current_dir() instead of * gtk/gtkrc.c (gtk_rc_parse_file): use g_get_current_dir() instead of

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
Wed Aug 19 00:11:14 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): allow argument parsing in gtk without
G_ENABLE_DEBUG being defined (specifically --gtk-module= and
--g-fatal-warnings), noticed by miguel.
Tue Aug 18 17:54:40 1998 Tim Janik <timj@gtk.org> Tue Aug 18 17:54:40 1998 Tim Janik <timj@gtk.org>
* gtk/gtkrc.c (gtk_rc_parse_file): use g_get_current_dir() instead of * gtk/gtkrc.c (gtk_rc_parse_file): use g_get_current_dir() instead of

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
Wed Aug 19 00:11:14 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): allow argument parsing in gtk without
G_ENABLE_DEBUG being defined (specifically --gtk-module= and
--g-fatal-warnings), noticed by miguel.
Tue Aug 18 17:54:40 1998 Tim Janik <timj@gtk.org> Tue Aug 18 17:54:40 1998 Tim Janik <timj@gtk.org>
* gtk/gtkrc.c (gtk_rc_parse_file): use g_get_current_dir() instead of * gtk/gtkrc.c (gtk_rc_parse_file): use g_get_current_dir() instead of

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
Wed Aug 19 00:11:14 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c (gtk_init): allow argument parsing in gtk without
G_ENABLE_DEBUG being defined (specifically --gtk-module= and
--g-fatal-warnings), noticed by miguel.
Tue Aug 18 17:54:40 1998 Tim Janik <timj@gtk.org> Tue Aug 18 17:54:40 1998 Tim Janik <timj@gtk.org>
* gtk/gtkrc.c (gtk_rc_parse_file): use g_get_current_dir() instead of * gtk/gtkrc.c (gtk_rc_parse_file): use g_get_current_dir() instead of

101
gtk/gtkmain.c
View File

@ -260,6 +260,7 @@ gtk_init (int *argc,
gtk_debug_keys, gtk_debug_keys,
gtk_ndebug_keys); gtk_ndebug_keys);
} }
#endif /* G_ENABLE_DEBUG */
if (argc && argv) if (argc && argv)
{ {
@ -267,55 +268,13 @@ gtk_init (int *argc,
for (i = 1; i < *argc;) for (i = 1; i < *argc;)
{ {
if ((strcmp ("--gtk-debug", (*argv)[i]) == 0) || if (strcmp ("--gtk-module", (*argv)[i]) == 0 ||
(strncmp ("--gtk-debug=", (*argv)[i], 12) == 0)) strncmp ("--gtk-module=", (*argv)[i], 13) == 0)
{
gchar *equal_pos = strchr ((*argv)[i], '=');
if (equal_pos != NULL)
{
gtk_debug_flags |= g_parse_debug_string (equal_pos+1,
gtk_debug_keys,
gtk_ndebug_keys);
}
else if ((i + 1) < *argc && (*argv)[i + 1])
{
gtk_debug_flags |= g_parse_debug_string ((*argv)[i+1],
gtk_debug_keys,
gtk_ndebug_keys);
(*argv)[i] = NULL;
i += 1;
}
(*argv)[i] = NULL;
}
else if ((strcmp ("--gtk-no-debug", (*argv)[i]) == 0) ||
(strncmp ("--gtk-no-debug=", (*argv)[i], 15) == 0))
{
gchar *equal_pos = strchr ((*argv)[i], '=');
if (equal_pos != NULL)
{
gtk_debug_flags &= ~g_parse_debug_string (equal_pos+1,
gtk_debug_keys,
gtk_ndebug_keys);
}
else if ((i + 1) < *argc && (*argv)[i + 1])
{
gtk_debug_flags &= ~g_parse_debug_string ((*argv)[i+1],
gtk_debug_keys,
gtk_ndebug_keys);
(*argv)[i] = NULL;
i += 1;
}
(*argv)[i] = NULL;
}
else if (strcmp ("--gtk-module", (*argv)[i]) == 0 ||
strncmp ("--gtk-module=", (*argv)[i], 13) == 0)
{ {
GModule *module = NULL; GModule *module = NULL;
GtkModuleInitFunc modinit_func = NULL; GtkModuleInitFunc modinit_func = NULL;
gchar *module_name = (*argv)[i] + 12; gchar *module_name = (*argv)[i] + 12;
if (*module_name == '=') if (*module_name == '=')
module_name++; module_name++;
else else
@ -362,15 +321,59 @@ gtk_init (int *argc,
else if (strcmp ("--g-fatal-warnings", (*argv)[i]) == 0) else if (strcmp ("--g-fatal-warnings", (*argv)[i]) == 0)
{ {
GLogLevelFlags fatal_mask; GLogLevelFlags fatal_mask;
fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK); fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK);
fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL; fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL;
g_log_set_always_fatal (fatal_mask); g_log_set_always_fatal (fatal_mask);
(*argv)[i] = NULL; (*argv)[i] = NULL;
} }
#ifdef G_ENABLE_DEBUG
else if ((strcmp ("--gtk-debug", (*argv)[i]) == 0) ||
(strncmp ("--gtk-debug=", (*argv)[i], 12) == 0))
{
gchar *equal_pos = strchr ((*argv)[i], '=');
if (equal_pos != NULL)
{
gtk_debug_flags |= g_parse_debug_string (equal_pos+1,
gtk_debug_keys,
gtk_ndebug_keys);
}
else if ((i + 1) < *argc && (*argv)[i + 1])
{
gtk_debug_flags |= g_parse_debug_string ((*argv)[i+1],
gtk_debug_keys,
gtk_ndebug_keys);
(*argv)[i] = NULL;
i += 1;
}
(*argv)[i] = NULL;
}
else if ((strcmp ("--gtk-no-debug", (*argv)[i]) == 0) ||
(strncmp ("--gtk-no-debug=", (*argv)[i], 15) == 0))
{
gchar *equal_pos = strchr ((*argv)[i], '=');
if (equal_pos != NULL)
{
gtk_debug_flags &= ~g_parse_debug_string (equal_pos+1,
gtk_debug_keys,
gtk_ndebug_keys);
}
else if ((i + 1) < *argc && (*argv)[i + 1])
{
gtk_debug_flags &= ~g_parse_debug_string ((*argv)[i+1],
gtk_debug_keys,
gtk_ndebug_keys);
(*argv)[i] = NULL;
i += 1;
}
(*argv)[i] = NULL;
}
#endif /* G_ENABLE_DEBUG */
i += 1; i += 1;
} }
for (i = 1; i < *argc; i++) for (i = 1; i < *argc; i++)
{ {
for (k = i; k < *argc; k++) for (k = i; k < *argc; k++)
@ -386,9 +389,7 @@ gtk_init (int *argc,
} }
} }
} }
#endif /* G_ENABLE_DEBUG */
/* Check if there is a good chance the mb functions will handle things /* Check if there is a good chance the mb functions will handle things
* correctly - set if either mblen("\xc0", MB_CUR_MAX) == 1 in the * correctly - set if either mblen("\xc0", MB_CUR_MAX) == 1 in the
* C locale, or we're using X's mb functions. (-DX_LOCALE && locale != C) * C locale, or we're using X's mb functions. (-DX_LOCALE && locale != C)