gnome-scan r583 - in trunk: . lib po

[bersace svn gnome org]

Author: bersace
Date: Fri Mar 14 10:33:20 2008
New Revision: 583
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=583&view=rev

Log:
Fix #522054 and various 0.6 changes.


Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/configure.ac
   trunk/lib/gnome-scan-dialog.c
   trunk/lib/gnome-scan-preview-plugin-area.c
   trunk/po/Makefile.in.in

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Fri Mar 14 10:33:20 2008
@@ -12,6 +12,11 @@
  * Fix bug #519405, don't use translatable option group for internal
    groups hidden and preview.
 
+ * Swallow some epson specific high-level option redundant with GSane
+   high-level meta-param.
+
+ * Updated translation and new portugese translation.
+
 
 Changes in version 0.5.94
 =========================
@@ -39,6 +44,7 @@
  * Use explicit gettext domain in library rather than using
    application defined one.
 
+Contributor to this release: Ross Burton
 
 Changes in version 0.5.93
 =========================

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Mar 14 10:33:20 2008
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl Created by Anjuta application wizard.
 
-AC_INIT(gnome-scan, 0.5.94, http://bugzilla.gnome.org/simple-bug-guide.cgi?product=gnome-scan)
+AC_INIT(gnome-scan, 0.6, http://bugzilla.gnome.org/simple-bug-guide.cgi?product=gnome-scan)
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER(config.h)

Modified: trunk/lib/gnome-scan-dialog.c
==============================================================================
--- trunk/lib/gnome-scan-dialog.c	(original)
+++ trunk/lib/gnome-scan-dialog.c	Fri Mar 14 10:33:20 2008
@@ -893,7 +893,7 @@
 	}
 
 	if (priv->probe_done) {
-		arrow_cursor = gdk_cursor_new(GDK_ARROW);
+		arrow_cursor = gdk_cursor_new(GDK_LEFT_PTR);
 		gdk_window_set_cursor (GTK_WIDGET(dialog)->window,
 							   arrow_cursor);
 		gdk_cursor_unref (arrow_cursor);

Modified: trunk/lib/gnome-scan-preview-plugin-area.c
==============================================================================
--- trunk/lib/gnome-scan-preview-plugin-area.c	(original)
+++ trunk/lib/gnome-scan-preview-plugin-area.c	Fri Mar 14 10:33:20 2008
@@ -174,7 +174,7 @@
             ct = GDK_CROSSHAIR;
         break;
         default:
-            ct = GDK_ARROW;
+            ct = GDK_LEFT_PTR;
         break;
     }
     

Modified: trunk/po/Makefile.in.in
==============================================================================
--- trunk/po/Makefile.in.in	(original)
+++ trunk/po/Makefile.in.in	Fri Mar 14 10:33:20 2008
@@ -1,10 +1,10 @@
 # Makefile for program source directory in GNU NLS utilities package.
 # Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper gnu ai mit edu>
+# Copyright (C) 2004-2008 Rodney Dawes <dobey pwns gmail com>
 #
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
+# This file may be copied and used freely without restrictions.  It may
+# be used in projects which are not available under a GNU Public License,
 # but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
 #
 # - Modified by Owen Taylor <otaylor redhat com> to use GETTEXT_PACKAGE
 #   instead of PACKAGE and to look for po2tbl in ./ not in intl/
@@ -12,7 +12,7 @@
 # - Modified by jacob berkman <jacob ximian com> to install
 #   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
 #
-# - Modified by Rodney Dawes <dobey novell com> for use with intltool
+# - Modified by Rodney Dawes <dobey pwns gmail com> for use with intltool
 #
 # We have the following line for use by intltoolize:
 # INTLTOOL_MAKEFILE