Sort out log_printf() vs printf_term() mix up.

diff --git a/src/cache.c b/src/cache.c
index ffbbc82..346df24 100644 (file)
--- a/src/cache.c
+++ b/src/cache.c
@@ -171,7 +171,7 @@ gint cache_sim_data_save(CacheData *cd)
 
        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 --git a/src/collect-io.c b/src/collect-io.c
index f3ba47c..478c6c5 100644 (file)
--- a/src/collect-io.c
+++ b/src/collect-io.c
@@ -339,7 +339,7 @@ static gint collection_save_private(CollectionData *cd, const gchar *path)
        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 @@ static gint collection_save_private(CollectionData *cd, const gchar *path)
 
        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 --git a/src/layout.c b/src/layout.c
index d1154bd..23c1a50 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -1979,7 +1979,7 @@ LayoutWindow *layout_new_with_geometry(const gchar *path, gint popped, gint hidd
                {
                if (!gtk_window_parse_geometry(GTK_WINDOW(lw->window), geometry))
                        {
-                       print_term(_("Invalid geometry\n"));
+                       log_printf("%s", _("Invalid geometry\n"));
                        }
                }
 

diff --git a/src/main.c b/src/main.c
index f9a4b13..cfee23f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -375,7 +375,7 @@ static void parse_command_line(int argc, char *argv[], gchar **path, gchar **fil
                        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 @@ static void parse_command_line(int argc, char *argv[], gchar **path, gchar **fil
                        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 @@ static void check_for_home_path(gchar *path)
        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 @@ int main(int argc, char *argv[])
        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 --git a/src/rcfile.c b/src/rcfile.c
index a921ecd..e47063a 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -306,7 +306,7 @@ void save_options(void)
        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 @@ void save_options(void)
 
 
        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 --git a/src/thumb.c b/src/thumb.c
index a2a992b..9691a1a 100644 (file)
--- a/src/thumb.c
+++ b/src/thumb.c
@@ -378,7 +378,7 @@ gint thumb_loader_start(ThumbLoader *tl, const gchar *path)
                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 --git a/src/ui_bookmark.c b/src/ui_bookmark.c
index dff3723..90ac068 100644 (file)
--- a/src/ui_bookmark.c
+++ b/src/ui_bookmark.c
@@ -147,7 +147,7 @@ gint history_list_save(const gchar *path)
        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;
                }