Author: cazfi
Date: Sat Nov 19 19:00:37 2016
New Revision: 34578
URL: http://svn.gna.org/viewcvs/freeciv?rev=34578&view=rev
Log:
Removed silencing of gtk warning logs from gtk3.22-client.
See patch #8003
Modified:
branches/S2_6/client/gui-gtk-3.22/gui_main.c
branches/S2_6/doc/man/freeciv-client.6.in
Modified: branches/S2_6/client/gui-gtk-3.22/gui_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.22/gui_main.c?rev=34578&r1=34577&r2=34578&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.22/gui_main.c (original)
+++ branches/S2_6/client/gui-gtk-3.22/gui_main.c Sat Nov 19 19:00:37 2016
@@ -282,10 +282,6 @@
_("Other gui-specific options are:\n"));
fc_fprintf(stderr,
- _("-g, --gtk-warnings\tAllow Gtk+ to print warnings "
- "to console\n"));
-
- fc_fprintf(stderr,
_("-r, --resolution WIDTHxHEIGHT\tAssume given resolution "
"screen\n"));
@@ -303,23 +299,12 @@
}
/**************************************************************************
- Dummy gtk error printer
-**************************************************************************/
-static void log_gtk_warns(const gchar *log_domain, GLogLevelFlags log_level,
- const gchar *message,
- gpointer user_data)
-{
- log_verbose("%s", message);
-}
-
-/**************************************************************************
Search for command line options. right now, it's just help
semi-useless until we have options that aren't the same across all clients.
**************************************************************************/
static void parse_options(int argc, char **argv)
{
int i = 1;
- bool gtk_warns_enabled = FALSE;
while (i < argc) {
char *option = NULL;
@@ -327,8 +312,6 @@
if (is_option("--help", argv[i])) {
print_usage();
exit(EXIT_SUCCESS);
- } else if (is_option("--gtk-warnings", argv[i])) {
- gtk_warns_enabled = TRUE;
#ifdef GTK3_ZOOM_ENABLED
} else if ((option = get_option_malloc("--zoom", argv, &i, argc, FALSE))) {
@@ -353,10 +336,6 @@
/* Can't check against unknown options, as those might be gtk options */
i++;
- }
-
- if (!gtk_warns_enabled) {
- g_log_set_handler("Gtk", G_LOG_LEVEL_WARNING, log_gtk_warns, NULL);
}
}
Modified: branches/S2_6/doc/man/freeciv-client.6.in
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/man/freeciv-client.6.in?rev=34578&r1=34577&r2=34578&view=diff
==============================================================================
--- branches/S2_6/doc/man/freeciv-client.6.in (original)
+++ branches/S2_6/doc/man/freeciv-client.6.in Sat Nov 19 19:00:37 2016
@@ -49,8 +49,7 @@
.B freeciv-gtk3.22
accepts the standard Gtk parameters following \fB\-\-\fP; see the Gtk
documentation. It also accepts
-.B [ \-g|\-\-gtk-warnings ] \
-[ \-h|\-\-help ] \
+.B[ \-h|\-\-help ] \
[ \-r|\-\-resolution \fIWIDTHxHEIGHT\fP ]
.B freeciv-qt
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
