Use "xscanimage" as program name consistantly (instead of "xscan").

Henning Meier-Geinitz <henning@meier-geinitz.de>

src/Makefile.in

@@ -50,7 +50,7 @@ PROGRAMS = $(BINPROGS)
 LIBLIB = ../lib/liblib.a
 LIBSANEI = ../sanei/libsanei.a
 
-XSCAN_OBJS = xscanimage.o progress.o preview.o preferences.o gtkglue.o
+XSCANIMAGE_OBJS = xscanimage.o progress.o preview.o preferences.o gtkglue.o
 XCAM_OBJS = xcam.o preferences.o gtkglue.o
 
 .c.o:
@@ -79,8 +79,8 @@ uninstall:
 	done
 	rm -f $(datadir)/sane-style.rc
 
-xscanimage: $(XSCAN_OBJS) $(LIBSANEI) $(LIBLIB)
-	$(LINK) $(XSCAN_OBJS) $(LIBSANEI) \
+xscanimage: $(XSCANIMAGE_OBJS) $(LIBSANEI) $(LIBLIB)
+	$(LINK) $(XSCANIMAGE_OBJS) $(LIBSANEI) \
 		$(LIBLIB) $(GIMP_LIBS) $(GTK_LIBS) $(LIBS)
 
 xcam: $(XCAM_OBJS) $(LIBSANEI) $(LIBLIB)

src/preview.c

@@ -1033,7 +1033,7 @@ preview_new (GSGDialog *dialog)
   p->top = gtk_dialog_new ();
   gtk_signal_connect (GTK_OBJECT (p->top), "destroy",
 		      GTK_SIGNAL_FUNC (top_destroyed), p);
-  gtk_window_set_title (GTK_WINDOW (p->top), "xscan preview");
+  gtk_window_set_title (GTK_WINDOW (p->top), "xscanimage preview");
   vbox = GTK_BOX (GTK_DIALOG (p->top)->vbox);
   hbox = GTK_BOX (GTK_DIALOG (p->top)->action_area);
 

src/xscanimage.c

@@ -433,7 +433,7 @@ update_param (GSGDialog *dialog, void *arg)
 }
 
 static void
-pref_xscan_save (void)
+pref_xscanimage_save (void)
 {
   char filename[PATH_MAX];
   int fd;
@@ -456,7 +456,7 @@ pref_xscan_save (void)
 }
 
 static void
-pref_xscan_restore (void)
+pref_xscanimage_restore (void)
 {
   char filename[PATH_MAX];
   int fd;
@@ -474,7 +474,7 @@ pref_xscan_restore (void)
 }
 
 static void
-quit_xscan (void)
+quit_xscanimage (void)
 {
   if (scan_win.preview)
     {
@@ -488,7 +488,7 @@ quit_xscan (void)
 	usleep (100000);
       gtk_main_iteration ();
     }
-  pref_xscan_save ();
+  pref_xscanimage_save ();
   if (dialog && gsg_dialog_get_device (dialog))
     sane_close (gsg_dialog_get_device (dialog));
   sane_exit ();
@@ -507,7 +507,7 @@ quit_xscan (void)
 static gint
 scan_win_delete (GtkWidget *w, gpointer data)
 {
-  quit_xscan();
+  quit_xscanimage();
   return FALSE;
 }
 
@@ -1061,7 +1061,7 @@ zoom_out_preview (GtkWidget * widget, gpointer data)
 static void
 files_exit_callback (GtkWidget *widget, gpointer data)
 {
-  quit_xscan ();
+  quit_xscanimage ();
 }
 
 static GtkWidget *
@@ -1101,7 +1101,7 @@ pref_set_unit_callback (GtkWidget *widget, gpointer data)
   if (scan_win.preview)
     preview_update (scan_win.preview);
 
-  pref_xscan_save ();
+  pref_xscanimage_save ();
 }
 
 static void
@@ -1135,7 +1135,7 @@ preview_options_ok_callback (GtkWidget *widget, gpointer data)
   char buf[1024];
 
   gtk_widget_destroy (dialog);
-  pref_xscan_save ();
+  pref_xscanimage_save ();
 
   snprintf (buf, sizeof (buf),
 	    "It is necessary to restart %s for the changes to take effect.",
@@ -1277,7 +1277,7 @@ pref_toggle_advanced (GtkWidget *widget, gpointer data)
 {
   preferences.advanced = (GTK_CHECK_MENU_ITEM (widget)->active != 0);
   gsg_set_advanced (dialog, preferences.advanced);
-  pref_xscan_save ();
+  pref_xscanimage_save ();
 }
 
 static void
@@ -1285,7 +1285,7 @@ pref_toggle_tooltips (GtkWidget *widget, gpointer data)
 {
   preferences.tooltips_enabled = (GTK_CHECK_MENU_ITEM (widget)->active != 0);
   gsg_set_tooltips (dialog, preferences.tooltips_enabled);
-  pref_xscan_save ();
+  pref_xscanimage_save ();
 }
 
 static GtkWidget *
@@ -1406,8 +1406,8 @@ device_dialog (void)
   GtkWidget *menubar, *menubar_item;
   const gchar *devname;
 
-  /* first, restore xscan preferences */
-  pref_xscan_restore ();
+  /* first, restore xscanimage preferences */
+  pref_xscanimage_restore ();
 
   devname = devlist[seldev]->name;
 
@@ -1745,11 +1745,11 @@ interface (int argc, char **argv)
 	{
 	  fprintf (stderr, "%s: device %d is unavailable.\n",
 		   prog_name, seldev);
-	  quit_xscan ();
+	  quit_xscanimage ();
 	}
       device_dialog ();
       if (!dialog)
-	quit_xscan ();
+	quit_xscanimage ();
     }
   else
     {
@@ -1760,7 +1760,7 @@ interface (int argc, char **argv)
 	    {
 	      device_dialog ();
 	      if (!dialog)
-		quit_xscan ();
+		quit_xscanimage ();
 	    }
 	  else
 	    choose_device ();
@@ -1772,7 +1772,7 @@ interface (int argc, char **argv)
 	       "          detected by the find-scanner tool (if appropriate). Please read\n"
 	       "          the documentation which came with this software (README, FAQ,\n"
 	       "          manpages).\n");
-	  quit_xscan ();
+	  quit_xscanimage ();
 	}
     }
   gtk_quit_flag = 1;