comparison src/device-msw.c @ 4962:e813cf16c015

merge
author Ben Wing <ben@xemacs.org>
date Mon, 01 Feb 2010 05:29:05 -0600
parents 304aebb79cd3 6ef8256a020a
children 16112448d484 4aebb0131297
comparison
equal deleted inserted replaced
4961:b90f8cf474e0 4962:e813cf16c015
656 sync_printer_with_devmode (struct device* d, DEVMODEW* devmode_in, 656 sync_printer_with_devmode (struct device* d, DEVMODEW* devmode_in,
657 DEVMODEW* devmode_out, Lisp_Object devname) 657 DEVMODEW* devmode_out, Lisp_Object devname)
658 { 658 {
659 /* Change connection if the device changed */ 659 /* Change connection if the device changed */
660 if (!NILP (devname) 660 if (!NILP (devname)
661 && lisp_strcasecmp (devname, DEVICE_MSPRINTER_NAME (d)) != 0) 661 && lisp_strcasecmp_i18n (devname, DEVICE_MSPRINTER_NAME (d)) != 0)
662 { 662 {
663 Lisp_Object new_connection = devname; 663 Lisp_Object new_connection = devname;
664 664
665 DEVICE_CONNECTION (d) = Qnil; 665 DEVICE_CONNECTION (d) = Qnil;
666 if (!NILP (Ffind_device (new_connection, Qmsprinter))) 666 if (!NILP (Ffind_device (new_connection, Qmsprinter)))
1179 1179
1180 assert (NILP (dm->device)); 1180 assert (NILP (dm->device));
1181 } 1181 }
1182 1182
1183 static int 1183 static int
1184 equal_devmode (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth)) 1184 equal_devmode (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth),
1185 int UNUSED (foldcase))
1185 { 1186 {
1186 Lisp_Devmode *dm1 = XDEVMODE (obj1); 1187 Lisp_Devmode *dm1 = XDEVMODE (obj1);
1187 Lisp_Devmode *dm2 = XDEVMODE (obj2); 1188 Lisp_Devmode *dm2 = XDEVMODE (obj2);
1188 1189
1189 if ((dm1->devmode != NULL) != (dm1->devmode != NULL)) 1190 if ((dm1->devmode != NULL) != (dm1->devmode != NULL))
1192 return 1; 1193 return 1;
1193 if (memcmp (dm1->devmode, dm2->devmode, XDEVMODE_SIZE (dm1)) != 0) 1194 if (memcmp (dm1->devmode, dm2->devmode, XDEVMODE_SIZE (dm1)) != 0)
1194 return 0; 1195 return 0;
1195 if (NILP (dm1->printer_name) || NILP (dm2->printer_name)) 1196 if (NILP (dm1->printer_name) || NILP (dm2->printer_name))
1196 return 1; 1197 return 1;
1197 return lisp_strcasecmp (dm1->printer_name, dm2->printer_name) == 0; 1198 return lisp_strcasecmp_i18n (dm1->printer_name, dm2->printer_name) == 0;
1198 } 1199 }
1199 1200
1200 static Hashcode 1201 static Hashcode
1201 hash_devmode (Lisp_Object obj, int depth) 1202 hash_devmode (Lisp_Object obj, int depth)
1202 { 1203 {