Author: mzugec Date: Mon Sep 3 16:48:32 2007 New Revision: 40725 URL: http://svn.opensuse.org/viewcvs/yast?rev=40725&view=rev Log: read URI for usb printers from cups backend if not available in hwinfo (#307118) Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/modules/Printer.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=40725&r1=4072... ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Mon Sep 3 16:48:32 2007 @@ -1 +1 @@ -2.15.4 +2.15.5 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.cha... ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Mon Sep 3 16:48:32 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Sep 3 16:47:22 CEST 2007 - mzugec@suse.cz + +- read URI for usb printers from cups backend if not available +in hwinfo (#307118) +- 2.15.5 + +------------------------------------------------------------------- Mon Aug 6 10:00:35 CEST 2007 - mzugec@suse.cz - reverted factory patch (remove tabs) Modified: trunk/printer/src/modules/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/modules/Printer.ycp?r... ============================================================================== --- trunk/printer/src/modules/Printer.ycp (original) +++ trunk/printer/src/modules/Printer.ycp Mon Sep 3 16:48:32 2007 @@ -349,12 +349,13 @@ if (Spooler::Get () == "cups") { - dev_name - = Printerlib::GetCupsUsbDeviceInfo (class_dev)[0]:""; - if (dev_name == nil || dev_name == "") - { - dev_name = class_dev; - } + dev_name = Printerlib::GetCupsUsbDeviceInfo (class_dev)[0]:""; + if ((dev_name == nil || dev_name == "")||(class_dev == nil || class_dev == "")){ + dev_name = Printerlib::GetCupsUsbDevicesInfo()[0,0]:""; + } + else { + dev_name = class_dev; + } } p = $[ "vendor" : i["sub_vendor"]:i["vendor"]:"", -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org