[Gaim-commits] SF.net SVN: gaim: [16959] trunk/console

[<sa...@us...>]

Revision: 16959
Author:   sadrul
Date:     2006-08-21 15:08:19 -0700 (Mon, 21 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16959&view=rev

Log Message:
-----------
Fix a bug where `gntgaim -v` does bad things to the terminal. Bug reported by Mark Schneider.

Modified Paths:
--------------
    trunk/console/gntdebug.c
    trunk/console/gntgaim.c
Modified: trunk/console/gntdebug.c
===================================================================
--- trunk/console/gntdebug.c	2006-08-21 21:35:38 UTC (rev 16958)
+++ trunk/console/gntdebug.c	2006-08-21 22:08:19 UTC (rev 16959)
@@ -106,11 +106,18 @@
 	gnt_widget_show(debug.window);
 }
 
+static gboolean
+start_with_debugwin(gpointer null)
+{
+	gg_debug_window_show();
+	return FALSE;
+}
+
 void gg_debug_init()
 {
 	g_set_print_handler(print_stderr);   /* Redirect the debug messages to stderr */
 	if (gaim_debug_is_enabled())
-		gg_debug_window_show();
+		g_timeout_add(0, start_with_debugwin, NULL);
 }
 
 void gg_debug_uninit()

Modified: trunk/console/gntgaim.c
===================================================================
--- trunk/console/gntgaim.c	2006-08-21 21:35:38 UTC (rev 16958)
+++ trunk/console/gntgaim.c	2006-08-21 22:08:19 UTC (rev 16959)
@@ -153,7 +153,6 @@
 		       "  -v, --version       display the current version and exit\n"), VERSION, name);
 	}
 
-	gnt_quit();
 	gaim_print_utf8_to_console(stdout, text);
 	g_free(text);
 }
@@ -305,8 +304,6 @@
 	/* XXX: Don't puke */
 	freopen(".error", "w", stderr);
 
-	gnt_init();
-
 	/* Initialize the libgaim stuff */
 	if (!init_libgaim(argc, argv))
 		return 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.