Hello community, here is the log from the commit of package yast2-gtk checked in at Tue Apr 22 00:06:12 CEST 2008. -------- --- yast2-gtk/yast2-gtk.changes 2008-04-03 23:04:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-gtk/yast2-gtk.changes 2008-04-21 20:10:58.356734000 +0200 @@ -1,0 +2,7 @@ +Mon Apr 21 20:13:49 CEST 2008 - jpr@suse.de + +- Fix live installer sizing (bnc #381153) +- Combo box improvements +- Minor warning fixes + +------------------------------------------------------------------- Old: ---- yast2-gtk-2.16.7.tar.bz2 New: ---- yast2-gtk-2.16.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-gtk.spec ++++++ --- /var/tmp/diff_new_pack.l20509/_old 2008-04-22 00:05:57.000000000 +0200 +++ /var/tmp/diff_new_pack.l20509/_new 2008-04-22 00:05:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-gtk (Version 2.16.7) +# spec file for package yast2-gtk (Version 2.16.8) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,12 +13,12 @@ Url: http://en.opensuse.org/YaST2-GTK Name: yast2-gtk -Version: 2.16.7 +Version: 2.16.8 Release: 1 License: LGPL v2.1 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-gtk-2.16.7.tar.bz2 +Source0: yast2-gtk-2.16.8.tar.bz2 Prefix: /usr Source2: yast2-gtk-rpmlintrc BuildRequires: blocxx-devel gcc-c++ gtk2-devel libxcrypt-devel libzypp-devel yast2-devtools @@ -41,7 +41,7 @@ Michael Meeks %prep -%setup -n yast2-gtk-2.16.7 +%setup -n yast2-gtk-2.16.8 %build %{prefix}/bin/y2tool y2autoconf @@ -71,6 +71,10 @@ %{_libdir}/YaST2/plugin/libpy2gtk.so.* %{_libdir}/YaST2/plugin/libpy2gtk.so %changelog +* Mon Apr 21 2008 jpr@suse.de +- Fix live installer sizing (bnc #381153) +- Combo box improvements +- Minor warning fixes * Fri Apr 04 2008 coolo@suse.de - adopt to latest libzypp * Fri Mar 28 2008 jpr@suse.de ++++++ yast2-gtk-2.16.7.tar.bz2 -> yast2-gtk-2.16.8.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.7/ChangeLog new/yast2-gtk-2.16.8/ChangeLog --- old/yast2-gtk-2.16.7/ChangeLog 2008-03-26 08:35:39.000000000 +0100 +++ new/yast2-gtk-2.16.8/ChangeLog 2008-04-21 19:52:26.000000000 +0200 @@ -1,3 +1,24 @@ +2008-04-21 Michael Meeks <michael.meeks@novell.com> + + * src/YGSelectionModel.cc (findByText): implemented. + +2008-04-21 Michael Meeks <michael.meeks@novell.com> + + * src/YGSelectionModel.cc (findByText), + * src/YGComboBox.cc (setText): stub switching to an existing + entry if a setText for an existing item comes in (on a non-editable + combo box) - instead of failing. No impl yet. + + * src/ygtksteps.c (ygtk_steps_get_step_layout): don't return a + NULL layout_bold layout. + (ygtk_steps_size_request): init w & h to 0 at least in case of NULL + layout. + +2008-04-16 Michael Meeks <michael.meeks@novell.com> + + * src/YGUI.cc, src/YGPackageSelector.cc: fix a few format warnings. + * src/ygdkmngloader.c: fix unitialized variable + 2008-03-26 Ricardo Cruz <rpmcruz@alunos.dcc.fc.up.pt> * src/yzyppwrapper.cc: fixed Patterns install_packages() warning. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.7/config.guess new/yast2-gtk-2.16.8/config.guess --- old/yast2-gtk-2.16.7/config.guess 2008-01-16 14:37:35.000000000 +0100 +++ new/yast2-gtk-2.16.8/config.guess 2008-04-21 20:00:08.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2006-07-02' +timestamp='2008-01-08' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -56,8 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -171,6 +171,7 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -339,7 +340,7 @@ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:*) + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) @@ -541,7 +542,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[45]) + *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -790,7 +791,7 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - i*:MINGW*:*) + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -800,12 +801,18 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[3456]*) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T:Interix*:[3456]*) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -839,10 +846,17 @@ echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu + else + echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi + fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu @@ -960,6 +974,9 @@ x86_64:Linux:*:*) echo x86_64-${VENDOR}-linux-gnu exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -1218,6 +1235,15 @@ SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.7/config.sub new/yast2-gtk-2.16.8/config.sub --- old/yast2-gtk-2.16.7/config.sub 2008-01-16 14:37:35.000000000 +0100 +++ new/yast2-gtk-2.16.8/config.sub 2008-04-21 20:00:08.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2006-09-20' +timestamp='2008-01-16' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -72,8 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -245,12 +245,12 @@ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -324,7 +324,7 @@ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ @@ -369,10 +369,14 @@ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-*) ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -443,6 +447,14 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; c90) basic_machine=c90-cray os=-unicos @@ -475,8 +487,8 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -668,6 +680,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -683,6 +703,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -809,6 +833,14 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -925,6 +957,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -1014,6 +1049,10 @@ basic_machine=tic6x-unknown os=-coff ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -1219,7 +1258,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1414,6 +1453,9 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.7/configure new/yast2-gtk-2.16.8/configure --- old/yast2-gtk-2.16.7/configure 2008-02-27 16:27:09.000000000 +0100 +++ new/yast2-gtk-2.16.8/configure 2008-04-21 20:00:05.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-gtk 2.16.1. +# Generated by GNU Autoconf 2.61 for yast2-gtk 2.16.8. # # Report bugs to http://bugs.opensuse.org/. # @@ -728,8 +728,8 @@ # Identity of this package. PACKAGE_NAME='yast2-gtk' PACKAGE_TARNAME='yast2-gtk' -PACKAGE_VERSION='2.16.1' -PACKAGE_STRING='yast2-gtk 2.16.1' +PACKAGE_VERSION='2.16.8' +PACKAGE_STRING='yast2-gtk 2.16.8' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1446,7 +1446,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-gtk 2.16.1 to adapt to many kinds of systems. +`configure' configures yast2-gtk 2.16.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1517,7 +1517,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-gtk 2.16.1:";; + short | recursive ) echo "Configuration of yast2-gtk 2.16.8:";; esac cat <<_ACEOF @@ -1628,7 +1628,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<_ACEOF -yast2-gtk configure 2.16.1 +yast2-gtk configure 2.16.8 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-gtk $as_me 2.16.1, which was +It was created by yast2-gtk $as_me 2.16.8, 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-gtk' - VERSION='2.16.1' + VERSION='2.16.8' cat >>confdefs.h <<_ACEOF @@ -2691,7 +2691,7 @@ -VERSION="2.16.1" +VERSION="2.16.8" RPMNAME="yast2-gtk" MAINTAINER="Ricardo Cruz <rpmcruz@alunos.dcc.fc.up.pt> \ Michael Meeks <michael.meeks@novell.com>" @@ -2934,8 +2934,8 @@ if test -z "$XGETTEXT" ; then - { { echo "$as_me:$LINENO: error: xgettext is missing; please install gettext-devel." >&5 -echo "$as_me: error: xgettext is missing; please install gettext-devel." >&2;} + { { echo "$as_me:$LINENO: error: xgettext is missing; please install gettext-tools." >&5 +echo "$as_me: error: xgettext is missing; please install gettext-tools." >&2;} { (exit 1); exit 1; }; } fi @@ -22308,7 +22308,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-gtk $as_me 2.16.1, which was +This file was extended by yast2-gtk $as_me 2.16.8, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22361,7 +22361,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\ -yast2-gtk config.status 2.16.1 +yast2-gtk config.status 2.16.8 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-gtk-2.16.7/configure.in new/yast2-gtk-2.16.8/configure.in --- old/yast2-gtk-2.16.7/configure.in 2008-01-16 14:37:15.000000000 +0100 +++ new/yast2-gtk-2.16.8/configure.in 2008-04-21 19:59:52.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-gtk dnl -dnl -- This file is generated by y2autoconf 2.16.3 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-gtk, 2.16.1, http://bugs.opensuse.org/, yast2-gtk) +AC_INIT(yast2-gtk, 2.16.8, http://bugs.opensuse.org/, yast2-gtk) 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.1" +VERSION="2.16.8" RPMNAME="yast2-gtk" MAINTAINER="Ricardo Cruz <rpmcruz@alunos.dcc.fc.up.pt> \ Michael Meeks <michael.meeks@novell.com>" @@ -109,7 +109,7 @@ dnl no need for AC_ARG_VAR AC_PATH_PROG(XGETTEXT, xgettext) if test -z "$XGETTEXT" ; then - AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) + AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.7/depcomp new/yast2-gtk-2.16.8/depcomp --- old/yast2-gtk-2.16.7/depcomp 2008-01-16 14:37:34.000000000 +0100 +++ new/yast2-gtk-2.16.8/depcomp 2008-04-21 20:00:08.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2006-10-15.18 +scriptversion=2007-03-29.01 -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software # Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -215,34 +215,39 @@ # current directory. Also, the AIX compiler puts `$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - stripped=`echo "$object" | sed 's/(.*)..*$/\1/'` - tmpdepfile="$stripped.u" + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/.o$//' -e 's/.lo$//'` if test "$libtool" = yes; then + tmpdepfile1=$dir$base.u + tmpdepfile2=$base.u + tmpdepfile3=$dir.libs/$base.u "$@" -Wc,-M else + tmpdepfile1=$dir$base.u + tmpdepfile2=$dir$base.u + tmpdepfile3=$dir$base.u "$@" -M fi stat=$? - if test -f "$tmpdepfile"; then : - else - stripped=`echo "$stripped" | sed 's,^.*/,,'` - tmpdepfile="$stripped.u" - fi - if test $stat -eq 0; then : else - rm -f "$tmpdepfile" + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done if test -f "$tmpdepfile"; then - outname="$stripped.o" # Each line is of the form `foo.o: dependent.h'. # Do two passes, one to just change these to # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" - sed -e "s,^$outname: (.*)$,\1:," < "$tmpdepfile" >> "$depfile" + sed -e "s,^.*.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a tab and a space in the []. + sed -e 's,^.*.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.7/install-sh new/yast2-gtk-2.16.8/install-sh --- old/yast2-gtk-2.16.7/install-sh 2008-01-16 14:37:33.000000000 +0100 +++ new/yast2-gtk-2.16.8/install-sh 2008-04-21 20:00:08.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2006-10-14.15 +scriptversion=2006-12-25.00 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -48,7 +48,7 @@ # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" +doit=${DOITPROG-} if test -z "$doit"; then doit_exec=exec else @@ -58,34 +58,49 @@ # Put in absolute file names if you don't have them in your path; # or use environment vars. -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" +chgrpprog=${CHGRPPROG-chgrp} +chmodprog=${CHMODPROG-chmod} +chownprog=${CHOWNPROG-chown} +cmpprog=${CMPPROG-cmp} +cpprog=${CPPROG-cp} +mkdirprog=${MKDIRPROG-mkdir} +mvprog=${MVPROG-mv} +rmprog=${RMPROG-rm} +stripprog=${STRIPPROG-strip} + +posix_glob='?' +initialize_posix_glob=' + test "$posix_glob" != "?" || { + if (set -f) 2>/dev/null; then + posix_glob= + else + posix_glob=: + fi + } +' -posix_glob= posix_mkdir= # Desired mode of installed file. mode=0755 +chgrpcmd= chmodcmd=$chmodprog chowncmd= -chgrpcmd= -stripcmd= +mvcmd=$mvprog rmcmd="$rmprog -f" -mvcmd="$mvprog" +stripcmd= + src= dst= dir_arg= -dstarg= +dst_arg= + +copy_on_change=false no_target_directory= -usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE +usage="\ +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE or: $0 [OPTION]... SRCFILES... DIRECTORY or: $0 [OPTION]... -t DIRECTORY SRCFILES... or: $0 [OPTION]... -d DIRECTORIES... @@ -95,65 +110,55 @@ In the 4th, create DIRECTORIES. Options: --c (ignored) --d create directories instead of installing files. --g GROUP $chgrpprog installed files to GROUP. --m MODE $chmodprog installed files to MODE. --o USER $chownprog installed files to USER. --s $stripprog installed files. --t DIRECTORY install into DIRECTORY. --T report an error if DSTFILE is a directory. ---help display this help and exit. ---version display version info and exit. + --help display this help and exit. + --version display version info and exit. + + -c (ignored) + -C install only if different (preserve the last data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. + -s $stripprog installed files. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG " while test $# -ne 0; do case $1 in - -c) shift - continue;; + -c) ;; + + -C) copy_on_change=true;; - -d) dir_arg=true - shift - continue;; + -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - shift - shift case $mode in *' '* | *' '* | *' '* | *'*'* | *'?'* | *'['*) echo "$0: invalid mode: $mode" >&2 exit 1;; esac - continue;; + shift;; -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -s) stripcmd=$stripprog - shift - continue;; - - -t) dstarg=$2 - shift - shift - continue;; - - -T) no_target_directory=true - shift - continue;; + shift;; + + -s) stripcmd=$stripprog;; + + -t) dst_arg=$2 + shift;; + + -T) no_target_directory=true;; --version) echo "$0 $scriptversion"; exit $?;; @@ -165,21 +170,22 @@ *) break;; esac + shift done -if test $# -ne 0 && test -z "$dir_arg$dstarg"; then +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. # Otherwise, the last argument is the destination. Remove it from $@. for arg do - if test -n "$dstarg"; then + if test -n "$dst_arg"; then # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dstarg" + set fnord "$@" "$dst_arg" shift # fnord fi shift # arg - dstarg=$arg + dst_arg=$arg done fi @@ -224,7 +230,7 @@ do # Protect names starting with `-'. case $src in - -*) src=./$src ;; + -*) src=./$src;; esac if test -n "$dir_arg"; then @@ -242,22 +248,22 @@ exit 1 fi - if test -z "$dstarg"; then + if test -z "$dst_arg"; then echo "$0: no destination specified." >&2 exit 1 fi - dst=$dstarg + dst=$dst_arg # Protect names starting with `-'. case $dst in - -*) dst=./$dst ;; + -*) dst=./$dst;; esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then if test -n "$no_target_directory"; then - echo "$0: $dstarg: Is a directory" >&2 + echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi dstdir=$dst @@ -378,26 +384,19 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix=/ ;; - -*) prefix=./ ;; - *) prefix= ;; + /*) prefix='/';; + -*) prefix='./';; + *) prefix='';; esac - case $posix_glob in - '') - if (set -f) 2>/dev/null; then - posix_glob=true - else - posix_glob=false - fi ;; - esac + eval "$initialize_posix_glob" oIFS=$IFS IFS=/ - $posix_glob && set -f + $posix_glob set -f set fnord $dstdir shift - $posix_glob && set +f + $posix_glob set +f IFS=$oIFS prefixes= @@ -459,41 +458,54 @@ # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $cpprog $src $dsttmp" command. # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # Now rename the file to the real destination. - { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ - || { - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - if test -f "$dst"; then - $doit $rmcmd -f "$dst" 2>/dev/null \ - || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ - && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ - || { - echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - else - : - fi - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - } || exit 1 + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # If -C, don't bother to copy if it wouldn't change the file. + if $copy_on_change && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + + eval "$initialize_posix_glob" && + $posix_glob set -f && + set X $old && old=:$2:$4:$5:$6 && + set X $new && new=:$2:$4:$5:$6 && + $posix_glob set +f && + + test "$old" = "$new" && + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 + then + rm -f "$dsttmp" + else + # Rename the file to the real destination. + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + { + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + fi || exit 1 trap '' 0 fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.7/ltmain.sh new/yast2-gtk-2.16.8/ltmain.sh --- old/yast2-gtk-2.16.7/ltmain.sh 2008-01-12 05:20:12.000000000 +0100 +++ new/yast2-gtk-2.16.8/ltmain.sh 2008-04-12 20:52:42.000000000 +0200 @@ -2,7 +2,7 @@ # NOTE: Changing this file will not affect anything until you rerun configure. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007 Free Software Foundation, Inc. +# 2007, 2008 Free Software Foundation, Inc. # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 # # This program is free software; you can redistribute it and/or modify @@ -43,8 +43,8 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.5.24 -TIMESTAMP=" (1.1220.2.455 2007/06/24 02:13:29)" +VERSION=1.5.26 +TIMESTAMP=" (1.1220.2.492 2008/01/30 06:40:56)" # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -113,15 +113,21 @@ # These must not be set unconditionally because not all systems understand # e.g. LANG=C (notably SCO). # We save the old values to restore during execute mode. -for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +lt_env= +for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do eval "if test "${$lt_var+set}" = set; then save_$lt_var=$$lt_var + lt_env="$lt_var=$$lt_var $lt_env" $lt_var=C export $lt_var fi" done +if test -n "$lt_env"; then + lt_env="env $lt_env" +fi + # Make sure IFS has a sensible default lt_nl=' ' @@ -485,7 +491,7 @@ echo "\ $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP -Copyright (C) 2007 Free Software Foundation, Inc. +Copyright (C) 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." exit $? @@ -788,6 +794,7 @@ *.for) xform=for ;; *.java) xform=java ;; *.obj) xform=obj ;; + *.sx) xform=sx ;; esac libobj=`$echo "X$libobj" | $Xsed -e "s/.$xform$/.lo/"` @@ -956,7 +963,7 @@ $run $rm "$lobj" "$output_obj" $show "$command" - if $run eval "$command"; then : + if $run eval $lt_env "$command"; then : else test -n "$output_obj" && $run $rm $removelist exit $EXIT_FAILURE @@ -1028,7 +1035,7 @@ command="$command$suppress_output" $run $rm "$obj" "$output_obj" $show "$command" - if $run eval "$command"; then : + if $run eval $lt_env "$command"; then : else $run $rm $removelist exit $EXIT_FAILURE @@ -1161,6 +1168,7 @@ thread_safe=no vinfo= vinfo_number=no + single_module="${wl}-single_module" func_infer_tag $base_compile @@ -1646,6 +1654,11 @@ continue ;; + -multi_module) + single_module="${wl}-multi_module" + continue + ;; + -module) module=yes continue @@ -2149,7 +2162,12 @@ continue fi name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` - for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do + if test "$linkmode" = lib; then + searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" + else + searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" + fi + for searchdir in $searchdirs; do for search_ext in .la $std_shrext .so .a; do # Search the libtool library lib="$searchdir/lib${name}${search_ext}" @@ -2945,12 +2963,18 @@ # we do not want to link against static libs, # but need to link against shared eval deplibrary_names=`${SED} -n -e 's/^library_names=(.*)$/\1/p' $deplib` + eval deplibdir=`${SED} -n -e 's/^libdir=(.*)$/\1/p' $deplib` if test -n "$deplibrary_names" ; then for tmp in $deplibrary_names ; do depdepl=$tmp done - if test -f "$path/$depdepl" ; then + if test -f "$deplibdir/$depdepl" ; then + depdepl="$deplibdir/$depdepl" + elif test -f "$path/$depdepl" ; then depdepl="$path/$depdepl" + else + # Can't find it, oh well... + depdepl= fi # do not add paths which are already there case " $newlib_search_path " in @@ -3098,9 +3122,10 @@ case $linkmode in oldlib) - if test -n "$deplibs"; then - $echo "$modename: warning: `-l' and `-L' are ignored for archives" 1>&2 - fi + case " $deplibs" in + *\ -l* | *\ -L*) + $echo "$modename: warning: `-l' and `-L' are ignored for archives" 1>&2 ;; + esac if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then $echo "$modename: warning: `-dlopen' is ignored for archives" 1>&2 @@ -4237,9 +4262,10 @@ ;; obj) - if test -n "$deplibs"; then - $echo "$modename: warning: `-l' and `-L' are ignored for objects" 1>&2 - fi + case " $deplibs" in + *\ -l* | *\ -L*) + $echo "$modename: warning: `-l' and `-L' are ignored for objects" 1>&2 ;; + esac if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then $echo "$modename: warning: `-dlopen' is ignored for objects" 1>&2 @@ -6478,7 +6504,7 @@ fi # Restore saved environment variables - for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do eval "if test "${save_$lt_var+set}" = set; then $lt_var=$save_$lt_var; export $lt_var diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.7/src/YGComboBox.cc new/yast2-gtk-2.16.8/src/YGComboBox.cc --- old/yast2-gtk-2.16.7/src/YGComboBox.cc 2008-02-28 13:53:40.000000000 +0100 +++ new/yast2-gtk-2.16.8/src/YGComboBox.cc 2008-04-21 19:52:26.000000000 +0200 @@ -48,7 +48,7 @@ void unblockEvents() { g_signal_handlers_unblock_by_func (getWidget(), (gpointer) selected_changed_cb, this); } - GtkEntry *getEntry() + GtkEntry *getEntry () { if (!GTK_IS_COMBO_BOX_ENTRY (getWidget())) { y2error ("YGComboBox: trying to edit read-only combo box"); @@ -73,7 +73,12 @@ { IMPL blockEvents(); - gtk_entry_set_text (getEntry(), value.c_str()); + + GtkTreeIter iter; + if (findByText (value, &iter)) + setFocusItem (&iter); + else + gtk_entry_set_text (getEntry(), value.c_str()); unblockEvents(); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.7/src/ygdkmngloader.c new/yast2-gtk-2.16.8/src/ygdkmngloader.c --- old/yast2-gtk-2.16.7/src/ygdkmngloader.c 2008-01-16 14:36:27.000000000 +0100 +++ new/yast2-gtk-2.16.8/src/ygdkmngloader.c 2008-04-17 13:55:41.000000000 +0200 @@ -243,7 +243,7 @@ if (chunk_size > 1) { // Read TERM chunk data - guint8 t; + guint8 t = 0; error = !read_uint8 (&data, &t); // term action if (t == 3 && chunk_size == 2+8) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.7/src/YGPackageSelector.cc new/yast2-gtk-2.16.8/src/YGPackageSelector.cc --- old/yast2-gtk-2.16.7/src/YGPackageSelector.cc 2008-04-03 23:02:00.000000000 +0200 +++ new/yast2-gtk-2.16.8/src/YGPackageSelector.cc 2008-04-17 13:55:41.000000000 +0200 @@ -2009,9 +2009,9 @@ GtkWidget *dialog, *view; dialog = gtk_message_dialog_new (YGDialog::currentWindow(), - GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, - GTK_BUTTONS_OK, _("Disk Almost Full !")); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, "%s", _("Disk Almost Full !")); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", _("One of the partitions is reaching its limit of capacity. You may " "have to remove packages if you wish to install some.")); @@ -2286,8 +2286,8 @@ dialog = gtk_message_dialog_new (YGDialog::currentWindow(), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, - GTK_BUTTONS_NONE, _("Changes not saved!")); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + GTK_BUTTONS_NONE, "%s", _("Changes not saved!")); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", _("Quit anyway?")); gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_NO, GTK_STOCK_QUIT, GTK_RESPONSE_YES, NULL); @@ -2441,9 +2441,9 @@ // interface GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), - GtkDialogFlags (0), GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, - _("There are some conflicts on the transaction that must be " - "solved manually.")); + GtkDialogFlags (0), GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", + _("There are some conflicts on the transaction that must be " + "solved manually.")); gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_APPLY, GTK_RESPONSE_APPLY, NULL); @@ -2507,10 +2507,10 @@ static void errorMsg (const std::string &header, const std::string &message) { GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), - GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, - header.c_str(), NULL); + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, + "%s", header.c_str()); gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), - message.c_str()); + "%s", message.c_str()); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } @@ -2565,25 +2565,25 @@ msg += dirname; GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), - GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK_CANCEL, - _("Create Dependency Resolver Test Case"), NULL); + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK_CANCEL, + "%s", _("Create Dependency Resolver Test Case")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - msg.c_str()); + "%s", msg.c_str()); int ret = gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); if (ret == GTK_RESPONSE_OK) { if (Ypp::get()->createSolverTestcase (dirname)) { GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), - GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, - GTK_BUTTONS_YES_NO, _("Success"), NULL); + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, + GTK_BUTTONS_YES_NO, "%s", _("Success")); msg = _("Dependency resolver test case written to"); msg += " <tt>"; msg += dirname; msg += "</tt>\n"; msg += _("Prepare <tt>y2logs.tgz tar</tt> archive to attach to Bugzilla?"); gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), - msg.c_str()); + "%s", msg.c_str()); ret = gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); if (ret == GTK_RESPONSE_YES) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.7/src/YGSelectionModel.cc new/yast2-gtk-2.16.8/src/YGSelectionModel.cc --- old/yast2-gtk-2.16.7/src/YGSelectionModel.cc 2008-02-28 13:53:40.000000000 +0100 +++ new/yast2-gtk-2.16.8/src/YGSelectionModel.cc 2008-04-21 19:52:26.000000000 +0200 @@ -178,3 +178,37 @@ gtk_list_store_set (getListStore(), iter, col, select, -1); } +extern "C" { + struct FindClosure { + const string &text; + bool found; + GtkTreeIter *output; + FindClosure(const string &_text, GtkTreeIter *_output) : + text (_text), + found (false), + output (_output) {} + }; + static gboolean find_text (GtkTreeModel *model, GtkTreePath *path, + GtkTreeIter *iter, gpointer data) + { + FindClosure *cl = (FindClosure *)data; + + gchar *label; + gtk_tree_model_get (model, iter, YGSelectionModel::LABEL_COLUMN, &label, -1); + + if (cl->text == label) { + *(cl->output) = *iter; + cl->found = true; + } + g_free (label); + + return cl->found; + } +}; + +bool YGSelectionModel::findByText (const string &text, GtkTreeIter *iter) +{ + FindClosure cl (text, iter); + gtk_tree_model_foreach (getModel(), find_text, (gpointer) &cl); + return cl.found; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.7/src/YGSelectionModel.h new/yast2-gtk-2.16.8/src/YGSelectionModel.h --- old/yast2-gtk-2.16.7/src/YGSelectionModel.h 2008-02-28 13:53:40.000000000 +0100 +++ new/yast2-gtk-2.16.8/src/YGSelectionModel.h 2008-04-21 19:52:26.000000000 +0200 @@ -38,6 +38,7 @@ YItem *getItem (GtkTreeIter *iter); bool getIter (YItem *item, GtkTreeIter *iter); + bool findByText (const string &text, GtkTreeIter *iter); void addRow (GtkTreeIter *iter, YItem *item, bool honor_select); void setCellLabel (GtkTreeIter *iter, int col, const string &label); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.7/src/ygtksteps.c new/yast2-gtk-2.16.8/src/ygtksteps.c --- old/yast2-gtk-2.16.7/src/ygtksteps.c 2008-01-16 14:36:27.000000000 +0100 +++ new/yast2-gtk-2.16.8/src/ygtksteps.c 2008-04-21 19:52:26.000000000 +0200 @@ -107,7 +107,7 @@ } } - if (steps->current_step == step_nb) + if (steps->current_step == step_nb && step->layout_bold != NULL) return step->layout_bold; return step->layout; } @@ -149,7 +149,7 @@ if (!step->is_heading) layout = step->layout_bold; - int w, h; + int w = 0, h = 0; pango_layout_get_pixel_size (layout, &w, &h); w += PANGO_PIXELS (pango_layout_get_indent (layout)); h += PANGO_PIXELS (pango_layout_get_spacing (layout)) * 2; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.7/src/YGUI.cc new/yast2-gtk-2.16.8/src/YGUI.cc --- old/yast2-gtk-2.16.7/src/YGUI.cc 2008-03-25 21:25:12.000000000 +0100 +++ new/yast2-gtk-2.16.8/src/YGUI.cc 2008-04-17 13:55:41.000000000 +0200 @@ -311,7 +311,7 @@ char *error = g_strdup_printf ( "Error: couldn't save y2logs: "%s" (exit value: %d)", command.c_str(), ret); - y2error (error); + y2error ("%s", error); errorMsg (error); g_free (error); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.7/VERSION new/yast2-gtk-2.16.8/VERSION --- old/yast2-gtk-2.16.7/VERSION 2008-04-03 23:04:33.000000000 +0200 +++ new/yast2-gtk-2.16.8/VERSION 2008-04-21 19:54:28.000000000 +0200 @@ -1 +1 @@ -2.16.7 +2.16.8 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org