Hello community,
here is the log from the commit of package yast2-core
checked in at Tue Aug 22 15:52:08 CEST 2006.
--------
--- yast2-core/yast2-core.changes 2006-08-09 14:54:10.000000000 +0200
+++ yast2-core/yast2-core.changes 2006-08-22 15:42:57.000000000 +0200
@@ -1,0 +2,13 @@
+Tue Aug 22 13:01:28 CEST 2006 - lslezak@suse.cz
+
+- generateYCPWrappers - fixed crash when nil is passed as
+ an argument to YCP binding (#194435)
+- 2.13.30
+
+-------------------------------------------------------------------
+Mon Aug 21 16:15:33 CEST 2006 - mvidner@suse.cz
+
+- ycp.pm: added PathComponents to normalize nontrivial paths
+- 2.13.29
+
+-------------------------------------------------------------------
Old:
----
yast2-core-2.13.28.tar.bz2
New:
----
yast2-core-2.13.30.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-core.spec ++++++
--- /var/tmp/diff_new_pack.5sIaLw/_old 2006-08-22 15:51:43.000000000 +0200
+++ /var/tmp/diff_new_pack.5sIaLw/_new 2006-08-22 15:51:43.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-core (Version 2.13.28)
+# spec file for package yast2-core (Version 2.13.30)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-core
-Version: 2.13.28
+Version: 2.13.30
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-core-2.13.28.tar.bz2
+Source0: yast2-core-2.13.30.tar.bz2
prefix: /usr
BuildRequires: ElectricFence blocxx-devel curl-devel dejagnu docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt liby2util-devel openslp-devel perl-XML-Writer popt-devel sgml-skel udev yast2-devtools
Summary: YaST2 - Core Libraries
@@ -93,7 +93,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-core-2.13.28
+%setup -n yast2-core-2.13.30
%build
%{prefix}/bin/y2tool y2autoconf
@@ -165,6 +165,13 @@
/usr/share/YaST2/data/devtools/bin/generateYCPWrappers
%changelog -n yast2-core
+* Tue Aug 22 2006 - lslezak@suse.cz
+- generateYCPWrappers - fixed crash when nil is passed as
+ an argument to YCP binding (#194435)
+- 2.13.30
+* Mon Aug 21 2006 - mvidner@suse.cz
+- ycp.pm: added PathComponents to normalize nontrivial paths
+- 2.13.29
* Wed Aug 09 2006 - mvidner@suse.cz
- agent-ini: fixed value_type and section_type with repeat_names (#191495).
- libycp: added YCPValue::valuetype_str() for better debug messages.
++++++ yast2-core-2.13.28.tar.bz2 -> yast2-core-2.13.30.tar.bz2 ++++++
++++ 14891 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.13.28/VERSION new/yast2-core-2.13.30/VERSION
--- old/yast2-core-2.13.28/VERSION 2006-08-09 14:51:41.000000000 +0200
+++ new/yast2-core-2.13.30/VERSION 2006-08-22 13:01:00.000000000 +0200
@@ -1 +1 @@
-2.13.28
+2.13.30
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.13.28/agent-modules/testsuite/tests/dir.scr new/yast2-core-2.13.30/agent-modules/testsuite/tests/dir.scr
--- old/yast2-core-2.13.28/agent-modules/testsuite/tests/dir.scr 2006-08-09 14:45:13.000000000 +0200
+++ new/yast2-core-2.13.30/agent-modules/testsuite/tests/dir.scr 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-.
-
-`ag_modules(
- `ModulesConf("tests/dir.in.test")
-)
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.13.28/agent-modules/testsuite/tests/missing.scr new/yast2-core-2.13.30/agent-modules/testsuite/tests/missing.scr
--- old/yast2-core-2.13.28/agent-modules/testsuite/tests/missing.scr 2006-08-09 14:44:18.000000000 +0200
+++ new/yast2-core-2.13.30/agent-modules/testsuite/tests/missing.scr 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-.
-
-`ag_modules(
- `ModulesConf("tests/missing.in.test")
-)
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.13.28/agent-modules/testsuite/tests/read1.scr new/yast2-core-2.13.30/agent-modules/testsuite/tests/read1.scr
--- old/yast2-core-2.13.28/agent-modules/testsuite/tests/read1.scr 2006-08-09 14:44:13.000000000 +0200
+++ new/yast2-core-2.13.30/agent-modules/testsuite/tests/read1.scr 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-.
-
-`ag_modules(
- `ModulesConf("tests/read1.in.test")
-)
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.13.28/agent-modules/testsuite/tests/write1.scr new/yast2-core-2.13.30/agent-modules/testsuite/tests/write1.scr
--- old/yast2-core-2.13.28/agent-modules/testsuite/tests/write1.scr 2006-08-09 14:44:19.000000000 +0200
+++ new/yast2-core-2.13.30/agent-modules/testsuite/tests/write1.scr 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-.
-
-`ag_modules(
- `ModulesConf("tests/write1.in.test")
-)
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.13.28/agent-modules/testsuite/tests/write2.scr new/yast2-core-2.13.30/agent-modules/testsuite/tests/write2.scr
--- old/yast2-core-2.13.28/agent-modules/testsuite/tests/write2.scr 2006-08-09 14:44:57.000000000 +0200
+++ new/yast2-core-2.13.30/agent-modules/testsuite/tests/write2.scr 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-.
-
-`ag_modules(
- `ModulesConf("tests/write2.in.test")
-)
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.13.28/agent-modules/testsuite/tests/write3.scr new/yast2-core-2.13.30/agent-modules/testsuite/tests/write3.scr
--- old/yast2-core-2.13.28/agent-modules/testsuite/tests/write3.scr 2006-08-09 14:45:10.000000000 +0200
+++ new/yast2-core-2.13.30/agent-modules/testsuite/tests/write3.scr 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-.
-
-`ag_modules(
- `ModulesConf("tests/write3.in.test")
-)
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.13.28/agents-perl/doc/ycp-pm-pod.html new/yast2-core-2.13.30/agents-perl/doc/ycp-pm-pod.html
--- old/yast2-core-2.13.28/agents-perl/doc/ycp-pm-pod.html 2005-03-30 13:59:59.000000000 +0200
+++ new/yast2-core-2.13.30/agents-perl/doc/ycp-pm-pod.html 2006-08-22 13:13:56.000000000 +0200
@@ -1,7 +1,9 @@
+<?xml version="1.0" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>ycp - a Perl module for parsing and writing the YaST2 Communication Protocol</title>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<link rev="made" href="mailto:feedback@suse.de" />
</head>
@@ -25,6 +27,7 @@
<li><a href="#parsecommand">ParseCommand</a></li>
<li><a href="#parseterm">ParseTerm</a></li>
+ <li><a href="#pathcomponents">PathComponents</a></li>
</ul>
<li><a href="#writing">WRITING</a></li>
@@ -97,36 +100,37 @@
<p>A PerlYCPValue cannot represent a term but only a term is allowed
to initialize an agent in a .scr file. Therefore <a href="#parseterm">ParseTerm</a> is provided.</p>
<dl>
-<dt><strong><a name="item_string_2c_integer_2c_boolean">string, integer, boolean</a></strong><br />
-</dt>
+<dt><strong><a name="item_string_2c_integer_2c_boolean">string, integer, boolean</a></strong>
+
<dd>
-Stored as a scalar.
+<p>Stored as a scalar.</p>
</dd>
-<p></p>
-<dt><strong><a name="item_list">list</a></strong><br />
-</dt>
+</li>
+<dt><strong><a name="item_list">list</a></strong>
+
<dd>
-Stored as a reference to a list of PerlYCPValues.
+<p>Stored as a reference to a list of PerlYCPValues.</p>
</dd>
-<p></p>
-<dt><strong><a name="item_map">map</a></strong><br />
-</dt>
+</li>
+<dt><strong><a name="item_map">map</a></strong>
+
<dd>
-Stored as a reference to a map of PerlYCPValues.
+<p>Stored as a reference to a map of PerlYCPValues.</p>
</dd>
-<p></p>
-<dt><strong><a name="item_path">path</a></strong><br />
-</dt>
+</li>
+<dt><strong><a name="item_path">path</a></strong>
+
<dd>
-Stored as a reference to a string (starting with a ``.'' as expected).
+<p>Stored as a reference to a string (starting with a ``.'' as expected).</p>
</dd>
-<p></p>
-<dt><strong><a name="item_nil">nil (void)</a></strong><br />
-</dt>
+</li>
+<dt><strong><a name="item_nil">nil (void)</a></strong>
+
<dd>
-Stored as an undef.
+<p>Stored as an undef.</p>
</dd>
-<p></p></dl>
+</li>
+</dl>
<p>
</p>
<hr />
@@ -153,6 +157,23 @@
arguments (<a href="#perlycpvalue">PerlYCPValue</a>)</p>
<p>
</p>
+<h2><a name="pathcomponents">PathComponents</a></h2>
+<p>PathComponents $path_ref</p>
+<pre>
+ ($cmd, $path) = ParseCommand ('`Read (.foo."%gconf.d"."gernel")'
+ @c = PathComponents (\$path);
+ if ($c[0] eq '%gconf.d' && $c[1] eq "gernel") {...}</pre>
+<p>Converts a path (a string reference, <a href="#perlycpvalue">PerlYCPValue</a>) to a list
+of its components. It deals with the nontrivial parts of path syntax.
+On error it returns undef.</p>
+<pre>
+ . -> ()
+ .foo.bar -> ('foo', 'bar')
+ ."foo" -> ('foo')
+ ."double\"quote" -> ('double"quote')
+ ."a.dot" -> ('a.dot')</pre>
+<p>
+</p>
<hr />
<h1><a name="writing">WRITING</a></h1>
<p>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.13.28/agents-perl/lib/ycp.pm new/yast2-core-2.13.30/agents-perl/lib/ycp.pm
--- old/yast2-core-2.13.28/agents-perl/lib/ycp.pm 2005-03-29 18:08:53.000000000 +0200
+++ new/yast2-core-2.13.30/agents-perl/lib/ycp.pm 2006-08-22 12:42:19.000000000 +0200
@@ -18,7 +18,7 @@
# Purpose: Call a perl script within a YCP script
#
#----------------------------------------------------------------------
-# $Id: ycp.pm 15104 2004-03-01 17:10:04Z mvidner $
+# $Id: ycp.pm 32468 2006-08-21 14:44:55Z mvidner $
package ycp;
@@ -85,6 +85,7 @@
my @e_io = qw(
ParseTerm
ParseCommand
+ PathComponents
Return
);
@@ -414,6 +415,64 @@
}
}
+=head2 PathComponents
+
+PathComponents $path_ref
+
+ ($cmd, $path) = ParseCommand ('`Read (.foo."%gconf.d"."gernel")'
+ @c = PathComponents (\$path);
+ if ($c[0] eq '%gconf.d' && $c[1] eq "gernel") {...}
+
+Converts a path (a string reference, L</PerlYCPValue>) to a list
+of its components. It deals with the nontrivial parts of path syntax.
+On error it returns undef.
+
+ . -> ()
+ .foo.bar -> ('foo', 'bar')
+ ."foo" -> ('foo')
+ ."double\"quote" -> ('double"quote')
+ ."a.dot" -> ('a.dot')
+
+=cut
+
+sub PathComponents ($)
+{
+ my $path_ref = shift;
+ if (ref ($path_ref) ne "SCALAR") {
+ y2error ("Expecting a reference to a scalar");
+ return undef;
+ }
+ my $path = $$path_ref;
+
+ return undef if $path eq "";
+ return () if $path eq ".";
+
+ my @result = ();
+
+ while ($path =~ s/^\.(${lex_pathsegment})(.*)/$2/o) {
+ my $segment = $1;
+ if ($segment =~ /^"/) {
+ # FIXME check whether paths are like strings, unify
+ my ($parsed, $err, $rest) = ParseYcpString ($segment);
+ if ($err ne "") {
+ y2error ("Bad complex path component: '$err'");
+ return undef;
+ }
+ elsif ($rest ne "") {
+ y2error ("Extra characters in path component: '$rest'");
+ return undef;
+ }
+ $segment = $parsed;
+ }
+ push @result, $segment;
+ }
+ if ($path ne "") {
+ y2error ("Extra characters in path: '$path'");
+ return undef;
+ }
+ return @result;
+}
+
# Internal
# Parses a YCP list. The input must start with "["
# A comma after the last element is permitted.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.13.28/agents-perl/lib/ycp.test new/yast2-core-2.13.30/agents-perl/lib/ycp.test
--- old/yast2-core-2.13.28/agents-perl/lib/ycp.test 2005-03-29 18:08:53.000000000 +0200
+++ new/yast2-core-2.13.30/agents-perl/lib/ycp.test 2006-08-22 12:42:19.000000000 +0200
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w
#
-# $Id: ycp.test 16068 2004-03-11 18:58:54Z mvidner $
+# $Id: ycp.test 32464 2006-08-21 14:17:28Z mvidner $
#
# Test suite for ycp.pm
# Author: Martin Vidner
@@ -41,6 +41,17 @@
}
}
+sub ListCompare ($$)
+{
+ my ($a, $b) = @_;
+ return 0 if scalar(@$a) != scalar (@$b);
+ my $i = 0;
+ foreach my $v (@$a) {
+ return 0 if ($v ne $b->[$i++]);
+ }
+ return 1;
+}
+
my @string_test =
(
[ '"a boring string", more_ycp', 'a boring string' ],
@@ -96,21 +107,43 @@
(
# simple cases
[ '.',
- '.' ],
+ '.',
+ [],
+ ],
[ '.a-path.that_rules',
- '.a-path.that_rules' ],
+ '.a-path.that_rules',
+ ['a-path', 'that_rules'],
+ ],
# quoted paths: so far libycp does not strip quotes even if possible
[ '."foo"',
- '."foo"' ],
+ '."foo"',
+ ['foo'],
+ ],
[ '.""',
- '.""' ],
+ '.""',
+ [''],
+ ],
[ '.foo."bar"',
- '.foo."bar"' ],
+ '.foo."bar"',
+ ['foo', 'bar'],
+ ],
[ '."foo".bar',
- '."foo".bar' ],
+ '."foo".bar',
+ ['foo', 'bar'],
+ ],
# nasty cases when we strip quotes
[ '."trailing-dash-"',
- '."trailing-dash-"' ],
+ '."trailing-dash-"',
+ ['trailing-dash-'],
+ ],
+ [ '."double\"quote"',
+ '."double\"quote"',
+ ['double"quote'],
+ ],
+ [ '."a.dot"',
+ '."a.dot"',
+ ['a.dot'],
+ ],
);
# return true on sucess
@@ -126,6 +159,34 @@
};
}
+my @path_comp_fail =
+ (
+ 'foo',
+ \ 42,
+ \ '',
+ \ 'foo',
+ \ '.+',
+ \ '."',
+ \ '."truncated',
+ \ '."extra"chars',
+ );
+sub TestPathComponents ()
+{
+ print "TestPathComponents\n";
+ foreach my $case (@path_test)
+ {
+ my $p = Parse ($case->[0]);
+ Result (ListCompare ([ycp::PathComponents ($p)], $case->[2]));
+ }
+ print "TestPathComponents errors\n";
+ foreach my $case (@path_comp_fail)
+ {
+ my $pcase = ref($case)? "r'$$case'": "'$case'";
+ print "\t$pcase: " if $verbose;
+ Result (!defined (ycp::PathComponents ($case)));
+ }
+}
+
my @number_test =
(
[ '42', 42 ],
@@ -320,6 +381,7 @@
TestStrings ();
TestByteblocks ();
TestPaths ();
+TestPathComponents ();
TestNumbers ();
TestLists ();
TestMaps ();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.13.28/base/tools/devtools/generateYCPWrappers new/yast2-core-2.13.30/base/tools/devtools/generateYCPWrappers
--- old/yast2-core-2.13.28/base/tools/devtools/generateYCPWrappers 2005-03-29 18:11:08.000000000 +0200
+++ new/yast2-core-2.13.30/base/tools/devtools/generateYCPWrappers 2006-08-22 12:30:51.000000000 +0200
@@ -60,12 +60,10 @@
# handle parameters
my @params = split /,\s*/, $rec { "params" };
-
- print CALL "\t\tcase $position: return m_instance->$func_name (" ;
-
my $paramcount = 1;
-
my @cppparams = ();
+ my @tests = ();
+
while (@params)
{
my @par = split (" ", shift (@params) );
@@ -74,12 +72,15 @@
{
$type = $par [1];
}
- $type =~ s/^YCP(\w+)&?/as$1/;
- $type = "m_param" . $paramcount . "->" . $type . "()" ;
+ $type =~ s/^YCP(\w+)&?/$1/;
+
+ push (@tests, "if (m_param$paramcount->isVoid()) {y2error(\"ERROR: Parameter $paramcount is nil, ".$type." is required\"); return YCPVoid();}");
+
+ $type = "m_param" . $paramcount . "->as" . $type . "()" ;
push @cppparams, $type;
$paramcount++;
}
- print CALL join (", ", @cppparams) . "); \n" ;
+ print CALL "\t\tcase $position: ". join (" ", @tests) . " return m_instance->$func_name (" . join (", ", @cppparams) . "); \n" ;
print REGISTER "\tenterSymbol (new SymbolEntry (this, $position, " ;
print REGISTER "\"$func_name\", SymbolEntry::c_function, Type::fromSignature (\"$signature\") ) );\n";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.13.28/configure.in new/yast2-core-2.13.30/configure.in
--- old/yast2-core-2.13.28/configure.in 2006-08-09 15:33:25.000000000 +0200
+++ new/yast2-core-2.13.30/configure.in 2006-08-22 13:08:50.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-core
dnl
-dnl -- This file is generated by y2autoconf 2.13.20 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-core, 2.13.28, http://bugs.opensuse.org/, yast2-core)
+AC_INIT(yast2-core, 2.13.30, http://bugs.opensuse.org/, yast2-core)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.28"
+VERSION="2.13.30"
RPMNAME="yast2-core"
MAINTAINER="Martin Vidner "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.13.28/libyui/doc/examples/Layout-Stretchable2.ycp new/yast2-core-2.13.30/libyui/doc/examples/Layout-Stretchable2.ycp
--- old/yast2-core-2.13.28/libyui/doc/examples/Layout-Stretchable2.ycp 2005-12-13 14:46:32.000000000 +0100
+++ new/yast2-core-2.13.30/libyui/doc/examples/Layout-Stretchable2.ycp 1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-{
- // Layout example:
- //
- // Build a dialog with three widgets without any weights.
- //
- // Each widget will get its "nice size", i.e. the size that makes
- // the widget's contents fit into it.
- //
- // Upon resize the first and the last widgets will stretch, the
- // center widget will retain its size.
- //
- // The stretchable widgets will get an equal share of the extra
- // space in addition to their "nice size". They are not
- // (generally) of equal size!
- //
-
- UI::OpenDialog(
- `VBox (
- `HBox(
- `TextEntry( `opt(`hstretch, `default), "I am stretchable" ),
- `TextEntry( "I am not" ),
- `TextEntry( `opt(`hstretch ), "I am stretchable, too" )
- ),
- `HBox(
- `PushButton( `opt(`hstretch, `default), "I am stretchable" ),
- `PushButton( "I am not" ),
- `PushButton( `opt(`hstretch ), "I am stretchable, too" )
- )
- )
- );
-
- UI::UserInput();
- UI::CloseDialog();
-}
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.13.28/libyui/src/YTree.cc new/yast2-core-2.13.30/libyui/src/YTree.cc
--- old/yast2-core-2.13.28/libyui/src/YTree.cc 2006-08-07 09:49:29.000000000 +0200
+++ new/yast2-core-2.13.30/libyui/src/YTree.cc 2006-08-22 12:42:21.000000000 +0200
@@ -91,9 +91,8 @@
{
YTreeItem *it = findItemWithId ( newvalue );
- // Let user also pass a string of the item text instead of an id...
- if ( ! it && newvalue->isString() )
- it = findItemWithText ( newvalue->asString() );
+ if ( ! it )
+ it = findItemWithText ( newvalue->asString() );
if ( it )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.13.28/libyui/src/include/YDate.h new/yast2-core-2.13.30/libyui/src/include/YDate.h
--- old/yast2-core-2.13.28/libyui/src/include/YDate.h 2005-03-29 18:10:58.000000000 +0200
+++ new/yast2-core-2.13.30/libyui/src/include/YDate.h 2006-08-22 12:42:21.000000000 +0200
@@ -64,7 +64,7 @@
/**
* change the label of the Date entry. Overload this, but call
- * YTextEntry::setLabel at the end of your own function.
+ * YDate::setLabel at the end of your own function.
*/
virtual void setLabel( const YCPString & label );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.13.28/libyui/src/include/YRichText.h new/yast2-core-2.13.30/libyui/src/include/YRichText.h
--- old/yast2-core-2.13.28/libyui/src/include/YRichText.h 2005-03-29 18:10:58.000000000 +0200
+++ new/yast2-core-2.13.30/libyui/src/include/YRichText.h 2006-08-22 12:42:21.000000000 +0200
@@ -55,7 +55,7 @@
/**
* Change the RichText text. Overload this, but call
- * YRichText::setRichText at the end of your own function.
+ * YRichText::setText at the end of your own function.
*/
virtual void setText( const YCPString & RichText );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.13.28/libyui/src/include/YSelectionWidget.h new/yast2-core-2.13.30/libyui/src/include/YSelectionWidget.h
--- old/yast2-core-2.13.28/libyui/src/include/YSelectionWidget.h 2005-07-21 12:33:40.000000000 +0200
+++ new/yast2-core-2.13.30/libyui/src/include/YSelectionWidget.h 2006-08-22 12:42:21.000000000 +0200
@@ -127,7 +127,7 @@
/**
* Change the label text. Overload this, but call
- * YTextEntry::setLabel at the end of your own function.
+ * YSelectionWidget::setLabel at the end of your own function.
*/
virtual void setLabel( const YCPString & label );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.13.28/libyui/src/include/YTime.h new/yast2-core-2.13.30/libyui/src/include/YTime.h
--- old/yast2-core-2.13.28/libyui/src/include/YTime.h 2005-03-29 18:10:58.000000000 +0200
+++ new/yast2-core-2.13.30/libyui/src/include/YTime.h 2006-08-22 12:42:21.000000000 +0200
@@ -64,7 +64,7 @@
/**
* change the label of the Time entry. Overload this, but call
- * YTextEntry::setLabel at the end of your own function.
+ * YTime::setLabel at the end of your own function.
*/
virtual void setLabel( const YCPString & label );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.13.28/libyui/src/include/YTree.h new/yast2-core-2.13.30/libyui/src/include/YTree.h
--- old/yast2-core-2.13.28/libyui/src/include/YTree.h 2006-02-24 14:34:21.000000000 +0100
+++ new/yast2-core-2.13.30/libyui/src/include/YTree.h 2006-08-22 12:42:21.000000000 +0200
@@ -104,7 +104,7 @@
/**
* Change the label text. Overload this, but call
- * YTextEntry::setLabel at the end of your own function.
+ * YTree::setLabel at the end of your own function.
*/
virtual void setLabel( const YCPString & label );
@@ -154,7 +154,7 @@
/**
* Returns the index of the currently
- * selected item or -1 if no item is selected.
+ * selected item or NULL if no item is selected.
*/
virtual const YTreeItem * getCurrentItem() const = 0;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org