--- xsane.c.orig	2005-02-05 17:57:00 +0300
+++ src/xsane.c	2005-02-05 18:18:53 +0300
@@ -8548,10 +8548,10 @@
 
 static void xsane_usage(void)
 {
-  printf("XSane %s %s\n", TEXT_VERSION, XSANE_VERSION);
-  printf("%s %s\n\n", XSANE_COPYRIGHT_SIGN, XSANE_COPYRIGHT_TXT);
-  printf("%s %s %s\n\n", TEXT_USAGE, xsane.prog_name, TEXT_USAGE_OPTIONS);
-  printf("%s\n\n", TEXT_HELP);
+  g_print("XSane %s %s\n", TEXT_VERSION, XSANE_VERSION);
+  g_print("%s %s\n\n", XSANE_COPYRIGHT_SIGN, XSANE_COPYRIGHT_TXT);
+  g_print("%s %s %s\n\n", TEXT_USAGE, xsane.prog_name, TEXT_USAGE_OPTIONS);
+  g_print("%s\n\n", TEXT_HELP);
 }
 
 /* ---------------------------------------------------------------------------------------------------------------------- */
@@ -8628,49 +8628,49 @@
          break;
 
         case 'v': /* --version */
-          printf("%s-%s %s %s\n", xsane.prog_name, XSANE_VERSION, XSANE_COPYRIGHT_SIGN, XSANE_COPYRIGHT_TXT);
-          printf("  %s %s\n", TEXT_EMAIL, XSANE_EMAIL);
-          printf("  %s %s\n", TEXT_PACKAGE, XSANE_PACKAGE_VERSION);
-          printf("  %s%d.%d.%d\n", TEXT_GTK_VERSION, GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+          g_print("%s-%s %s %s\n", xsane.prog_name, XSANE_VERSION, XSANE_COPYRIGHT_SIGN, XSANE_COPYRIGHT_TXT);
+          g_print("  %s %s\n", TEXT_EMAIL, XSANE_EMAIL);
+          g_print("  %s %s\n", TEXT_PACKAGE, XSANE_PACKAGE_VERSION);
+          g_print("  %s%d.%d.%d\n", TEXT_GTK_VERSION, GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
 
 #ifdef HAVE_ANY_GIMP
-          printf("  %s, %s%s\n", TEXT_WITH_GIMP_SUPPORT, TEXT_GIMP_VERSION, GIMP_VERSION);
+          g_print("  %s, %s%s\n", TEXT_WITH_GIMP_SUPPORT, TEXT_GIMP_VERSION, GIMP_VERSION);
 #else
-          printf("  %s\n", TEXT_WITHOUT_GIMP_SUPPORT);
+          g_print("  %s\n", TEXT_WITHOUT_GIMP_SUPPORT);
 #endif
 
-          printf("  %s ", TEXT_OUTPUT_FORMATS);
+          g_print("  %s ", TEXT_OUTPUT_FORMATS);
 
 #ifdef HAVE_LIBJPEG
-          printf("jpeg, ");
+          g_print("jpeg, ");
 #endif
 
 #ifdef HAVE_LIBPNG
 #ifdef HAVE_LIBZ
-          printf("png, ");
+          g_print("png, ");
 #endif
 #endif
 
-          printf("pnm, ");
-          printf("ps");
+          g_print("pnm, ");
+          g_print("ps");
 
 #ifdef SUPPORT_RGBA
-          printf(", rgba");
+          g_print(", rgba");
 #endif
 
 #ifdef HAVE_LIBTIFF
-          printf(", tiff");
+          g_print(", tiff");
 #endif
 
-          printf(", txt");
+          g_print(", txt");
 
-          printf("\n");
+          g_print("\n");
           exit(0);
          break;
 
         case 'l': /* --license */
-          printf("%s-%s %s %s\n\n", xsane.prog_name, XSANE_VERSION, XSANE_COPYRIGHT_SIGN, XSANE_COPYRIGHT_TXT);
-          printf("%s\n", TEXT_GPL);
+          g_print("%s-%s %s %s\n\n", xsane.prog_name, XSANE_VERSION, XSANE_COPYRIGHT_SIGN, XSANE_COPYRIGHT_TXT);
+          g_print("%s\n", TEXT_GPL);
           exit(0);
          break;