Hello community,
here is the log from the commit of package yast2-printer
checked in at Thu Apr 3 02:49:51 CEST 2008.
--------
--- yast2-printer/yast2-printer.changes 2008-03-31 13:43:41.000000000 +0200
+++ yast2-printer/yast2-printer.changes 2008-04-01 23:02:04.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Apr 1 05:18:38 CEST 2008 - mzugec@suse.de
+
+- fixed list of remote/local backends
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-printer.spec ++++++
--- /var/tmp/diff_new_pack.w30168/_old 2008-04-03 02:48:13.000000000 +0200
+++ /var/tmp/diff_new_pack.w30168/_new 2008-04-03 02:48:13.000000000 +0200
@@ -14,7 +14,7 @@
Name: yast2-printer
Version: 2.16.10
-Release: 1
+Release: 4
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -139,7 +139,9 @@
%exclude %{prefix}/share/doc/packages/yast2-printer/COPYING
%exclude %{prefix}/share/doc/packages/yast2-printer/README
%changelog
-* Fri Mar 28 2008 mzugec@suse.de
+* Tue Apr 01 2008 mzugec@suse.de
+- fixed list of remote/local backends
+* Sat Mar 29 2008 mzugec@suse.de
- ComboBox to switch between Local and Remote printers (FaTE#302133)
- Print test page in overview dialog
- 2.16.10
@@ -350,7 +352,7 @@
- delete deprecated lookup
* Thu Dec 15 2005 mzugec@suse.cz
- change deprecated find to search
-* Tue Nov 08 2005 mzugec@suse.cz
+* Wed Nov 09 2005 mzugec@suse.cz
- improving add printer/queue dialogs
* Tue Sep 13 2005 mzugec@suse.cz
- fixed (#116744) - remove warning
@@ -683,7 +685,7 @@
* Mon Mar 08 2004 jsrain@suse.de
- setting icon
- 2.9.11
-* Sun Mar 07 2004 kkaempf@suse.de
+* Mon Mar 08 2004 kkaempf@suse.de
- more type fixes
* Thu Mar 04 2004 jsrain@suse.de
- more descriptive texts on the test page (#35306)
@@ -1226,7 +1228,7 @@
- Merged proofread texts
- Fixed kdoc comments
- 2.6.24
-* Sun Aug 11 2002 mvidner@suse.cz
+* Mon Aug 12 2002 mvidner@suse.cz
- Fix building (testsuite adapted to changes in yast2.rpm, due to #17608).
* Fri Aug 09 2002 jsrain@suse.de
- fixed escputil hangup (Bug #17462)
@@ -1685,7 +1687,7 @@
- #5598: printer name must not be lp<number>
- length of name of ascii printer is checked (must be less then 20)
- added some comments for translators
-* Thu Jan 11 2001 pblahos@suse.de
+* Fri Jan 12 2001 pblahos@suse.de
- added full path to commands on .target.bash
- removed writting START_USB to rc.config (usbmgr is started always)
- removed writting printer to rc.config.d/usb.rc.config (obsoleted)
@@ -1787,7 +1789,7 @@
version 2.0.6
* Thu Jun 22 2000 kendy@suse.cz
- Bugfixes in write of /etc/apsfilterrc.
-* Tue Jun 20 2000 kendy@suse.cz
+* Wed Jun 21 2000 kendy@suse.cz
- Bugfixes in dependent options and comparison of IEEE1284 strings.
* Mon Jun 19 2000 kendy@suse.cz
- Use of the comments in the database.
++++++ yast2-printer-2.16.10.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.16.10/configure new/yast2-printer-2.16.10/configure
--- old/yast2-printer-2.16.10/configure 2008-03-28 22:15:04.000000000 +0100
+++ new/yast2-printer-2.16.10/configure 2008-04-01 04:34:16.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-printer 2.16.9.
+# Generated by GNU Autoconf 2.61 for yast2-printer 2.16.10.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-printer'
PACKAGE_TARNAME='yast2-printer'
-PACKAGE_VERSION='2.16.9'
-PACKAGE_STRING='yast2-printer 2.16.9'
+PACKAGE_VERSION='2.16.10'
+PACKAGE_STRING='yast2-printer 2.16.10'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1451,7 +1451,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-printer 2.16.9 to adapt to many kinds of systems.
+\`configure' configures yast2-printer 2.16.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1522,7 +1522,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-printer 2.16.9:";;
+ short | recursive ) echo "Configuration of yast2-printer 2.16.10:";;
esac
cat <<\_ACEOF
@@ -1628,7 +1628,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-printer configure 2.16.9
+yast2-printer configure 2.16.10
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1642,7 +1642,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-printer $as_me 2.16.9, which was
+It was created by yast2-printer $as_me 2.16.10, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2463,7 +2463,7 @@
# Define the identity of the package.
PACKAGE='yast2-printer'
- VERSION='2.16.9'
+ VERSION='2.16.10'
cat >>confdefs.h <<_ACEOF
@@ -2691,7 +2691,7 @@
-VERSION="2.16.9"
+VERSION="2.16.10"
RPMNAME="yast2-printer"
MAINTAINER="Michal Zugec "
@@ -22979,7 +22979,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-printer $as_me 2.16.9, which was
+This file was extended by yast2-printer $as_me 2.16.10, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23032,7 +23032,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-printer config.status 2.16.9
+yast2-printer config.status 2.16.10
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.16.10/configure.in new/yast2-printer-2.16.10/configure.in
--- old/yast2-printer-2.16.10/configure.in 2008-03-28 22:14:44.000000000 +0100
+++ new/yast2-printer-2.16.10/configure.in 2008-04-01 04:33:11.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-printer, 2.16.9, http://bugs.opensuse.org/, yast2-printer)
+AC_INIT(yast2-printer, 2.16.10, http://bugs.opensuse.org/, yast2-printer)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.16.9"
+VERSION="2.16.10"
RPMNAME="yast2-printer"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.16.10/src/common/dialogs-connection.ycp new/yast2-printer-2.16.10/src/common/dialogs-connection.ycp
--- old/yast2-printer-2.16.10/src/common/dialogs-connection.ycp 2008-02-04 17:49:42.000000000 +0100
+++ new/yast2-printer-2.16.10/src/common/dialogs-connection.ycp 2008-04-01 05:21:02.000000000 +0200
@@ -9,7 +9,7 @@
* Petr Blahos
* Jiri Srain
*
- * $Id: dialogs-connection.ycp 43943 2008-01-28 13:38:58Z mzugec $
+ * $Id: dialogs-connection.ycp 45946 2008-04-01 20:54:42Z mzugec $
*
*/
{
@@ -923,6 +923,7 @@
uri = type + ":" + device;
if ("serial" == type) uri = uri + sformat ("?baudrate=%1+ty=%2", baudrate, ser_settings);
else if (type == "bluetooth") uri = type + "://" + filterchars (device, "0123456789aAbBcCdDeEfF");
+y2internal("bt uri %1, type %2, device %3", uri, type, device);
Printer::printer["uri"] = uri;
}
return ret;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.16.10/src/common/dialogs.ycp new/yast2-printer-2.16.10/src/common/dialogs.ycp
--- old/yast2-printer-2.16.10/src/common/dialogs.ycp 2008-03-28 22:31:26.000000000 +0100
+++ new/yast2-printer-2.16.10/src/common/dialogs.ycp 2008-04-01 05:21:02.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Petr Blahos
*
- * $Id: dialogs.ycp 45881 2008-03-31 11:33:49Z mzugec $
+ * $Id: dialogs.ycp 45946 2008-04-01 20:54:42Z mzugec $
* Main dialogs.
*/
{
@@ -2022,15 +2022,24 @@
return term_items;
}
-void refreshOverview(boolean editable){
-list<term> items = buildItemsList((string)UI::QueryWidget(`filter, `Value));
- UI::ChangeWidget (`id (`_hw_items), `Items, items);
- if (size(items)>0) UI::ChangeWidget(`_hw_sum, `Value, o_items[0, "rich_descr"]:"");
- else
- {
- UI::ChangeWidget(`_hw_sum, `Value, "");
- editable = false;
- }
+void refreshOverview(integer selected, boolean rebuild_items){
+ if (rebuild_items){
+ list<term> items = buildItemsList((string)UI::QueryWidget(`filter, `Value));
+ UI::ChangeWidget (`id (`_hw_items), `Items, items);
+ }
+ boolean editable = (selected==nil || selected==-1) ? false : true;
+ if (size((list<term>)UI::QueryWidget(`id (`_hw_items), `Items))>0)
+ {
+ integer old_selection = selected;
+ selected = tointeger( UI::QueryWidget(`id(`_hw_items), `CurrentItem));
+ if (selected != old_selection) Printer::selectPrinter(selected);
+ UI::ChangeWidget(`_hw_sum, `Value, o_items[selected, "rich_descr"]:"");
+ }
+ else
+ {
+ UI::ChangeWidget(`_hw_sum, `Value, "");
+ editable = false;
+ }
boolean local = (CUPS::InstallationType() == `server);
UI::ChangeWidget(`_hw_items, `Enabled, local);
UI::ChangeWidget(`add, `Enabled, local);
@@ -2053,11 +2062,10 @@
symbol ret=nil;
string new_spooler = Spooler::Get ();
integer selected = -1;
- if (size(o_items)>0) selected = tointeger( UI::QueryWidget(`id(`_hw_items), `CurrentItem));
-y2internal("selected %1, items %2", UI::QueryWidget(`id(`_hw_items), `CurrentItem), UI::QueryWidget(`id(`_hw_items), `Items));
+ if (size((list<term>)UI::QueryWidget(`id (`_hw_items), `Items))>0) selected = tointeger( UI::QueryWidget(`id(`_hw_items), `CurrentItem));
Printer::selectPrinter(selected);
- refreshOverview(selected!=-1);
-
+y2internal("event %1", event);
+ refreshOverview(selected, (event["EventReason"]:nil=="SelectionChanged"||event["ID"]:nil==`delete)?false:true);
y2milestone("selected printer %1", selected);
if (new_spooler == "cups" && CUPS::InstallationType () == `client) new_spooler = "cups-client";
@@ -2067,9 +2075,13 @@
ret = (symbol) event["ID"]:nil;
switch((symbol) event["ID"]:nil){
case `delete :
+ y2internal("selected printer %1", selected);
if (new_spooler == "cups-client") {CUPS::cups_installation=`server;new_spooler="cups";}
- else if ( (Printer::conf_unconf_printers[selected, "SPOOL"]:"" != "not configured") && Popup::YesNo (sformat (_("Really delete printer %1?"), Printer::printer["name"]:""))) Printer::deletePrinter ();
- refreshOverview(selected!=-1);
+ else if ( (Printer::conf_unconf_printers[selected, "SPOOL"]:"" != "not configured") && Popup::YesNo (sformat (_("Really delete printer %1?"), Printer::printer["name"]:"")))
+ {
+ Printer::deletePrinter ();
+ refreshOverview(selected, true);
+ }
ret=nil;
break;
// TODO handle all events here
@@ -2128,21 +2140,6 @@
ret=nil;
break;
default:
- if (event["EventReason"]:"" == "SelectionChanged")
- {
- if (size(o_items)>0)
- {
- UI::ChangeWidget(`_hw_sum, `Value, o_items[selected, "rich_descr"]:"");
- // #247336 - don't allow to edit queues without local filtering (raw:true)
- UI::ChangeWidget(`id(`edit), `Enabled, !Printer::printer["raw"]:true);
- UI::ChangeWidget(`id(`delete), `Enabled, true);
- } else
- {
- UI::ChangeWidget(`_hw_sum, `Value, "");
- UI::ChangeWidget(`id(`edit), `Enabled, false);
- UI::ChangeWidget(`id(`delete), `Enabled, false);
- }
- } else y2warning("Invalid return: %1, %2", ret, event);
ret = nil;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.16.10/src/modules/Printer.ycp new/yast2-printer-2.16.10/src/modules/Printer.ycp
--- old/yast2-printer-2.16.10/src/modules/Printer.ycp 2008-03-28 22:31:26.000000000 +0100
+++ new/yast2-printer-2.16.10/src/modules/Printer.ycp 2008-04-01 05:21:02.000000000 +0200
@@ -12,7 +12,7 @@
* Petr Blahos
* Jiri Srain
*
- * $Id: Printer.ycp 45881 2008-03-31 11:33:49Z mzugec $
+ * $Id: Printer.ycp 45946 2008-04-01 20:54:42Z mzugec $
*
* Well we all know what modules are for.
*/
@@ -152,8 +152,8 @@
global boolean isPrinterLocal(){
map tokens = URL::Parse(printer["uri"]:"");
string type = tokens["scheme"]:"";
- list<string> local = ["serial", "parallel", "usb", "irda"];
- list<string> remote = ["http", "https", "ftp", "nfs", "smb"];
+ list<string> local = ["serial", "parallel", "usb", "irda", "bluetooth"];
+ list<string> remote = ["http", "https", "ftp", "nfs", "smb", "ipp", "lpd", "novell", "socket"];
if (!contains(remote, type)) return true;
else return false;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org