diff --git a/ChangeLog b/ChangeLog
index 8421a2698..06489c5f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-25  m. allan noah <kitno455 a t gmail d o t com>
+	* include/sane/saneopts.h: separate x-resolution from resolution
+	* backend/abaton.c, backend/artec.c, backend/canon-sane.c,
+	  backend/epjitsu.c, backend/fujitsu.c, backend/microtek2.c,
+	  backend/sp15c.c, backend/umax.c: use SANE_NAME_SCAN_RESOLUTION
+	  instead of SANE_NAME_SCAN_X_RESOLUTION, to avoid ui change
+
 2008-07-20 Julien Blache <jb@jblache.org>
 	* backend/net.c: sane_control_option: when the frontend doesn't
 	care (info == NULL) and the remote backend asks for a reload,
diff --git a/backend/abaton.c b/backend/abaton.c
index 2eb877d34..21d7e3009 100644
--- a/backend/abaton.c
+++ b/backend/abaton.c
@@ -686,7 +686,7 @@ init_options (Abaton_Scanner * s)
   s->val[OPT_MODE].s = strdup (mode_list[0]);
 
   /* resolution - horizontal */
-  s->opt[OPT_X_RESOLUTION].name = SANE_NAME_SCAN_X_RESOLUTION;
+  s->opt[OPT_X_RESOLUTION].name = SANE_NAME_SCAN_RESOLUTION;
   s->opt[OPT_X_RESOLUTION].title = SANE_TITLE_SCAN_X_RESOLUTION;
   s->opt[OPT_X_RESOLUTION].desc = SANE_DESC_SCAN_X_RESOLUTION;
   s->opt[OPT_X_RESOLUTION].type = SANE_TYPE_INT;
diff --git a/backend/artec.c b/backend/artec.c
index b34132164..51fe84c3c 100644
--- a/backend/artec.c
+++ b/backend/artec.c
@@ -3047,7 +3047,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
 		  s->opt[OPT_X_RESOLUTION].title =
 		    SANE_TITLE_SCAN_X_RESOLUTION;
 		  s->opt[OPT_X_RESOLUTION].name =
-		    SANE_NAME_SCAN_X_RESOLUTION;
+		    SANE_NAME_SCAN_RESOLUTION;
 		  s->opt[OPT_X_RESOLUTION].desc =
 		    SANE_DESC_SCAN_X_RESOLUTION;
 		}
diff --git a/backend/canon-sane.c b/backend/canon-sane.c
index 145839449..c04199148 100644
--- a/backend/canon-sane.c
+++ b/backend/canon-sane.c
@@ -507,7 +507,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
 		  s->opt[OPT_Y_RESOLUTION].cap &= ~SANE_CAP_INACTIVE;
 		  s->opt[OPT_X_RESOLUTION].title =
 		    SANE_TITLE_SCAN_X_RESOLUTION;
-		  s->opt[OPT_X_RESOLUTION].name = SANE_NAME_SCAN_X_RESOLUTION;
+		  s->opt[OPT_X_RESOLUTION].name = SANE_NAME_SCAN_RESOLUTION;
 		  s->opt[OPT_X_RESOLUTION].desc = SANE_DESC_SCAN_X_RESOLUTION;
 		}
 	      else
diff --git a/backend/epjitsu.c b/backend/epjitsu.c
index 49a835615..81455d765 100644
--- a/backend/epjitsu.c
+++ b/backend/epjitsu.c
@@ -898,7 +898,7 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
     }
     s->x_res_list[0] = i;
 
-    opt->name = SANE_NAME_SCAN_X_RESOLUTION;
+    opt->name = SANE_NAME_SCAN_RESOLUTION;
     opt->title = SANE_TITLE_SCAN_X_RESOLUTION;
     opt->desc = SANE_DESC_SCAN_X_RESOLUTION;
     opt->type = SANE_TYPE_INT;
diff --git a/backend/fujitsu.c b/backend/fujitsu.c
index e8c8585e8..675150fb7 100644
--- a/backend/fujitsu.c
+++ b/backend/fujitsu.c
@@ -2279,7 +2279,7 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
     }
     s->x_res_list[0] = i;
   
-    opt->name = SANE_NAME_SCAN_X_RESOLUTION;
+    opt->name = SANE_NAME_SCAN_RESOLUTION;
     opt->title = SANE_TITLE_SCAN_X_RESOLUTION;
     opt->desc = SANE_DESC_SCAN_X_RESOLUTION;
     opt->type = SANE_TYPE_INT;
