Hello community,
here is the log from the commit of package opensuse-updater
checked in at Fri Nov 3 19:04:22 CET 2006.
--------
--- KDE/opensuse-updater/opensuse-updater.changes 2006-10-27 18:11:03.000000000 +0200
+++ /mounts/work_src_done/STABLE/opensuse-updater/opensuse-updater.changes 2006-11-03 17:10:06.000000000 +0100
@@ -2 +2 @@
-Fri Oct 27 18:10:58 CEST 2006 - dmueller@suse.de
+Fri Nov 3 17:01:48 CET 2006 - dmacvicar@suse.de
@@ -4 +4,3 @@
-- don't build as root
+- fix reading backend on startup
+- version 0.4
+- r442
Old:
----
opensuseupdater-0.3.tar.bz2
New:
----
opensuseupdater-0.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opensuse-updater.spec ++++++
--- /var/tmp/diff_new_pack.xavxYi/_old 2006-11-03 19:04:13.000000000 +0100
+++ /var/tmp/diff_new_pack.xavxYi/_new 2006-11-03 19:04:13.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package opensuse-updater (Version 0.3)
+# spec file for package opensuse-updater (Version 0.4)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -15,11 +15,12 @@
License: GNU General Public License (GPL) - all versions
Group: System/Management
Summary: KDE updater applet for OpenSUSE
-Version: 0.3
-Release: 15
+Version: 0.4
+Release: 1
URL: http://en.opensuse.org/KDE_Updater_Applet
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: opensuseupdater-%{version}.tar.bz2
+Requires: zypper >= 0.5.3
%description
KDE updater applet for OpenSUSE
@@ -70,8 +71,10 @@
/opt/kde3/share/config.kcfg/opensuseupdater_settings.kcfg
%changelog -n opensuse-updater
-* Fri Oct 27 2006 - dmueller@suse.de
-- don't build as root
+* Fri Nov 03 2006 - dmacvicar@suse.de
+- fix reading backend on startup
+- version 0.4
+- r442
* Tue Oct 24 2006 - dmacvicar@suse.de
- missing kcfg file in spec file
- r438
++++++ opensuseupdater-0.3.tar.bz2 -> opensuseupdater-0.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/Makefile.in new/opensuseupdater-0.4/Makefile.in
--- old/opensuseupdater-0.3/Makefile.in 2006-10-24 14:49:41.000000000 +0200
+++ new/opensuseupdater-0.4/Makefile.in 2006-11-03 17:06:09.000000000 +0100
@@ -960,7 +960,7 @@
#>+ 2
-KDE_DIST=stamp-h.in subdirs Makefile.in opensuse-updater.spec.in configure.files config.h.in configure.in Makefile.cvs aclocal.m4 Doxyfile Makefile.am configure acinclude.m4 subdirs.cvs.sh.7080
+KDE_DIST=stamp-h.in subdirs Makefile.in opensuse-updater.spec.in configure.files config.h.in configure.in Makefile.cvs aclocal.m4 Doxyfile svn-commit.tmp configure Makefile.am acinclude.m4 subdirs.cvs.sh.7080
#>+ 2
docs-am:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/admin/cvs.sh new/opensuseupdater-0.4/admin/cvs.sh
--- old/opensuseupdater-0.3/admin/cvs.sh 2006-10-06 12:23:11.000000000 +0200
+++ new/opensuseupdater-0.4/admin/cvs.sh 2006-11-02 17:34:20.000000000 +0100
@@ -68,7 +68,7 @@
echo "*** KDE requires automake $required_automake_version"
exit 1
;;
- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*)
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
echo "*** $AUTOMAKE_STRING found."
UNSERMAKE=no
;;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/configure new/opensuseupdater-0.4/configure
--- old/opensuseupdater-0.3/configure 2006-10-23 16:20:23.000000000 +0200
+++ new/opensuseupdater-0.4/configure 2006-11-03 17:04:05.000000000 +0100
@@ -2561,7 +2561,7 @@
# Define the identity of the package.
PACKAGE=opensuseupdater
- VERSION=0.3
+ VERSION=0.4
cat >>confdefs.h <<_ACEOF
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/configure.in new/opensuseupdater-0.4/configure.in
--- old/opensuseupdater-0.3/configure.in 2006-10-23 16:20:05.000000000 +0200
+++ new/opensuseupdater-0.4/configure.in 2006-11-03 17:03:43.000000000 +0100
@@ -40,7 +40,7 @@
AC_ARG_PROGRAM
dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(opensuseupdater, 0.3) dnl searches for some needed programs
+AM_INIT_AUTOMAKE(opensuseupdater, 0.4) dnl searches for some needed programs
KDE_SET_PREFIX
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/configure.in.in new/opensuseupdater-0.4/configure.in.in
--- old/opensuseupdater-0.3/configure.in.in 2006-10-18 14:42:13.000000000 +0200
+++ new/opensuseupdater-0.4/configure.in.in 2006-11-03 17:00:38.000000000 +0100
@@ -1,6 +1,6 @@
#MIN_CONFIG(3.2.0)
-AM_INIT_AUTOMAKE(opensuseupdater, 0.3)
+AM_INIT_AUTOMAKE(opensuseupdater, 0.4)
AC_C_BIGENDIAN
AC_CHECK_KDEMAXPATHLEN
KDE_INIT_DOXYGEN([The KDE Updater Applet API Reference], [Version $VERSION])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/doc/en/Makefile.in new/opensuseupdater-0.4/doc/en/Makefile.in
--- old/opensuseupdater-0.3/doc/en/Makefile.in 2006-10-24 14:49:41.000000000 +0200
+++ new/opensuseupdater-0.4/doc/en/Makefile.in 2006-11-03 17:06:09.000000000 +0100
@@ -494,7 +494,7 @@
#>+ 2
-KDE_DIST=Makefile.in index.docbook Makefile.am
+KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
#>+ 24
index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
Binary files old/opensuseupdater-0.3/doc/en/index.cache.bz2 and new/opensuseupdater-0.4/doc/en/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/kzmdauthutil/Makefile.in new/opensuseupdater-0.4/kzmdauthutil/Makefile.in
--- old/opensuseupdater-0.3/kzmdauthutil/Makefile.in 2006-10-24 14:49:41.000000000 +0200
+++ new/opensuseupdater-0.4/kzmdauthutil/Makefile.in 2006-11-03 17:06:09.000000000 +0100
@@ -626,7 +626,7 @@
#>+ 2
-KDE_DIST=Makefile.in Makefile.am
+KDE_DIST=Makefile.in Makefile.am kzmdauthutil
#>+ 2
docs-am:
Binary files old/opensuseupdater-0.3/kzmdauthutil/kzmdauthutil and new/opensuseupdater-0.4/kzmdauthutil/kzmdauthutil differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/opensuse-updater.spec.in new/opensuseupdater-0.4/opensuse-updater.spec.in
--- old/opensuseupdater-0.3/opensuse-updater.spec.in 2006-10-24 14:48:38.000000000 +0200
+++ new/opensuseupdater-0.4/opensuse-updater.spec.in 2006-11-03 16:59:59.000000000 +0100
@@ -13,11 +13,12 @@
License: GPL
Group: System/Management
Summary: KDE updater applet for OpenSUSE
-Version: 0.3
+Version: 0.4
Release: 1
URL: http://en.opensuse.org/KDE_Updater_Applet
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: opensuseupdater-%{version}.tar.bz2
+Requires: zypper >= 0.5.3
%description
KDE updater applet for OpenSUSE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/po/opensuseupdater.pot new/opensuseupdater-0.4/po/opensuseupdater.pot
--- old/opensuseupdater-0.3/po/opensuseupdater.pot 2006-10-18 15:25:47.000000000 +0200
+++ new/opensuseupdater-0.4/po/opensuseupdater.pot 2006-10-26 11:26:38.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-18 15:25+0200\n"
+"POT-Creation-Date: 2006-10-26 11:26+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -15,88 +15,80 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: GeneralConfigWindow.cpp:50
-msgid "Get updates via:"
+#: MainWindow.cpp:95 MainWindow.cpp:179
+msgid "Add/Remove Update Sources..."
msgstr ""
-#: GeneralConfigWindow.cpp:53
-msgid "Automatically start updater on login"
-msgstr ""
-
-#: GeneralConfigWindow.cpp:55
-msgid ""
-"<b>Configure The Updater:</b><br> Below you can select the updater you "
-"would like to use and when we should check for updates<br><u>After "
-"switching backends, this applet must be restarted</u>"
-msgstr ""
-
-#: GeneralConfigWindow.cpp:58
-msgid "Check For Updates Every "
-msgstr ""
-
-#: GeneralConfigWindow.cpp:59
-msgid " Minutes"
-msgstr ""
-
-#: GeneralConfigWindow.cpp:65
-msgid "Novell ZenWorks"
-msgstr ""
-
-#: MainWindow.cpp:99 MainWindow.cpp:182
-msgid "Add/Remove Servers"
-msgstr ""
-
-#: MainWindow.cpp:101
+#: MainWindow.cpp:97
msgid "Install"
msgstr ""
-#: MainWindow.cpp:106
+#: MainWindow.cpp:102
msgid "Clear Selection"
msgstr ""
-#: MainWindow.cpp:147
+#: MainWindow.cpp:143
msgid ""
"<b>Available Updates:</b><br> The following are software upgrades and "
-"patches to add features and fix bugs.<br> <u>Select those you would like and "
-"press install.</u>"
+"patches to add features and fix bugs.<br>"
msgstr ""
-#: MainWindow.cpp:149
+#: MainWindow.cpp:145
msgid "Name"
msgstr ""
-#: MainWindow.cpp:151
+#: MainWindow.cpp:147
msgid "Type"
msgstr ""
-#: MainWindow.cpp:152
+#: MainWindow.cpp:148
msgid "New Version"
msgstr ""
-#: MainWindow.cpp:153
+#: MainWindow.cpp:149
msgid "Catalog"
msgstr ""
-#: MainWindow.cpp:174
+#: MainWindow.cpp:170
msgid "Available Updates"
msgstr ""
-#: MainWindow.cpp:181
-msgid "Configure Applet"
+#: MainWindow.cpp:178
+msgid "Configure Applet..."
msgstr ""
-#: TrayIcon.cpp:45
+#: MainWindow.cpp:296
+msgid "General"
+msgstr ""
+
+#: TrayIcon.cpp:49
+msgid "Checking for updates..."
+msgstr ""
+
+#: TrayIcon.cpp:53
+msgid "Error:\n"
+msgstr ""
+
+#: TrayIcon.cpp:57
msgid "No Updates Available"
msgstr ""
-#: TrayIcon.cpp:51
+#: TrayIcon.cpp:63
msgid " Update Available"
msgstr ""
-#: TrayIcon.cpp:52
+#: TrayIcon.cpp:64
msgid " Updates Available"
msgstr ""
+#: TrayIcon.cpp:70
+msgid " Important Update Available"
+msgstr ""
+
+#: TrayIcon.cpp:71
+msgid " Important Updates Available"
+msgstr ""
+
#: _translatorinfo.cpp:1
msgid ""
"_: NAME OF TRANSLATORS\n"
@@ -108,3 +100,63 @@
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
msgstr ""
+
+#. i18n: file updatersettingswidget_base.ui line 16
+#: rc.cpp:3 updatersettingswidget_base.cpp:75
+#, no-c-format
+msgid "Form1"
+msgstr ""
+
+#. i18n: file updatersettingswidget_base.ui line 27
+#: rc.cpp:6 updatersettingswidget_base.cpp:76
+#, no-c-format
+msgid "Check For Updates Every "
+msgstr ""
+
+#. i18n: file updatersettingswidget_base.ui line 30
+#: rc.cpp:9 updatersettingswidget_base.cpp:77
+#, no-c-format
+msgid " Minutes"
+msgstr ""
+
+#. i18n: file updatersettingswidget_base.ui line 38
+#: rc.cpp:12 updatersettingswidget_base.cpp:78
+#, no-c-format
+msgid "Automa&tically start updater on login"
+msgstr ""
+
+#. i18n: file updatersettingswidget_base.ui line 41
+#: rc.cpp:15 updatersettingswidget_base.cpp:79
+#, no-c-format
+msgid "Alt+T"
+msgstr ""
+
+#. i18n: file updatersettingswidget_base.ui line 49
+#: rc.cpp:18 updatersettingswidget_base.cpp:80
+#, no-c-format
+msgid "Get Updates Via"
+msgstr ""
+
+#. i18n: file updatersettingswidget_base.ui line 68
+#: rc.cpp:24 updatersettingswidget_base.cpp:82
+#, no-c-format
+msgid "Novell ZENWorks"
+msgstr ""
+
+#. i18n: file opensuseupdater_settings.kcfg line 7
+#: rc.cpp:27
+#, no-c-format
+msgid "How often to check for updates."
+msgstr ""
+
+#. i18n: file opensuseupdater_settings.kcfg line 11
+#: rc.cpp:30
+#, no-c-format
+msgid "Automatically start the applet on login"
+msgstr ""
+
+#. i18n: file opensuseupdater_settings.kcfg line 15
+#: rc.cpp:33
+#, no-c-format
+msgid "Width of the main window."
+msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/svn-commit.tmp new/opensuseupdater-0.4/svn-commit.tmp
--- old/opensuseupdater-0.3/svn-commit.tmp 1970-01-01 01:00:00.000000000 +0100
+++ new/opensuseupdater-0.4/svn-commit.tmp 2006-10-23 18:25:11.000000000 +0200
@@ -0,0 +1,18 @@
+
+- string fixes
+- Use KConfigXT and KConfigDialog instead of
+ a plain QWidget for general settings
+
+--This line, and those below, will be ignored--
+
+_M updater
+A updater/opensuseupdater_settings.kcfg
+M updater/GeneralConfigWindow.h
+A updater/opensuseupdater_settings.kcfgc
+M updater/MainWindow.cpp
+A updater/updatersettingswidget_base.ui
+M updater/zypp/ZYppUpdater.cpp
+M updater/MainWindow.h
+M updater/UpdaterApplication.cpp
+M updater/Makefile.am
+M updater/GeneralConfigWindow.cpp
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/udshttp/test/Makefile.in new/opensuseupdater-0.4/udshttp/test/Makefile.in
--- old/opensuseupdater-0.3/udshttp/test/Makefile.in 2006-10-24 14:49:41.000000000 +0200
+++ new/opensuseupdater-0.4/udshttp/test/Makefile.in 2006-11-03 17:06:09.000000000 +0100
@@ -672,7 +672,7 @@
-rm -f udstest.moc.cpp
#>+ 2
-KDE_DIST=Makefile.in Makefile.am
+KDE_DIST=Makefile.in udstest Makefile.am
#>+ 2
docs-am:
Binary files old/opensuseupdater-0.3/udshttp/test/udstest and new/opensuseupdater-0.4/udshttp/test/udstest differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/MainWindow.cpp new/opensuseupdater-0.4/updater/MainWindow.cpp
--- old/opensuseupdater-0.3/updater/MainWindow.cpp 2006-10-23 18:12:15.000000000 +0200
+++ new/opensuseupdater-0.4/updater/MainWindow.cpp 2006-11-02 18:36:40.000000000 +0100
@@ -79,7 +79,7 @@
void MainWindow::slotConfigChanged()
{
int interval;
- interval = UpdaterSettings::self()->interval() * 60 * 1000; // convert to ms
+ interval = UpdaterSettings::self()->interval() * 60 * 60 * 1000; // convert to ms
timerInterval = interval;
timer->changeInterval(timerInterval);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/UpdaterApplication.cpp new/opensuseupdater-0.4/updater/UpdaterApplication.cpp
--- old/opensuseupdater-0.3/updater/UpdaterApplication.cpp 2006-10-23 18:01:28.000000000 +0200
+++ new/opensuseupdater-0.4/updater/UpdaterApplication.cpp 2006-11-03 16:55:21.000000000 +0100
@@ -35,8 +35,7 @@
UpdaterApplication::UpdaterApplication() : KUniqueApplication(true,true,false)
{
- UpdaterSettings::EnumBackend::type backend;
-
+ int backend = UpdaterSettings::self()->backend();
if ( backend == UpdaterSettings::EnumBackend::zmd )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/opensuseupdater new/opensuseupdater-0.4/updater/opensuseupdater
--- old/opensuseupdater-0.3/updater/opensuseupdater 2006-10-23 18:17:30.000000000 +0200
+++ new/opensuseupdater-0.4/updater/opensuseupdater 2006-11-03 16:56:05.000000000 +0100
@@ -18,7 +18,7 @@
# if CDPATH is set.
if test "${CDPATH+set}" = set; then CDPATH=:; export CDPATH; fi
-relink_command="(cd /space/sources/opensuse-updater/trunk/opensuse-updater/updater; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=\"/opt/icecream/bin:/suse/dmacvicar/bin:/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/usr/games:/opt/gnome/bin:/opt/kde3/bin:/usr/lib/mit/bin:/usr/lib/mit/sbin:/usr/lib/qt3/bin:/work/src/bin:/work/src/bin/tools\"; export PATH; g++ -Wno-long-long -Wundef -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-
arith -O2 -Wformat-security -Wmissing-format-attribute -Wno-non-virtual-dtor -fno-exceptions -fno-check-new -fno-common -o \$progdir/\$file main.o MainWindow.o HeaderWidget.o UpdaterApplication.o GeneralConfigWindow.o UpdateListItem.o TrayIcon.o updatersettingswidget_base.o opensuseupdater_settings.o Updater.moc.o MainWindow.moc.o HeaderWidget.moc.o GeneralConfigWindow.moc.o TrayIcon.moc.o -L/opt/kde3/lib -L/usr/lib/qt3/lib -L/usr/lib -L/usr/X11R6/lib -L/usr/lib/ -L/usr/X11R6/lib/ ../kxmlrpcclient/.libs/libkxmlrpcclient.so /opt/kde3/lib/libkxmlrpcclient.so ../updater/zmd/.libs/libopensuseupdater_zmd.so /space/sources/opensuse-updater/trunk/opensuse-updater/kxmlrpcclient/.libs/libkxmlrpcclient.so ../updater/zypp/.libs/libopensuseupdater_zypp.so /opt/kde3/lib/libkio.so /opt/kde3/lib/libkdeui.so /opt/kde3/lib/libkdesu.so /opt/kde3/lib/libkwalletclient.so /opt/kde3/lib/libkdecore.so /opt/kde3/lib/libDCOP.so -lresolv -lutil /usr/lib/libart_lgpl_2.so /usr/lib/libidn.so /opt/kde3/
lib/libkdefx.so /usr/lib/qt3/lib/libqt-mt.so /usr/lib/libXrandr.so /usr/lib/libXcursor.so /usr/lib/libXfixes.so /usr/lib/libXinerama.so /usr/lib/libXft.so /usr/lib/libfontconfig.so /usr/lib/libfreetype.so /usr/lib/libexpat.so /usr/lib/libpng12.so -lm /usr/lib/libXext.so /usr/lib/libSM.so /usr/lib/libICE.so /usr/lib/libXrender.so -lpthread /usr/lib/libX11.so /usr/lib/libXau.so /usr/lib/libXdmcp.so -ldl -lz /usr/lib/libfam.so -lrpcsvc -lacl -lattr -Wl,--rpath -Wl,/space/sources/opensuse-updater/trunk/opensuse-updater/kxmlrpcclient/.libs -Wl,--rpath -Wl,/opt/kde3/lib -Wl,--rpath -Wl,/space/sources/opensuse-updater/trunk/opensuse-updater/updater/zmd/.libs -Wl,--rpath -Wl,/space/sources/opensuse-updater/trunk/opensuse-updater/updater/zypp/.libs -Wl,--rpath -Wl,/usr/lib/qt3/lib -Wl,--rpath -Wl,/opt/kde3/lib -Wl,--rpath -Wl,/usr/lib/qt3/lib -Wl,--rpath -Wl,/usr/lib)"
+relink_command="(cd /space/sources/opensuse-updater/trunk/opensuse-updater/updater; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=\"/opt/icecream/bin:/suse/dmacvicar/bin:/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/usr/games:/opt/gnome/bin:/opt/kde3/bin:/usr/lib/mit/bin:/usr/lib/mit/sbin:/usr/lib/qt3/bin:/work/src/bin:/work/src/bin/tools\"; export PATH; g++ -Wno-long-long -Wundef -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-
arith -O2 -Wformat-security -Wmissing-format-attribute -Wno-non-virtual-dtor -fno-exceptions -fno-check-new -fno-common -o \$progdir/\$file main.o MainWindow.o HeaderWidget.o UpdaterApplication.o UpdateListItem.o TrayIcon.o updatersettingswidget_base.o opensuseupdater_settings.o Updater.moc.o MainWindow.moc.o HeaderWidget.moc.o TrayIcon.moc.o -L/opt/kde3/lib -L/usr/lib/qt3/lib -L/usr/lib -L/usr/X11R6/lib -L/usr/lib/ -L/usr/X11R6/lib/ ../kxmlrpcclient/.libs/libkxmlrpcclient.so /opt/kde3/lib/libkxmlrpcclient.so ../updater/zmd/.libs/libopensuseupdater_zmd.so /space/sources/opensuse-updater/trunk/opensuse-updater/kxmlrpcclient/.libs/libkxmlrpcclient.so ../updater/zypp/.libs/libopensuseupdater_zypp.so /opt/kde3/lib/libkio.so /opt/kde3/lib/libkdeui.so /opt/kde3/lib/libkdesu.so /opt/kde3/lib/libkwalletclient.so /opt/kde3/lib/libkdecore.so /opt/kde3/lib/libDCOP.so -lresolv -lutil /usr/lib/libart_lgpl_2.so /usr/lib/libidn.so /opt/kde3/lib/libkdefx.so /usr/lib/qt3/lib/libqt-mt.so /us
r/lib/libXrandr.so /usr/lib/libXcursor.so /usr/lib/libXfixes.so /usr/lib/libXinerama.so /usr/lib/libXft.so /usr/lib/libfontconfig.so /usr/lib/libfreetype.so /usr/lib/libexpat.so /usr/lib/libpng12.so -lm /usr/lib/libXext.so /usr/lib/libSM.so /usr/lib/libICE.so /usr/lib/libXrender.so -lpthread /usr/lib/libX11.so /usr/lib/libXau.so /usr/lib/libXdmcp.so -ldl -lz /usr/lib/libfam.so -lrpcsvc -lacl -lattr -Wl,--rpath -Wl,/space/sources/opensuse-updater/trunk/opensuse-updater/kxmlrpcclient/.libs -Wl,--rpath -Wl,/opt/kde3/lib -Wl,--rpath -Wl,/space/sources/opensuse-updater/trunk/opensuse-updater/updater/zmd/.libs -Wl,--rpath -Wl,/space/sources/opensuse-updater/trunk/opensuse-updater/updater/zypp/.libs -Wl,--rpath -Wl,/usr/lib/qt3/lib -Wl,--rpath -Wl,/opt/kde3/lib -Wl,--rpath -Wl,/usr/lib/qt3/lib -Wl,--rpath -Wl,/usr/lib)"
# This environment variable determines our operation mode.
if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/opensuseupdater_settings.cpp new/opensuseupdater-0.4/updater/opensuseupdater_settings.cpp
--- old/opensuseupdater-0.3/updater/opensuseupdater_settings.cpp 2006-10-23 17:53:35.000000000 +0200
+++ new/opensuseupdater-0.4/updater/opensuseupdater_settings.cpp 2006-11-03 16:55:48.000000000 +0100
@@ -25,7 +25,7 @@
setCurrentGroup( QString::fromLatin1( "General" ) );
KConfigSkeleton::ItemInt *itemInterval;
- itemInterval = new KConfigSkeleton::ItemInt( currentGroup(), QString::fromLatin1( "Interval" ), mInterval, 1440 );
+ itemInterval = new KConfigSkeleton::ItemInt( currentGroup(), QString::fromLatin1( "Interval" ), mInterval, 24 );
addItem( itemInterval, QString::fromLatin1( "Interval" ) );
KConfigSkeleton::ItemBool *itemAutostart;
itemAutostart = new KConfigSkeleton::ItemBool( currentGroup(), QString::fromLatin1( "Autostart" ), mAutostart, true );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/opensuseupdater_settings.h new/opensuseupdater-0.4/updater/opensuseupdater_settings.h
--- old/opensuseupdater-0.3/updater/opensuseupdater_settings.h 2006-10-23 17:53:35.000000000 +0200
+++ new/opensuseupdater-0.4/updater/opensuseupdater_settings.h 2006-11-03 16:55:48.000000000 +0100
@@ -57,7 +57,7 @@
}
/**
- Set Width of the main window.
+ Set Update engine backend
*/
static
void setBackend( int v )
@@ -67,7 +67,7 @@
}
/**
- Get Width of the main window.
+ Get Update engine backend
*/
static
int backend()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/opensuseupdater_settings.kcfg new/opensuseupdater-0.4/updater/opensuseupdater_settings.kcfg
--- old/opensuseupdater-0.3/updater/opensuseupdater_settings.kcfg 2006-10-23 17:53:02.000000000 +0200
+++ new/opensuseupdater-0.4/updater/opensuseupdater_settings.kcfg 2006-11-03 16:55:46.000000000 +0100
@@ -5,14 +5,14 @@
<group name="General">
<entry name="Interval" type="Int">
<label>How often to check for updates.</label>
- <default>1440</default>
+ <default>24</default>
</entry>
<entry name="Autostart" type="Bool">
<label>Automatically start the applet on login</label>
<default>true</default>
</entry>
<entry name="Backend" type="Enum">
- <label>Width of the main window.</label>
+ <label>Update engine backend</label>
<choices>
<choice name="zypp"/>
<choice name="zmd"/>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/updatersettingswidget_base.cpp new/opensuseupdater-0.4/updater/updatersettingswidget_base.cpp
--- old/opensuseupdater-0.3/updater/updatersettingswidget_base.cpp 2006-10-23 18:17:24.000000000 +0200
+++ new/opensuseupdater-0.4/updater/updatersettingswidget_base.cpp 2006-11-03 11:21:54.000000000 +0100
@@ -3,7 +3,7 @@
/****************************************************************************
** Form implementation generated from reading ui file './updatersettingswidget_base.ui'
**
-** Created: Mon Oct 23 18:17:23 2006
+** Created: Fri Nov 3 11:21:52 2006
** by: The User Interface Compiler ($Id: qt/main.cpp 3.3.6 edited Aug 31 2005 $)
**
** WARNING! All changes made in this file will be lost!
@@ -33,6 +33,7 @@
UpdaterSettingsWidget_BaseLayout = new QVBoxLayout( this, 11, 6, "UpdaterSettingsWidget_BaseLayout");
kcfg_Interval = new QSpinBox( this, "kcfg_Interval" );
+ kcfg_Interval->setMinValue( 1 );
UpdaterSettingsWidget_BaseLayout->addWidget( kcfg_Interval );
kcfg_Autostart = new QCheckBox( this, "kcfg_Autostart" );
@@ -74,7 +75,7 @@
{
setCaption( tr2i18n( "Form1" ) );
kcfg_Interval->setPrefix( tr2i18n( "Check For Updates Every " ) );
- kcfg_Interval->setSuffix( tr2i18n( " Minutes" ) );
+ kcfg_Interval->setSuffix( tr2i18n( " Hours" ) );
kcfg_Autostart->setText( tr2i18n( "Automa&tically start updater on login" ) );
kcfg_Autostart->setAccel( QKeySequence( tr2i18n( "Alt+T" ) ) );
kcfg_Backend->setTitle( tr2i18n( "Get Updates Via" ) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/updatersettingswidget_base.h new/opensuseupdater-0.4/updater/updatersettingswidget_base.h
--- old/opensuseupdater-0.3/updater/updatersettingswidget_base.h 2006-10-23 18:17:23.000000000 +0200
+++ new/opensuseupdater-0.4/updater/updatersettingswidget_base.h 2006-11-03 11:21:52.000000000 +0100
@@ -1,7 +1,7 @@
/****************************************************************************
** Form interface generated from reading ui file './updatersettingswidget_base.ui'
**
-** Created: Mon Oct 23 18:17:23 2006
+** Created: Fri Nov 3 11:21:52 2006
** by: The User Interface Compiler ($Id: qt/main.cpp 3.3.6 edited Aug 31 2005 $)
**
** WARNING! All changes made in this file will be lost!
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/updatersettingswidget_base.ui new/opensuseupdater-0.4/updater/updatersettingswidget_base.ui
--- old/opensuseupdater-0.3/updater/updatersettingswidget_base.ui 2006-10-23 18:16:56.000000000 +0200
+++ new/opensuseupdater-0.4/updater/updatersettingswidget_base.ui 2006-11-02 18:30:42.000000000 +0100
@@ -27,7 +27,10 @@
<string>Check For Updates Every </string>
</property>
<property name="suffix">
- <string> Minutes</string>
+ <string> Hours</string>
+ </property>
+ <property name="minValue">
+ <number>1</number>
</property>
</widget>
<widget class="QCheckBox">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/zypp/ZYppUpdater.cpp new/opensuseupdater-0.4/updater/zypp/ZYppUpdater.cpp
--- old/opensuseupdater-0.3/updater/zypp/ZYppUpdater.cpp 2006-10-23 14:44:38.000000000 +0200
+++ new/opensuseupdater-0.4/updater/zypp/ZYppUpdater.cpp 2006-11-02 17:58:17.000000000 +0100
@@ -129,14 +129,6 @@
_buffer.truncate(0);
emit(populateDone());
return;
- }
-
- if ( _error )
- {
- emit(updateAppletError(_error_message_buffer));
- _error_message_buffer.truncate(0);
-
-
}
// clear the buffer
@@ -160,6 +152,12 @@
emit(updateApplet(APPLET_UPDATES, _patches.count()));
+ if ( _error )
+ {
+ emit(updateAppletError(_error_message_buffer));
+ _error_message_buffer.truncate(0);
+ }
+
_list_view = 0L;
emit(populateDone());
}
@@ -308,7 +306,7 @@
{
_current_patch->summary += ch;
}
- if ( _state == ErrorMessage )
+ if ( _state == Error )
{
_error_message_buffer += ch;
}
@@ -326,14 +324,14 @@
if ( qName == "update-status" )
{
_found_update_status_tag = true;
- if ( atts.value("op") == "error" )
- {
- _state = Error;
- }
}
- if ( (qName == "error") && (_state == Error) )
+ if ( qName == "errors")
+ {
+ _state = Errors;
+ }
+ if ( (qName == "error") && (_state == Errors ) )
{
- _state = ErrorMessage;
+ _state = Error;
_error = true;
}
if ( qName == "update" )
@@ -398,9 +396,14 @@
{
_state = Unknown;
}
- if ( (qName == "error") && (_state == ErrorMessage) )
+ if ( (qName == "error") && (_state == Error) )
{
- _state = Error;
+ _error_message_buffer += "\n";
+ _state = Errors;
+ }
+ if ( (qName == "errors") )
+ {
+ _state = Unknown;
}
if ( qName == "description" )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/zypp/ZYppUpdater.h new/opensuseupdater-0.4/updater/zypp/ZYppUpdater.h
--- old/opensuseupdater-0.3/updater/zypp/ZYppUpdater.h 2006-10-19 16:51:27.000000000 +0200
+++ new/opensuseupdater-0.4/updater/zypp/ZYppUpdater.h 2006-11-02 17:53:14.000000000 +0100
@@ -56,8 +56,8 @@
Update,
UpdateDescription,
UpdateSummary,
+ Errors,
Error,
- ErrorMessage
} XmlState;
class ZYppUpdater : public Updater, public QXmlDefaultHandler
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org