Hello community,
here is the log from the commit of package opensuse-updater
checked in at Thu Oct 19 13:54:02 CEST 2006.
--------
--- KDE/opensuse-updater/opensuse-updater.changes 2006-10-18 15:22:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/opensuse-updater/opensuse-updater.changes 2006-10-18 16:54:01.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Oct 18 16:34:34 CEST 2006 - dmacvicar@suse.de
+
+- show the right status
+- r429
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opensuse-updater.spec ++++++
--- /var/tmp/diff_new_pack.ZLJFFI/_old 2006-10-19 13:53:24.000000000 +0200
+++ /var/tmp/diff_new_pack.ZLJFFI/_new 2006-10-19 13:53:24.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package opensuse-updater (Version 0)
+# spec file for package opensuse-updater (Version 0.3)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -10,17 +10,15 @@
Name: opensuse-updater
-%define maj_r 0.3
-
BuildRequires: kdelibs3-devel update-desktop-files
License: GNU General Public License (GPL) - all versions
Group: System/Management
Summary: KDE updater applet for OpenSUSE
-Version: %{maj_r}
-Release: 1
+Version: 0.3
+Release: 2
URL: http://en.opensuse.org/KDE_Updater_Applet
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: opensuseupdater-%{maj_r}.tar.bz2
+Source0: opensuseupdater-%{version}.tar.bz2
%description
KDE updater applet for OpenSUSE
@@ -30,7 +28,7 @@
Narayan Newton
%prep
-%setup -q -n opensuseupdater-%{maj_r}
+%setup -q -n opensuseupdater-%{version}
. /etc/opt/kde3/common_options
update_admin --no-unsermake
@@ -71,6 +69,9 @@
%changelog -n opensuse-updater
* Wed Oct 18 2006 - dmacvicar@suse.de
+- show the right status
+- r429
+* Wed Oct 18 2006 - dmacvicar@suse.de
- start the check at startup
- r423
* Thu Oct 12 2006 - dmacvicar@suse.de
++++++ opensuseupdater-0.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/images/Makefile.am new/opensuseupdater-0.3/images/Makefile.am
--- old/opensuseupdater-0.3/images/Makefile.am 2006-10-16 15:25:33.000000000 +0200
+++ new/opensuseupdater-0.3/images/Makefile.am 2006-10-18 15:41:38.000000000 +0200
@@ -1,2 +1,2 @@
-images_data_DATA= suse_green.png suse_red.png suse_logo.png opensuseupdater.png
+images_data_DATA= suse_green.png suse_red.png suse_yellow.png suse_logo.png opensuseupdater.png
images_datadir= $(kde_datadir)/opensuseupdater/pics
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/images/Makefile.in new/opensuseupdater-0.3/images/Makefile.in
--- old/opensuseupdater-0.3/images/Makefile.in 2006-10-18 15:21:47.000000000 +0200
+++ new/opensuseupdater-0.3/images/Makefile.in 2006-10-18 16:53:53.000000000 +0200
@@ -311,7 +311,7 @@
xdg_appsdir = @xdg_appsdir@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
-images_data_DATA = suse_green.png suse_red.png suse_logo.png opensuseupdater.png
+images_data_DATA = suse_green.png suse_red.png suse_yellow.png suse_logo.png opensuseupdater.png
images_datadir = $(kde_datadir)/opensuseupdater/pics
#>- all: all-am
#>+ 1
@@ -519,7 +519,7 @@
#>+ 2
-KDE_DIST=Makefile.in suse_red.png opensuseupdater.png suse_logo.png suse_green.png Makefile.am
+KDE_DIST=Makefile.in suse_red.png opensuseupdater.png suse_logo.png suse_green.png Makefile.am suse_yellow.png
#>+ 2
docs-am:
Binary files old/opensuseupdater-0.3/images/suse_yellow.png and new/opensuseupdater-0.3/images/suse_yellow.png differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/opensuse-updater.spec.in new/opensuseupdater-0.3/opensuse-updater.spec.in
--- old/opensuseupdater-0.3/opensuse-updater.spec.in 2006-10-18 15:01:04.000000000 +0200
+++ new/opensuseupdater-0.3/opensuse-updater.spec.in 2006-10-18 16:53:33.000000000 +0200
@@ -8,18 +8,16 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-%define maj_r 0.3
-
Name: opensuse-updater
BuildRequires: kdelibs3-devel update-desktop-files
License: GPL
Group: System/Management
Summary: KDE updater applet for OpenSUSE
-Version: %{maj_r}
+Version: 0.3
Release: 1
URL: http://en.opensuse.org/KDE_Updater_Applet
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: opensuseupdater-%{maj_r}.tar.bz2
+Source0: opensuseupdater-%{version}.tar.bz2
%description
KDE updater applet for OpenSUSE
@@ -31,7 +29,7 @@
Martin Vidner
%prep
-%setup -q -n opensuseupdater-%{maj_r}
+%setup -q -n opensuseupdater-%{version}
. /etc/opt/kde3/common_options
update_admin --no-unsermake
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/po/Makefile.in new/opensuseupdater-0.3/po/Makefile.in
--- old/opensuseupdater-0.3/po/Makefile.in 2006-10-18 15:21:47.000000000 +0200
+++ new/opensuseupdater-0.3/po/Makefile.in 2006-10-18 16:53:53.000000000 +0200
@@ -487,7 +487,7 @@
#>+ 2
-KDE_DIST=Makefile.in Makefile.am
+KDE_DIST=Makefile.in kio_udshttp.pot opensuseupdater.pot Makefile.am
#>+ 2
docs-am:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/po/kio_udshttp.pot new/opensuseupdater-0.3/po/kio_udshttp.pot
--- old/opensuseupdater-0.3/po/kio_udshttp.pot 1970-01-01 01:00:00.000000000 +0100
+++ new/opensuseupdater-0.3/po/kio_udshttp.pot 2006-10-18 15:25:47.000000000 +0200
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-10-18 15:25+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: udshttp.cpp:128
+msgid "There were errors getting data from job"
+msgstr ""
+
+#: udshttp.cpp:270
+msgid "Timeout on server"
+msgstr ""
+
+#: udshttp.cpp:285
+msgid "Bad url"
+msgstr ""
+
+#: udshttp.cpp:392
+msgid "Unauthorized access"
+msgstr ""
+
+#: udshttp.cpp:395 udshttp.cpp:397
+msgid "URL Invalid"
+msgstr ""
+
+#: udshttp.cpp:400
+msgid "Server Error"
+msgstr ""
+
+#: udshttp.cpp:403
+msgid "Service unavailable"
+msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/po/opensuseupdater.pot new/opensuseupdater-0.3/po/opensuseupdater.pot
--- old/opensuseupdater-0.3/po/opensuseupdater.pot 1970-01-01 01:00:00.000000000 +0100
+++ new/opensuseupdater-0.3/po/opensuseupdater.pot 2006-10-18 15:25:47.000000000 +0200
@@ -0,0 +1,110 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-10-18 15:25+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: GeneralConfigWindow.cpp:50
+msgid "Get updates via:"
+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
+msgid "Install"
+msgstr ""
+
+#: MainWindow.cpp:106
+msgid "Clear Selection"
+msgstr ""
+
+#: MainWindow.cpp:147
+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>"
+msgstr ""
+
+#: MainWindow.cpp:149
+msgid "Name"
+msgstr ""
+
+#: MainWindow.cpp:151
+msgid "Type"
+msgstr ""
+
+#: MainWindow.cpp:152
+msgid "New Version"
+msgstr ""
+
+#: MainWindow.cpp:153
+msgid "Catalog"
+msgstr ""
+
+#: MainWindow.cpp:174
+msgid "Available Updates"
+msgstr ""
+
+#: MainWindow.cpp:181
+msgid "Configure Applet"
+msgstr ""
+
+#: TrayIcon.cpp:45
+msgid "No Updates Available"
+msgstr ""
+
+#: TrayIcon.cpp:51
+msgid " Update Available"
+msgstr ""
+
+#: TrayIcon.cpp:52
+msgid " Updates Available"
+msgstr ""
+
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/udshttp/test/Makefile.in new/opensuseupdater-0.3/udshttp/test/Makefile.in
--- old/opensuseupdater-0.3/udshttp/test/Makefile.in 2006-10-18 15:21:47.000000000 +0200
+++ new/opensuseupdater-0.3/udshttp/test/Makefile.in 2006-10-18 16:53:53.000000000 +0200
@@ -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.3/udshttp/test/udstest differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/Constants.h new/opensuseupdater-0.3/updater/Constants.h
--- old/opensuseupdater-0.3/updater/Constants.h 2006-10-13 12:01:35.000000000 +0200
+++ new/opensuseupdater-0.3/updater/Constants.h 2006-10-18 16:41:30.000000000 +0200
@@ -25,6 +25,9 @@
#define TRAY_ICON_GREEN "suse_green.png"
#define TRAY_ICON_RED "suse_red.png"
+#define TRAY_ICON_YELLOW "suse_yellow.png"
+#define TRAY_ICON_PROBLEM "messagebox_warning"
+#define TRAY_ICON_CHECKING "misc"
/** Enum to represent the various backends installed.
New backends added here
@@ -38,3 +41,4 @@
#endif
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/Makefile.in new/opensuseupdater-0.3/updater/Makefile.in
--- old/opensuseupdater-0.3/updater/Makefile.in 2006-10-18 15:21:47.000000000 +0200
+++ new/opensuseupdater-0.3/updater/Makefile.in 2006-10-18 16:53:53.000000000 +0200
@@ -977,7 +977,7 @@
-rm -f Updater.moc.cpp MainWindow.moc.cpp HeaderWidget.moc.cpp GeneralConfigWindow.moc.cpp TrayIcon.moc.cpp
#>+ 2
-KDE_DIST=opensusestart.desktop hi64-app-opensuse-updater.png opensuseupdater.desktop Makefile.in log hi16-app-opensuse-updater.png hi48-app-opensuse-updater.png hi128-app-opensuse-updater.png Makefile.am hi32-app-opensuse-updater.png Constants.h
+KDE_DIST=opensusestart.desktop hi64-app-opensuse-updater.png opensuseupdater.desktop Makefile.in log hi16-app-opensuse-updater.png hi48-app-opensuse-updater.png opensuseupdater hi128-app-opensuse-updater.png Makefile.am hi32-app-opensuse-updater.png Constants.h
#>+ 2
docs-am:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/TrayIcon.cpp new/opensuseupdater-0.3/updater/TrayIcon.cpp
--- old/opensuseupdater-0.3/updater/TrayIcon.cpp 2006-10-02 11:09:14.000000000 +0200
+++ new/opensuseupdater-0.3/updater/TrayIcon.cpp 2006-10-18 16:44:07.000000000 +0200
@@ -17,6 +17,7 @@
Boston, MA 02110-1301, USA.
*/
+#include
#include
#include
@@ -33,23 +34,41 @@
setPixmap(UserIcon(TRAY_ICON_GREEN));
setScaledContents(true);
setState(APPLET_NO_UPDATES);
+ kdDebug() << "Tray Icon ready" << endl;
}
-void TrayIcon::setState(int state) {
+void TrayIcon::setState(int state, const QString &description )
+{
+ kdDebug() << "Set applet status to: " << state << endl;
QToolTip::remove(this);
appletState = state;
- switch (state) {
- case APPLET_CHECKING: //We do not have a special icon for checking updates
+ switch (state)
+ {
+ case APPLET_CHECKING:
+ setPixmap(loadIcon(TRAY_ICON_CHECKING));
+ QToolTip::add(this, i18n("Checking for updates..."));
+ break;
+ case APPLET_PROBLEM:
+ setPixmap(loadIcon(TRAY_ICON_PROBLEM));
+ QToolTip::add(this, i18n("Error:\n" + description ));
+ break;
case APPLET_NO_UPDATES:
setPixmap(UserIcon(TRAY_ICON_GREEN));
QToolTip::add(this, i18n("No Updates Available"));
break;
case APPLET_UPDATES:
- setPixmap(UserIcon(TRAY_ICON_RED));
+ setPixmap(UserIcon(TRAY_ICON_YELLOW));
QToolTip::add(this, QString().setNum(updateCount) +
( updateCount == 1 ?
i18n(" Update Available") :
i18n(" Updates Available")));
+ break;
+ case APPLET_CRITICAL_UPDATES:
+ setPixmap(UserIcon(TRAY_ICON_RED));
+ QToolTip::add(this, QString().setNum(updateCount) +
+ ( updateCount == 1 ?
+ i18n(" Important Update Available") :
+ i18n(" Important Updates Available")));
break;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/TrayIcon.h new/opensuseupdater-0.3/updater/TrayIcon.h
--- old/opensuseupdater-0.3/updater/TrayIcon.h 2006-10-02 11:09:14.000000000 +0200
+++ new/opensuseupdater-0.3/updater/TrayIcon.h 2006-10-18 15:51:06.000000000 +0200
@@ -43,8 +43,8 @@
TrayIcon(QWidget *parent=0);
public slots:
-
- void setState(int state);
+
+ void setState(int state, const QString &description = QString() );
void setUpdates(int count);
private:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/Updater.h new/opensuseupdater-0.3/updater/Updater.h
--- old/opensuseupdater-0.3/updater/Updater.h 2006-10-12 12:57:38.000000000 +0200
+++ new/opensuseupdater-0.3/updater/Updater.h 2006-10-18 15:55:20.000000000 +0200
@@ -43,7 +43,9 @@
enum {
APPLET_NO_UPDATES, /** No updates **/
APPLET_UPDATES, /** Updates available **/
- APPLET_CHECKING /** Checking for updates **/
+ APPLET_CRITICAL_UPDATES, /** Updates available (security) **/
+ APPLET_CHECKING, /** Checking for updates **/
+ APPLET_PROBLEM /** problem **/
};
/**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/opensuseupdater new/opensuseupdater-0.3/updater/opensuseupdater
--- old/opensuseupdater-0.3/updater/opensuseupdater 1970-01-01 01:00:00.000000000 +0100
+++ new/opensuseupdater-0.3/updater/opensuseupdater 2006-10-18 16:47:53.000000000 +0200
@@ -0,0 +1,117 @@
+#! /bin/sh
+
+# opensuseupdater - temporary wrapper script for .libs/opensuseupdater
+# Generated by ltmain.sh - GNU libtool 1.5a (1.1240 2003/06/26 06:55:19)
+#
+# The opensuseupdater program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='/usr/bin/sed -e 1s/^X//'
+sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# 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 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/li
bXrandr.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
+ # install mode needs the following variable:
+ notinst_deplibs=' ../kxmlrpcclient/libkxmlrpcclient.la ../updater/zmd/libopensuseupdater_zmd.la /space/sources/opensuse-updater/trunk/opensuse-updater/kxmlrpcclient/libkxmlrpcclient.la ../updater/zypp/libopensuseupdater_zypp.la'
+else
+ # When we are sourced in execute mode, $file and $echo are already set.
+ if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
+ echo="echo"
+ file="$0"
+ # Make sure echo works.
+ if test "X$1" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+ shift
+ elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
+ # Yippee, $echo works!
+ :
+ else
+ # Restart under the correct shell, and then maybe $echo will work.
+ exec /bin/sh "$0" --no-reexec ${1+"$@"}
+ fi
+ fi
+
+ # Find the directory that this script lives in.
+ thisdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+ test "x$thisdir" = "x$file" && thisdir=.
+
+ # Follow symbolic links until we get to the real thisdir.
+ file=`ls -ld "$file" | /usr/bin/sed -n 's/.*-> //p'`
+ while test -n "$file"; do
+ destdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+
+ # If there was a directory component, then change thisdir.
+ if test "x$destdir" != "x$file"; then
+ case "$destdir" in
+ [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;;
+ *) thisdir="$thisdir/$destdir" ;;
+ esac
+ fi
+
+ file=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ file=`ls -ld "$thisdir/$file" | /usr/bin/sed -n 's/.*-> //p'`
+ done
+
+ # Try to get the absolute directory name.
+ absdir=`cd "$thisdir" && pwd`
+ test -n "$absdir" && thisdir="$absdir"
+
+ program=lt-'opensuseupdater'
+ progdir="$thisdir/.libs"
+
+ if test ! -f "$progdir/$program" || \
+ { file=`ls -1dt "$progdir/$program" "$progdir/../$program" 2>/dev/null | /usr/bin/sed 1q`; \
+ test "X$file" != "X$progdir/$program"; }; then
+
+ file="$$-$program"
+
+ if test ! -d "$progdir"; then
+ mkdir "$progdir"
+ else
+ rm -f "$progdir/$file"
+ fi
+
+ # relink executable if necessary
+ if test -n "$relink_command"; then
+ if relink_command_output=`eval $relink_command 2>&1`; then :
+ else
+ echo "$relink_command_output" >&2
+ rm -f "$progdir/$file"
+ exit 1
+ fi
+ fi
+
+ mv -f "$progdir/$file" "$progdir/$program" 2>/dev/null ||
+ { rm -f "$progdir/$program";
+ mv -f "$progdir/$file" "$progdir/$program"; }
+ rm -f "$progdir/$file"
+ fi
+
+ if test -f "$progdir/$program"; then
+ if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
+ # Run the actual program with our arguments.
+
+ LD_LIBRARY_PATH="$thisdir/../kxmlrpcclient/.libs:/opt/kde3/lib:$thisdir/../updater/zmd/.libs:/space/sources/opensuse-updater/trunk/opensuse-updater/kxmlrpcclient/.libs:$thisdir/../updater/zypp/.libs:/usr/lib:/usr/lib/qt3/lib:" exec $progdir/$program ${1+"$@"}
+
+ $echo "$0: cannot exec $program ${1+"$@"}"
+ exit 1
+ fi
+ else
+ # The program doesn't exist.
+ $echo "$0: error: $progdir/$program does not exist" 1>&2
+ $echo "This script is just a wrapper for $program." 1>&2
+ echo "See the libtool documentation for more information." 1>&2
+ exit 1
+ fi
+fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/zypp/ZYppUpdater.cpp new/opensuseupdater-0.3/updater/zypp/ZYppUpdater.cpp
--- old/opensuseupdater-0.3/updater/zypp/ZYppUpdater.cpp 2006-10-18 13:03:00.000000000 +0200
+++ new/opensuseupdater-0.3/updater/zypp/ZYppUpdater.cpp 2006-10-18 16:46:06.000000000 +0200
@@ -130,6 +130,9 @@
//newItem->setText(COLUMN_ID, (*iter).id);
newItem->setText(COLUMN_CATALOG, (*it)->source );
}
+
+ emit(updateApplet(APPLET_UPDATES, _patches.count()));
+
_list_view = 0L;
emit(populateDone());
}
@@ -152,6 +155,7 @@
if ( _process ) {
kdDebug() << "Check process still running. Will not run this time." << endl;
+ emit(updateApplet(APPLET_CHECKING, 0));
return;
}
@@ -169,6 +173,7 @@
_process->start( KProcess::NotifyOnExit, KProcess::AllOutput );
kdDebug() << "check process started.." << endl;
+ emit(updateApplet(APPLET_CHECKING, 0));
//mStatusLabel->setText( i18n("Checking...") );
}
@@ -233,7 +238,7 @@
*_you_process << "kdesu" << "yast2" << "online_update";
connect( _you_process, SIGNAL( processExited( KProcess * ) ),
- SLOT( slotYouProcessExited( KProcess * ) ) );
+ SLOT( slotYOUProcessExited( KProcess * ) ) );
_you_process->start( KProcess::NotifyOnExit );
}
@@ -284,7 +289,18 @@
// here we have to allocate a patch or source in the stack
kdDebug() << "xml..." << qName << endl;
-
+ if ( qName == "update-status" )
+ {
+ if ( atts.value("op") == "error" )
+ {
+ _state = Error;
+ emit(updateApplet(APPLET_PROBLEM, 0));
+ }
+ }
+ if ( (qName == "error") && (_state == Error) )
+ {
+ _state = ErrorMessage;
+ }
if ( qName == "update" )
{
kdDebug() << "found patch..." << qName << endl;
@@ -327,6 +343,14 @@
bool ZYppUpdater::endElement( const QString &uri , const QString &localname, const QString &qName )
{
+ if ( qName == "update-status" )
+ {
+ _state = Unknown;
+ }
+ if ( (qName == "error") && (_state == ErrorMessage) )
+ {
+ _state = Error;
+ }
if ( qName == "description" )
{
_state = Update;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.3/updater/zypp/ZYppUpdater.h new/opensuseupdater-0.3/updater/zypp/ZYppUpdater.h
--- old/opensuseupdater-0.3/updater/zypp/ZYppUpdater.h 2006-10-12 17:55:55.000000000 +0200
+++ new/opensuseupdater-0.3/updater/zypp/ZYppUpdater.h 2006-10-18 16:12:19.000000000 +0200
@@ -56,7 +56,9 @@
Update,
UpdateDescription,
UpdateSummary,
- UpdateSource
+ UpdateSource,
+ 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