# HG changeset patch
# User zas_
# Date 1211271275 0
# Node ID a3218946bd2d328757a702f16fe74fe6cdec7204
# Parent  bbe9cef644f880cff5bc8b70214ceaab47202114
Sort out log_printf() vs printf_term() mix up.

diff -r bbe9cef644f8 -r a3218946bd2d src/cache.c
--- a/src/cache.c	Tue May 20 07:52:49 2008 +0000
+++ b/src/cache.c	Tue May 20 08:14:35 2008 +0000
@@ -171,7 +171,7 @@
 
 	if (secure_close(ssi))
 		{
-		printf_term(_("error saving sim cache data: %s\nerror: %s\n"), cd->path,
+		log_printf(_("error saving sim cache data: %s\nerror: %s\n"), cd->path,
 			    secsave_strerror(secsave_errno));
 		return FALSE;
 		}
diff -r bbe9cef644f8 -r a3218946bd2d src/collect-io.c
--- a/src/collect-io.c	Tue May 20 07:52:49 2008 +0000
+++ b/src/collect-io.c	Tue May 20 08:14:35 2008 +0000
@@ -339,7 +339,7 @@
 	g_free(pathl);
 	if (!ssi)
 		{
-		printf_term(_("failed to open collection (write) \"%s\"\n"), path);
+		log_printf(_("failed to open collection (write) \"%s\"\n"), path);
 		return FALSE;
 		}
 
@@ -364,7 +364,7 @@
 
 	if (secure_close(ssi))
 		{
-		printf_term(_("error saving collection file: %s\nerror: %s\n"), path,
+		log_printf(_("error saving collection file: %s\nerror: %s\n"), path,
 			    secsave_strerror(secsave_errno));
 		return FALSE;
 		}
diff -r bbe9cef644f8 -r a3218946bd2d src/layout.c
--- a/src/layout.c	Tue May 20 07:52:49 2008 +0000
+++ b/src/layout.c	Tue May 20 08:14:35 2008 +0000
@@ -1979,7 +1979,7 @@
 		{
 		if (!gtk_window_parse_geometry(GTK_WINDOW(lw->window), geometry))
 			{
-			print_term(_("Invalid geometry\n"));
+			log_printf("%s", _("Invalid geometry\n"));
 			}
 		}
 
diff -r bbe9cef644f8 -r a3218946bd2d src/main.c
--- a/src/main.c	Tue May 20 07:52:49 2008 +0000
+++ b/src/main.c	Tue May 20 08:14:35 2008 +0000
@@ -375,7 +375,7 @@
 			else if (strcmp(cmd_line, "-v") == 0 ||
 				 strcmp(cmd_line, "--version") == 0)
 				{
-				log_printf("%s %s\n", GQ_APPNAME, VERSION);
+				printf_term("%s %s\n", GQ_APPNAME, VERSION);
 				exit(0);
 				}
 			else if (strcmp(cmd_line, "--alternate") == 0)
@@ -387,7 +387,7 @@
 			else if (strcmp(cmd_line, "-h") == 0 ||
 				 strcmp(cmd_line, "--help") == 0)
 				{
-				log_printf("%s %s\n", GQ_APPNAME, VERSION);
+				printf_term("%s %s\n", GQ_APPNAME, VERSION);
 				printf_term(_("Usage: %s [options] [path]\n\n"), GQ_APPNAME_LC);
 				print_term(_("valid options are:\n"));
 				print_term(_("  +t, --with-tools           force show of tools\n"));
@@ -536,11 +536,11 @@
 	buf = g_strconcat(homedir(), "/", path, NULL);
 	if (!isdir(buf))
 		{
-		printf_term(_("Creating %s dir:%s\n"), GQ_APPNAME, buf);
+		log_printf(_("Creating %s dir:%s\n"), GQ_APPNAME, buf);
 
 		if (!mkdir_utf8(buf, 0755))
 			{
-			printf_term(_("Could not create dir:%s\n"), buf);
+			log_printf(_("Could not create dir:%s\n"), buf);
 			}
 		}
 	g_free(buf);
@@ -748,11 +748,11 @@
 	if (gtk_major_version < GTK_MAJOR_VERSION ||
 	    (gtk_major_version == GTK_MAJOR_VERSION && gtk_minor_version < GTK_MINOR_VERSION) )
 		{
-		printf_term("!!! This is a friendly warning.\n");
-		printf_term("!!! The version of GTK+ in use now is older than when %s was compiled.\n", GQ_APPNAME);
-		printf_term("!!!  compiled with GTK+-%d.%d\n", GTK_MAJOR_VERSION, GTK_MINOR_VERSION);
-		printf_term("!!!   running with GTK+-%d.%d\n", gtk_major_version, gtk_minor_version);
-		printf_term("!!! %s may quit unexpectedly with a relocation error.\n", GQ_APPNAME);
+		log_printf("!!! This is a friendly warning.\n");
+		log_printf("!!! The version of GTK+ in use now is older than when %s was compiled.\n", GQ_APPNAME);
+		log_printf("!!!  compiled with GTK+-%d.%d\n", GTK_MAJOR_VERSION, GTK_MINOR_VERSION);
+		log_printf("!!!   running with GTK+-%d.%d\n", gtk_major_version, gtk_minor_version);
+		log_printf("!!! %s may quit unexpectedly with a relocation error.\n", GQ_APPNAME);
 		}
 
 	check_for_home_path(GQ_RC_DIR);
diff -r bbe9cef644f8 -r a3218946bd2d src/rcfile.c
--- a/src/rcfile.c	Tue May 20 07:52:49 2008 +0000
+++ b/src/rcfile.c	Tue May 20 08:14:35 2008 +0000
@@ -306,7 +306,7 @@
 	g_free(rc_pathl);
 	if (!ssi)
 		{
-		printf_term(_("error saving config file: %s\n"), rc_path);
+		log_printf(_("error saving config file: %s\n"), rc_path);
 		g_free(rc_path);
 		return;
 		}
@@ -583,7 +583,7 @@
 
 
 	if (secure_close(ssi))
-		printf_term(_("error saving config file: %s\nerror: %s\n"), rc_path,
+		log_printf(_("error saving config file: %s\nerror: %s\n"), rc_path,
 			    secsave_strerror(secsave_errno));
 
 	g_free(rc_path);
diff -r bbe9cef644f8 -r a3218946bd2d src/thumb.c
--- a/src/thumb.c	Tue May 20 07:52:49 2008 +0000
+++ b/src/thumb.c	Tue May 20 08:14:35 2008 +0000
@@ -378,7 +378,7 @@
 		if (tl->cache_hit)
 			{
 			tl->cache_hit = FALSE;
-			print_term(_("Thumbnail image in cache failed to load, trying to recreate.\n"));
+			log_printf("%s", _("Thumbnail image in cache failed to load, trying to recreate.\n"));
 
 			thumb_loader_setup(tl, tl->path);
 			if (image_loader_start(tl->il, thumb_loader_done_cb, tl)) return TRUE;
diff -r bbe9cef644f8 -r a3218946bd2d src/ui_bookmark.c
--- a/src/ui_bookmark.c	Tue May 20 07:52:49 2008 +0000
+++ b/src/ui_bookmark.c	Tue May 20 08:14:35 2008 +0000
@@ -147,7 +147,7 @@
 	g_free(pathl);
 	if (!ssi)
 		{
-		printf_term(_("Unable to write history lists to: %s\n"), path);
+		log_printf(_("Unable to write history lists to: %s\n"), path);
 		return FALSE;
 		}