diff --git a/backend/microtek2.c b/backend/microtek2.c
index 5753186ee..32eccccab 100644
--- a/backend/microtek2.c
+++ b/backend/microtek2.c
@@ -2425,7 +2425,7 @@ init_options(Microtek2_Scanner *ms, u_int8_t current_scan_source)
         sod[OPT_HALFTONE].constraint.string_list = md->halftone_mode_list;
 
         /* Resolution */
-        sod[OPT_RESOLUTION].name = SANE_NAME_SCAN_X_RESOLUTION;
+        sod[OPT_RESOLUTION].name = SANE_NAME_SCAN_RESOLUTION;
         sod[OPT_RESOLUTION].title = SANE_TITLE_SCAN_X_RESOLUTION;
         sod[OPT_RESOLUTION].desc = SANE_DESC_SCAN_X_RESOLUTION;
         sod[OPT_RESOLUTION].unit = SANE_UNIT_DPI;
diff --git a/backend/sp15c.c b/backend/sp15c.c
index c79074b54..8341662f2 100644
--- a/backend/sp15c.c
+++ b/backend/sp15c.c
@@ -45,7 +45,11 @@ static const char RCSid[] = "$Header$";
 
 /*
  * $Log$
- * Revision 1.15  2007/11/18 10:59:18  ellert-guest
+ * Revision 1.16  2008/07/26 03:53:44  kitno-guest
+ * separate x-resolution from resolution, and update all backends that use
+ * it, to prevent ui change
+ *
+ * Revision 1.15  2007-11-18 10:59:18  ellert-guest
  * Fix handling of valid "negative" PIDs
  *
  * Revision 1.14  2007-10-26 14:56:38  jblache
@@ -1441,7 +1445,7 @@ init_options (struct sp15c *scanner)
   scanner->opt[OPT_PRESCAN].unit = SANE_UNIT_NONE;
 
   /* resolution */
-  scanner->opt[OPT_X_RES].name = SANE_NAME_SCAN_X_RESOLUTION;
+  scanner->opt[OPT_X_RES].name = SANE_NAME_SCAN_RESOLUTION;
   scanner->opt[OPT_X_RES].title = SANE_TITLE_SCAN_X_RESOLUTION;
   scanner->opt[OPT_X_RES].desc = SANE_DESC_SCAN_X_RESOLUTION;
   scanner->opt[OPT_X_RES].type = SANE_TYPE_INT;
diff --git a/backend/umax.c b/backend/umax.c
index 074c1f7d3..5e917b8b0 100644
--- a/backend/umax.c
+++ b/backend/umax.c
@@ -6740,7 +6740,7 @@ SANE_Status sane_control_option(SANE_Handle handle, SANE_Int option, SANE_Action
           { /* don't bind */
             scanner->opt[OPT_Y_RESOLUTION].cap &= ~SANE_CAP_INACTIVE;
             scanner->opt[OPT_X_RESOLUTION].title = SANE_TITLE_SCAN_X_RESOLUTION;
-            scanner->opt[OPT_X_RESOLUTION].name  = SANE_NAME_SCAN_X_RESOLUTION;
+            scanner->opt[OPT_X_RESOLUTION].name  = SANE_NAME_SCAN_RESOLUTION;
             scanner->opt[OPT_X_RESOLUTION].desc  = SANE_DESC_SCAN_X_RESOLUTION;
           }
           else
diff --git a/include/sane/saneopts.h b/include/sane/saneopts.h
index 038cd7719..33fb8de18 100644
--- a/include/sane/saneopts.h
+++ b/include/sane/saneopts.h
@@ -84,7 +84,7 @@
 #define SANE_NAME_SCAN_BR_X		"br-x"
 #define SANE_NAME_SCAN_BR_Y		"br-y"
 #define SANE_NAME_SCAN_RESOLUTION	"resolution"
-#define SANE_NAME_SCAN_X_RESOLUTION	"resolution"
+#define SANE_NAME_SCAN_X_RESOLUTION	"x-resolution"
 #define SANE_NAME_SCAN_Y_RESOLUTION	"y-resolution"
 #define SANE_NAME_PAGE_WIDTH  		"page-width"
 #define SANE_NAME_PAGE_HEIGHT 		"page-height"