Hello community,
here is the log from the commit of package NetworkManager-kde
checked in at Tue Jun 3 01:06:17 CEST 2008.
--------
--- KDE/NetworkManager-kde/NetworkManager-kde.changes 2008-06-02 20:58:04.000000000 +0200
+++ /mounts/work_src_done/STABLE/NetworkManager-kde/NetworkManager-kde.changes 2008-06-02 23:51:51.000000000 +0200
@@ -4 +4 @@
-- Update to r815869
+- Update to r815960
Old:
----
knetworkmanager-0.7r815869.tar.bz2
New:
----
knetworkmanager-0.7r815970.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-kde.spec ++++++
--- /var/tmp/diff_new_pack.U23157/_old 2008-06-03 01:05:52.000000000 +0200
+++ /var/tmp/diff_new_pack.U23157/_new 2008-06-03 01:05:52.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package NetworkManager-kde (Version 0.7r815869)
+# spec file for package NetworkManager-kde (Version 0.7r815970)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -20,7 +20,7 @@
License: GPL v2 or later
Group: System/GUI/KDE
AutoReqProv: on
-Version: 0.7r815869
+Version: 0.7r815970
Release: 1
Summary: KNetworkManager application for use with NetworkManager
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -159,7 +159,7 @@
%changelog
* Mon Jun 02 2008 hschaa@suse.de
-- Update to r815869
+- Update to r815960
* Merge trayicons together (bnc#383032)
* Build package NetworkManager-devel (needed for external
VPN plugins like novellvpn)
++++++ knetworkmanager-0.7r815869.tar.bz2 -> knetworkmanager-0.7r815970.tar.bz2 ++++++
++++ 2199 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/knetworkmanager-0.7r815869/acinclude.m4 new/knetworkmanager-0.7r815970/acinclude.m4
--- old/knetworkmanager-0.7r815869/acinclude.m4 2008-06-02 20:34:13.000000000 +0200
+++ new/knetworkmanager-0.7r815970/acinclude.m4 2008-06-03 00:01:51.000000000 +0200
@@ -1226,7 +1226,15 @@
kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
fi
if test $kde_qtver = 3; then
- kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
+ kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3"
+ if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ fi
+ if test "$PKG_CONFIG" != "no" ; then
+ if $PKG_CONFIG --exists qt-mt ; then
+ kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`"
+ fi
+ fi
fi
if test $kde_qtver = 2; then
kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
@@ -1443,6 +1451,14 @@
for dir in $kde_qt_dirs; do
qt_incdirs="$qt_incdirs $dir/include $dir"
done
+if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+fi
+if test "$PKG_CONFIG" != "no" ; then
+ if $PKG_CONFIG --exists qt-mt ; then
+ qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`"
+ fi
+fi
qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
if test ! "$ac_qt_includes" = "NO"; then
qt_incdirs="$ac_qt_includes $qt_incdirs"
@@ -1459,8 +1475,16 @@
qt_libdirs=""
for dir in $kde_qt_dirs; do
- qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
+ qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir"
done
+if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+fi
+if test "$PKG_CONFIG" != "no" ; then
+ if $PKG_CONFIG --exists qt-mt ; then
+ qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`"
+ fi
+fi
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
if test ! "$ac_qt_libraries" = "NO"; then
qt_libdir=$ac_qt_libraries
@@ -2631,6 +2655,7 @@
AC_TRY_LINK(dnl
[
#include
+#include
],
[
char buf[42];
@@ -2638,7 +2663,7 @@
/* this would segfault.. but we only link, don't run */
(void) gzgets(f, buf, sizeof(buf));
- return (zlibVersion() == ZLIB_VERSION);
+ return (strcmp(zlibVersion(), ZLIB_VERSION) == 0);
],
eval "ac_cv_lib_z='-lz'",
eval "ac_cv_lib_z=no")
@@ -2738,11 +2763,11 @@
echo "*** to the full path to pkg-config."
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
else
- if !(`$PKG_CONFIG --exists OpenEXR`) ; then
+ if ! $PKG_CONFIG --exists OpenEXR ; then
AC_MSG_RESULT(no)
EXRSTATUS=no
else
- if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then
+ if ! $PKG_CONFIG --atleast-version="1.1.1" OpenEXR ; then
AC_MSG_RESULT(no)
EXRSTATUS=old
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/knetworkmanager-0.7r815869/admin/acinclude.m4.in new/knetworkmanager-0.7r815970/admin/acinclude.m4.in
--- old/knetworkmanager-0.7r815869/admin/acinclude.m4.in 2008-01-10 22:23:53.000000000 +0100
+++ new/knetworkmanager-0.7r815970/admin/acinclude.m4.in 2008-05-27 02:59:40.000000000 +0200
@@ -1226,7 +1226,15 @@
kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
fi
if test $kde_qtver = 3; then
- kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
+ kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3"
+ if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ fi
+ if test "$PKG_CONFIG" != "no" ; then
+ if $PKG_CONFIG --exists qt-mt ; then
+ kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`"
+ fi
+ fi
fi
if test $kde_qtver = 2; then
kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
@@ -1443,6 +1451,14 @@
for dir in $kde_qt_dirs; do
qt_incdirs="$qt_incdirs $dir/include $dir"
done
+if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+fi
+if test "$PKG_CONFIG" != "no" ; then
+ if $PKG_CONFIG --exists qt-mt ; then
+ qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`"
+ fi
+fi
qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
if test ! "$ac_qt_includes" = "NO"; then
qt_incdirs="$ac_qt_includes $qt_incdirs"
@@ -1459,8 +1475,16 @@
qt_libdirs=""
for dir in $kde_qt_dirs; do
- qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
+ qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir"
done
+if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+fi
+if test "$PKG_CONFIG" != "no" ; then
+ if $PKG_CONFIG --exists qt-mt ; then
+ qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`"
+ fi
+fi
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
if test ! "$ac_qt_libraries" = "NO"; then
qt_libdir=$ac_qt_libraries
@@ -2631,6 +2655,7 @@
AC_TRY_LINK(dnl
[
#include
+#include
],
[
char buf[42];
@@ -2638,7 +2663,7 @@
/* this would segfault.. but we only link, don't run */
(void) gzgets(f, buf, sizeof(buf));
- return (zlibVersion() == ZLIB_VERSION);
+ return (strcmp(zlibVersion(), ZLIB_VERSION) == 0);
],
eval "ac_cv_lib_z='-lz'",
eval "ac_cv_lib_z=no")
@@ -2738,11 +2763,11 @@
echo "*** to the full path to pkg-config."
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
else
- if !(`$PKG_CONFIG --exists OpenEXR`) ; then
+ if ! $PKG_CONFIG --exists OpenEXR ; then
AC_MSG_RESULT(no)
EXRSTATUS=no
else
- if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then
+ if ! $PKG_CONFIG --atleast-version="1.1.1" OpenEXR ; then
AC_MSG_RESULT(no)
EXRSTATUS=old
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/knetworkmanager-0.7r815869/admin/cvs.sh new/knetworkmanager-0.7r815970/admin/cvs.sh
--- old/knetworkmanager-0.7r815869/admin/cvs.sh 2007-05-14 22:11:46.000000000 +0200
+++ new/knetworkmanager-0.7r815970/admin/cvs.sh 2008-02-13 10:49:33.000000000 +0100
@@ -316,7 +316,7 @@
fi
fi
if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
- VERSION="\"3.5.7\""
+ VERSION="\"3.5.9\""
fi
if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
modulename=`pwd`;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/knetworkmanager-0.7r815869/admin/detect-autoconf.pl new/knetworkmanager-0.7r815970/admin/detect-autoconf.pl
--- old/knetworkmanager-0.7r815869/admin/detect-autoconf.pl 2008-01-10 22:23:53.000000000 +0100
+++ new/knetworkmanager-0.7r815970/admin/detect-autoconf.pl 2008-05-27 02:59:40.000000000 +0200
@@ -21,6 +21,73 @@
return "";
}
+# Subroutine to lexicographically compare two version strings, a and b.
+# If a > b, 1 is returned.
+# If a == b, 0 is returned.
+# If a < b, -1 is returned.
+#
+# If the strings are of uneven number length then the shorter string is
+# prepended by enough zeroes to make the two string lengths equal in order to
+# allow an accurate comparison. Note that the zero-padding only occurs in
+# between version separators (i.e. 1.6 and 1.10, results in 1.06 vs. 1.10).
+# Parts of the version ending in -foo (or any other text) are not considered
+# when doing the compare. (i.e. 2.53a vs 2.53 doesn't end up in 2.53a vs.
+# 2.053)
+sub compareVersions
+{
+ my ($a, $b) = @_;
+
+ # Split the strings up by '.' (version separator) and start comparing digit
+ # length.
+
+ my @aParts = split(/\./, $a);
+ my @bParts = split(/\./, $b);
+
+ # Make the arrays equal in length by adding missing zeroes to the end of the
+ # version.
+ push @aParts, '0' while scalar @aParts < scalar @bParts;
+ push @bParts, '0' while scalar @bParts < scalar @aParts;
+
+ # Now compare each individual portion.
+ for (my $i = 0; $i < scalar @aParts; ++$i)
+ {
+ # Make sure that any portion that has numbers is contiguous. I'm sure
+ # there's a technique for saving stuff like 2.52a2 but I don't feel
+ # like implementing it.
+ if ($aParts[$i] !~ /^[^\d]*\d+[^\d]*$/ or
+ $bParts[$i] !~ /^[^\d]*\d+[^\d]*$/)
+ {
+ die "Not able to compare $a to $b!\n";
+ }
+
+ my ($aDigits) = ($aParts[$i] =~ /(\d+)/);
+ my ($bDigits) = ($bParts[$i] =~ /(\d+)/);
+
+ # Perl is $MODERATELY_INSULTING_TERM, don't remove the parentheses in
+ # the delta calculation below.
+ my $delta = (length $aDigits) - (length $bDigits);
+ if ($delta < 0) # b is longer
+ {
+ my $replacement = ('0' x (-$delta)) . $aDigits;
+ $aParts[$i] =~ s/$aDigits/$replacement/;
+ }
+ elsif ($delta > 0) # a is longer
+ {
+ my $replacement = ('0' x $delta) . $bDigits;
+ $bParts[$i] =~ s/$bDigits/$replacement/;
+ }
+ }
+
+ # Arrays now have standardized version components, let's re-merge them
+ # to strings to do the compare.
+ my $newA = join('.', @aParts);
+ my $newB = join('.', @bParts);
+
+ return 1 if ($newA gt $newB);
+ return -1 if ($newA lt $newB);
+ return 0;
+}
+
# Subroutine to determine the highest installed version of the given program,
# searching from the given paths.
sub findBest
@@ -29,9 +96,10 @@
my $best_version_found = '0'; # Deliberately a string.
my %versions;
my %minimumVersions = (
- 'autoconf' => '2.5',
+ 'autoconf' => '2.5',
'automake' => '1.6',
);
+ my $sgn; # Used for compareVersions results.
# Allow user to use environment variable to override search.
return $ENV{uc $program} if $ENV{uc $program};
@@ -45,7 +113,11 @@
next unless -x $file;
($version) = $file =~ /$prefix\/$program-?(.*)$/;
- $version =~ s/-|\.//g;
+
+ # Don't check the -wrapper ones (or any other non program one).
+ # The real deal should start with a version number, or have no
+ # suffix at all.
+ next if $version =~ /^[^\d]/;
# Special case some programs to make sure it has a minimum version.
if (not $version and exists $minimumVersions{$program})
@@ -54,15 +126,20 @@
my $versionOutput = `$program --version 2>/dev/null | head -n 1`;
# If we can't run the script to get the version it likely won't work later.
- next unless $versionOutput;
+ next unless $versionOutput;
# Use number.number for version (we don't need the excess in general).
- ($versionOutput) = ($versionOutput =~ /(\d\.\d)/);
+ ($versionOutput) = ($versionOutput =~ /(\d+\.\d+)/);
+
+ # compareVersions returns -1 if the left argument is less than
+ # the right argument. It can also die for invalid input so
+ # wrap with eval.
+ eval {
+ $sgn = compareVersions($versionOutput, $min_version);
+ };
- # Use lt to do lexicographical comparison of strings (which should be
- # equivalent and doesn't involve issues with floating point conversions).
- if (not $versionOutput or $versionOutput lt $min_version)
- {
+ # $@ would be set if an error was encountered.
+ if ($@ or not $versionOutput or $sgn == -1) {
next;
}
}
@@ -78,7 +155,12 @@
$versions{$version} = $file;
# Use string comparison so that e.g. 253a will be > 253 but < 254.
- if ($version gt $best_version_found)
+ # See above about the need for eval.
+ eval {
+ $sgn = compareVersions($version, $best_version_found);
+ };
+
+ if (not $@ and $sgn == 1)
{
$best_version_found = $version;
}
@@ -138,12 +220,12 @@
($automake_suffix) = $automake =~ /.*automake(.*)$/;
-# Use unsermake if we found it.
-$automake = "$unsermake -c" if $unsermake;
-
# Find matching automake companions.
$aclocal = findProgram('aclocal', $automake_suffix);
+# Use unsermake if we found it.
+$automake = "$unsermake -c" if ($unsermake and $aclocal);
+
$which = findWhich();
# Make sure we have all of the needed programs.
@@ -151,8 +233,7 @@
{
unless(${$i})
{
- print "# Unable to find $i!!\n";
- exit 1;
+ print STDERR "# Unable to find $i!!\n";
}
}
@@ -171,3 +252,5 @@
EOF
exit 0;
+
+# vim: set noet ts=8 sw=4:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/knetworkmanager-0.7r815869/admin/Doxyfile.am new/knetworkmanager-0.7r815970/admin/Doxyfile.am
--- old/knetworkmanager-0.7r815869/admin/Doxyfile.am 2006-01-12 17:14:51.000000000 +0100
+++ new/knetworkmanager-0.7r815970/admin/Doxyfile.am 2008-01-28 16:07:32.000000000 +0100
@@ -72,11 +72,11 @@
uninstall-apidox:
@if test "$(subdir)" != "."; then \
if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); then \
- rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
+ rm -rf $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
fi \
else \
if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; then \
- rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
+ rm -rf $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
fi \
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/knetworkmanager-0.7r815869/.autoconf_trace new/knetworkmanager-0.7r815970/.autoconf_trace
--- old/knetworkmanager-0.7r815869/.autoconf_trace 2008-06-02 20:34:12.000000000 +0200
+++ new/knetworkmanager-0.7r815970/.autoconf_trace 2008-06-03 00:01:50.000000000 +0200
@@ -54,7 +54,7 @@
configure.in:43:AC_SUBST:am__isrc:' -I$(srcdir)'
configure.in:43:AC_SUBST:CYGPATH_W
configure.in:43:AC_SUBST:PACKAGE:knetworkmanager
-configure.in:43:AC_SUBST:VERSION:"3.5.7"
+configure.in:43:AC_SUBST:VERSION:"3.5.9"
configure.in:43:AC_SUBST:ACLOCAL
configure.in:43:AC_SUBST:AUTOCONF
configure.in:43:AC_SUBST:AUTOMAKE
@@ -156,6 +156,7 @@
configure.in:58:AC_SUBST:MSGFMT
configure.in:58:AC_SUBST:XGETTEXT
configure.in:58:AC_SUBST:XGETTEXT
+configure.in:60:AC_SUBST:PKG_CONFIG
configure.in:61:AC_SUBST:LIBUTIL
configure.in:61:AC_SUBST:LIBCOMPAT
configure.in:61:AC_SUBST:LIBCRYPT
@@ -192,6 +193,8 @@
configure.in:61:AC_SUBST:LIBPNG
configure.in:61:AC_SUBST:LIBPNG
configure.in:61:AC_SUBST:LIBJPEG
+configure.in:61:AC_SUBST:PKG_CONFIG
+configure.in:61:AC_SUBST:PKG_CONFIG
configure.in:61:AC_SUBST:qt_libraries
configure.in:61:AC_SUBST:qt_includes
configure.in:61:AC_SUBST:QT_INCLUDES
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/knetworkmanager-0.7r815869/configure.in new/knetworkmanager-0.7r815970/configure.in
--- old/knetworkmanager-0.7r815869/configure.in 2008-06-02 20:34:13.000000000 +0200
+++ new/knetworkmanager-0.7r815970/configure.in 2008-06-03 00:01:51.000000000 +0200
@@ -40,7 +40,7 @@
AC_ARG_PROGRAM
dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(knetworkmanager, 0.7r815869) dnl searches for some needed programs
+AM_INIT_AUTOMAKE(knetworkmanager, 0.7r815970) dnl searches for some needed programs
KDE_SET_PREFIX
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/knetworkmanager-0.7r815869/knetworkmanager/src/knetworkmanager-accesspoint.cpp new/knetworkmanager-0.7r815970/knetworkmanager/src/knetworkmanager-accesspoint.cpp
--- old/knetworkmanager-0.7r815869/knetworkmanager/src/knetworkmanager-accesspoint.cpp 2008-06-02 20:33:34.000000000 +0200
+++ new/knetworkmanager-0.7r815970/knetworkmanager/src/knetworkmanager-accesspoint.cpp 2008-06-03 00:01:30.000000000 +0200
@@ -44,18 +44,11 @@
AccessPointPrivate(QString objpath = QString::null, const DBus::AccessPointProxy* proxy = NULL)
: nmAccessPoint(proxy)
, objPath(objpath)
- {
- }
- AccessPointPrivate(const AccessPointPrivate& other)
- {
- nmAccessPoint = other.nmAccessPoint;
- objPath = other.objPath;
- }
- ~AccessPointPrivate()
{
-
}
+ ~AccessPointPrivate() { }
+
// pointer to the shared DBus proxy
QGuardedPtr<const DBus::AccessPointProxy> nmAccessPoint;
// DBus object path
@@ -149,6 +142,7 @@
void AccessPoint::updateProperties()
{
+ //TODO do this proper-like
QDBusError err;
if (d->nmAccessPoint.isNull())
return;
@@ -162,6 +156,7 @@
d->mode = d->nmAccessPoint->getMode(err);
d->rate = d->nmAccessPoint->getMaxBitrate(err);
d->strength = d->nmAccessPoint->getStrength(err);
+ emit strengthChanged(d->strength);
}
QString AccessPoint::getObjectPath() const
@@ -178,7 +173,7 @@
{
return (other.getObjectPath() == getObjectPath());
}
-
+#if 0
AccessPoint& AccessPoint::operator= (const AccessPoint& other)
{
printf("AccessPoint::operator=\n");
@@ -190,17 +185,20 @@
return *this;
}
-
-AccessPoint::AccessPoint(QString objpath, const DBus::AccessPointProxy* proxy)
-{
- d = new AccessPointPrivate(objpath, proxy);
+#endif
+AccessPoint::AccessPoint(QString obj_path, QObject * parent, const char * name)
+: QObject(parent, name)
+{
+ DBus::AccessPointProxy * proxy = new DBus::AccessPointProxy(NM_DBUS_SERVICE, obj_path);
+ proxy->setConnection(QDBusConnection::systemBus());
+ d = new AccessPointPrivate(obj_path, proxy);
if (!d->nmAccessPoint.isNull())
connect(d->nmAccessPoint, SIGNAL(PropertiesChanged(const QMap&)), this, SLOT(slotPropertiesChanged(const QMap&)));
updateProperties();
}
-
+#if 0
// copy constructor
AccessPoint::AccessPoint(const AccessPoint& other)
: QObject()
@@ -213,7 +211,7 @@
updateProperties();
}
-
+#endif
AccessPoint::~AccessPoint()
{
delete d;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/knetworkmanager-0.7r815869/knetworkmanager/src/knetworkmanager-accesspoint.h new/knetworkmanager-0.7r815970/knetworkmanager/src/knetworkmanager-accesspoint.h
--- old/knetworkmanager-0.7r815869/knetworkmanager/src/knetworkmanager-accesspoint.h 2008-06-02 20:33:34.000000000 +0200
+++ new/knetworkmanager-0.7r815970/knetworkmanager/src/knetworkmanager-accesspoint.h 2008-06-03 00:01:30.000000000 +0200
@@ -40,7 +40,7 @@
Q_OBJECT
public:
AccessPoint (const AccessPoint&);
- AccessPoint (QString objpath = QString::null, const DBus::AccessPointProxy* proxy = NULL);
+ AccessPoint (QString objpath = QString::null, QObject * parent = 0, const char * name = 0);
~AccessPoint ();
AccessPoint& operator= (const AccessPoint& other);
@@ -60,7 +60,8 @@
bool isEncrypted() const;
QString getObjectPath() const;
bool isValid() const;
-
+ signals:
+ void strengthChanged(Q_UINT8);
private slots:
void slotPropertiesChanged(const QMap& properties);
void updateProperties();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/knetworkmanager-0.7r815869/knetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.cpp new/knetworkmanager-0.7r815970/knetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.cpp
--- old/knetworkmanager-0.7r815869/knetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.cpp 2008-06-02 20:33:34.000000000 +0200
+++ new/knetworkmanager-0.7r815970/knetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.cpp 2008-06-03 00:01:30.000000000 +0200
@@ -607,29 +607,31 @@
// TODO: Preselect the right security method
// We should have an Essid already, fetch all possible APs
- QValueList<AccessPoint> aps;
+ QValueList aps;
if (_new_conn && !_wireless_setting->getEssid().isEmpty())
{
- WirelessManager::getAccessPoints(_wireless_setting->getEssid(), aps);
+ aps = WirelessManager::getAccessPointsForEssid(_wireless_setting->getEssid());
+#if 0
printf("Hugo %s\n", QString(QCString(_wireless_setting->getEssid())).ascii());
+#endif
}
if (!aps.isEmpty())
{
// if at least one AP has this security setting show the entry in the combobox
- for (QValueList<AccessPoint>::Iterator it = aps.begin(); it != aps.end(); ++it)
+ for (QValueList::Iterator it = aps.begin(); it != aps.end(); ++it)
{
- if((*it).isEncrypted())
+ if((*it)->isEncrypted())
{
- printf("AP %s is encrypted\n", (*it).getDisplaySsid().ascii());
- if ((*it).getRsnFlags() != NM_802_11_AP_SEC_NONE || (*it).getWpaFlags() != NM_802_11_AP_SEC_NONE)
+ printf("AP %s is encrypted\n", (*it)->getDisplaySsid().ascii());
+ if ((*it)->getRsnFlags() != NM_802_11_AP_SEC_NONE || (*it)->getWpaFlags() != NM_802_11_AP_SEC_NONE)
{
// WPA or RSN
- if ((*it).getRsnFlags() & NM_802_11_AP_SEC_KEY_MGMT_PSK || (*it).getWpaFlags() & NM_802_11_AP_SEC_KEY_MGMT_PSK)
+ if ((*it)->getRsnFlags() & NM_802_11_AP_SEC_KEY_MGMT_PSK || (*it)->getWpaFlags() & NM_802_11_AP_SEC_KEY_MGMT_PSK)
if (!allowed_methods.contains(SECURITY_WPA_PSK))
allowed_methods.append(SECURITY_WPA_PSK);
- if ((*it).getRsnFlags() & NM_802_11_AP_SEC_KEY_MGMT_802_1X || (*it).getWpaFlags() & NM_802_11_AP_SEC_KEY_MGMT_802_1X)
+ if ((*it)->getRsnFlags() & NM_802_11_AP_SEC_KEY_MGMT_802_1X || (*it)->getWpaFlags() & NM_802_11_AP_SEC_KEY_MGMT_802_1X)
if (!allowed_methods.contains(SECURITY_WPA_EAP))
allowed_methods.append(SECURITY_WPA_EAP);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/knetworkmanager-0.7r815869/knetworkmanager/src/knetworkmanager-connection_setting_wireless_widget.cpp new/knetworkmanager-0.7r815970/knetworkmanager/src/knetworkmanager-connection_setting_wireless_widget.cpp
--- old/knetworkmanager-0.7r815869/knetworkmanager/src/knetworkmanager-connection_setting_wireless_widget.cpp 2008-06-02 20:33:34.000000000 +0200
+++ new/knetworkmanager-0.7r815970/knetworkmanager/src/knetworkmanager-connection_setting_wireless_widget.cpp 2008-06-03 00:01:30.000000000 +0200
@@ -112,12 +112,11 @@
WirelessWidgetImpl::Activate()
{
// Fill in all available networks from all devices
- QValueList<WirelessNetwork> nets;
+ // get all aps from all devices grouped together using the ssid
+ QValueList<WirelessNetwork> nets = WirelessManager::getWirelessNetworks(0, WirelessNetwork::MATCH_SSID);
_mainWid->lvEssids->clear();
- // get all aps from all devices grouped together using the ssid
- WirelessManager::getWirelessNetworks(nets, NULL, WirelessNetwork::MATCH_SSID);
for (QValueList<WirelessNetwork>::Iterator it = nets.begin(); it != nets.end(); ++it)
{
KListViewItem* item = new NetworkListViewItem(_mainWid->lvEssids, (*it));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/knetworkmanager-0.7r815869/knetworkmanager/src/knetworkmanager-tray.cpp new/knetworkmanager-0.7r815970/knetworkmanager/src/knetworkmanager-tray.cpp
--- old/knetworkmanager-0.7r815869/knetworkmanager/src/knetworkmanager-tray.cpp 2008-06-02 20:33:34.000000000 +0200
+++ new/knetworkmanager-0.7r815970/knetworkmanager/src/knetworkmanager-tray.cpp 2008-06-03 00:01:30.000000000 +0200
@@ -363,10 +363,17 @@
if (dev_comp->device() == dev)
{
+ if (dev_comp->device() == d->foregroundTrayComponent->device() ) {
+ d->foregroundTrayComponent = 0;
+ }
// remove device_tray and delete it
- delete *it;
d->trayComponents.remove(it);
- //WILLTODO: if menu is showing, hide it
+ delete dev_comp;
+
+ if (contextMenu()->isVisible()) {
+ contextMenu()->hide();
+ }
+
break;
}
}
@@ -414,6 +421,7 @@
{
connect( devTray, SIGNAL(needsCenterStage(TrayComponent*,bool)),
SLOT(trayComponentNeedsCenterStage(TrayComponent*,bool)));
+ connect( devTray, SIGNAL(uiUpdated()), SLOT(trayUiChanged()));
d->trayComponents.append(devTray);
//WILLTODO: sort
}
@@ -516,7 +524,7 @@
for (QValueList::Iterator it = d->trayComponents.begin(); it != d->trayComponents.end(); ++it)
{
DeviceTrayComponent* newDtc = dynamic_cast (*it);
- if ( newDtc->device() == device ) {
+ if ( newDtc && newDtc->device() == device ) {
d->foregroundTrayComponent = newDtc;
break;
}
@@ -536,6 +544,13 @@
updateActiveConnection(state);
}
+void Tray::trayUiChanged()
+{
+ DeviceTrayComponent * dtc = d->foregroundTrayComponent;
+ if (dtc) {
+ updateTrayIcon(dtc->device()->getState());
+ }
+}
void Tray::updateTrayIcon(NMDeviceState state)
{
// stop the old movie to avoid unnecessary wakups
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/knetworkmanager-0.7r815869/knetworkmanager/src/knetworkmanager-tray.h new/knetworkmanager-0.7r815970/knetworkmanager/src/knetworkmanager-tray.h
--- old/knetworkmanager-0.7r815869/knetworkmanager/src/knetworkmanager-tray.h 2008-06-02 20:33:34.000000000 +0200
+++ new/knetworkmanager-0.7r815970/knetworkmanager/src/knetworkmanager-tray.h 2008-06-03 00:01:30.000000000 +0200
@@ -86,6 +86,7 @@
void slotDeactivateConnection(int);
void trayComponentNeedsCenterStage(TrayComponent*, bool);
void slotUpdateDeviceState(NMDeviceState);
+ void trayUiChanged();
private:
void updateTrayIcon(NMDeviceState);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/knetworkmanager-0.7r815869/knetworkmanager/src/knetworkmanager-wireless_device.cpp new/knetworkmanager-0.7r815970/knetworkmanager/src/knetworkmanager-wireless_device.cpp
--- old/knetworkmanager-0.7r815869/knetworkmanager/src/knetworkmanager-wireless_device.cpp 2008-06-02 20:33:34.000000000 +0200
+++ new/knetworkmanager-0.7r815970/knetworkmanager/src/knetworkmanager-wireless_device.cpp 2008-06-03 00:01:30.000000000 +0200
@@ -38,6 +38,7 @@
// Qt includes
#include
+#include
#include
// Qt-Dbus includes
@@ -55,102 +56,17 @@
~WirelessDevicePrivate()
{
// cleanup the AP-list
- for (QMap::Iterator it = aps.begin(); it != aps.end(); ++it)
+ for (QMap::Iterator it = aps.begin(); it != aps.end(); ++it)
{
- DBus::AccessPointProxy* p = it.data();
+ AccessPoint* p = it.data();
delete p;
- it.data() = NULL;
}
}
DBus::WirelessDeviceProxy nmWireless;
- QMap aps;
+ QMap aps;
};
-void WirelessDevice::updateAPList()
-{
- QDBusError err;
- QValueList<QDBusObjectPath> aps;
-
- // get the APs from NM
- if (d->nmWireless.GetAccessPoints(aps, err))
- {
- // create an AP-object for each objectpath
- for (QValueList<QDBusObjectPath>::iterator it = aps.begin(); it != aps.end(); ++it)
- {
- // if we have this AP already in our list we do not need to add it
- if (d->aps.find(*it) != d->aps.end())
- continue;
-
- DBus::AccessPointProxy* ap = new DBus::AccessPointProxy(NM_DBUS_SERVICE, *it);
- ap->setConnection(QDBusConnection::systemBus());
- d->aps.insert(*it, ap);
- }
- }
- else
- kdWarning() << k_funcinfo << "could not get the accesspoints" << endl;
-
-}
-
-void WirelessDevice::attachAccessPoints(QValueList<AccessPoint>& aps, QByteArray essid)
-{
- // update out AP list
- updateAPList();
-
- // everybody gets its own copy of the APs
- // the DBus proxy is shared
- for (QMap::Iterator it = d->aps.begin(); it != d->aps.end(); ++it)
- {
- AccessPoint ap(QString(it.key()), it.data());
- if (essid.isNull() || ap.getSsidByteArray() == essid)
- aps.append(ap);
- }
-}
-
-QValueList<AccessPoint> WirelessDevice::getAccessPoints()
-{
- QValueList<AccessPoint> ret_aps;
-
- // update out AP list
- updateAPList();
-
- // everybody gets its own copy of the APs
- // the DBus proxy is shared
- for (QMap::Iterator it = d->aps.begin(); it != d->aps.end(); ++it)
- {
- AccessPoint ap(QString(it.key()), it.data());
- ret_aps.append(ap);
- }
-
- return ret_aps;
-}
-
-AccessPoint WirelessDevice::getActiveAccessPoint()
-{
- QDBusError err;
- QDBusObjectPath obj_path;
-
- obj_path = d->nmWireless.getActiveAccessPoint(err);
-
- if (d->aps.find(obj_path) != d->aps.end())
- return AccessPoint(QString(obj_path), d->aps[obj_path]);
-
- // return empty AP
- return AccessPoint();
-}
-
-Q_UINT32 WirelessDevice::getWirelessCapabilities() const
-{
- QDBusError err;
- return d->nmWireless.getWirelessCapabilities(err);
-}
-
-Q_UINT32 WirelessDevice::getBitrate() const
-{
- QDBusError err;
- return d->nmWireless.getBitrate(err);
-}
-
WirelessDevice::WirelessDevice (const QString & obj_path)
: Device(obj_path)
{
@@ -171,52 +87,121 @@
void WirelessDevice::slotPropertiesChanged(const QMap& properties)
{
// TODO: optimization: emit different signals for each property
-
emit propertiesChanged();
}
void WirelessDevice::slotAccessPointAdded(const QDBusObjectPath& obj_path)
{
- QMap::Iterator it;
- DBus::AccessPointProxy* ap = NULL;
+ AccessPoint* ap = 0;
- it = d->aps.find(obj_path);
- if ( it == d->aps.end())
- {
+ if ( d->aps.contains(obj_path)) {
// we do not know this AP yet, add it to the list
- ap = new DBus::AccessPointProxy(NM_DBUS_SERVICE, obj_path);
- ap->setConnection(QDBusConnection::systemBus());
+ ap = new AccessPoint(obj_path, this, "access_point_object");
d->aps.insert(obj_path, ap);
}
else
- ap = it.data();
+ ap = d->aps[obj_path];
// notify about the new accesspoint
- emit accessPointAdded(AccessPoint(QString(obj_path), ap));
+ emit accessPointAdded(ap);
}
void WirelessDevice::slotAccessPointRemoved(const QDBusObjectPath& obj_path)
{
- QMap::Iterator it;
- DBus::AccessPointProxy* ap = NULL;
+ AccessPoint* ap = 0;
- it = d->aps.find(obj_path);
- if ( it == d->aps.end())
+ if ( d->aps.contains(obj_path)) {
+ ap = d->aps[obj_path];
+
+ // notify about the AP removal
+ emit accessPointRemoved(obj_path);
+
+ // remove the appropriate AP from our list
+ d->aps.remove(obj_path);
+ delete ap;
+ }
+ else
{
// nothing we can do here
- kdWarning() << k_funcinfo << "NM requests removal of AP " << obj_path << ", but AP does not exist" << endl;
+ kdDebug() << k_funcinfo << "NM requests removal of unknown AP " << obj_path << endl;
+ }
+}
+
+QValueList WirelessDevice::accessPoints()
+{
+ // update our AP list
+ if (d->aps.isEmpty()) {
+ updateAPList();
+ }
+
+ return d->aps.values();
+}
+
+void WirelessDevice::updateAPList()
+{
+ QDBusError err;
+ QValueList<QDBusObjectPath> aps;
+
+ // get the APs from NM
+ if (d->nmWireless.GetAccessPoints(aps, err))
+ {
+ // for each AP
+ for (QValueList<QDBusObjectPath>::iterator it = aps.begin(); it != aps.end(); ++it)
+ {
+ // create an AP-object for each objectpath
+ if (d->aps.contains(*it)) {
+ continue;
+ }
+ AccessPoint* ap = new AccessPoint(*it, this, "access_point_object");
+ d->aps.insert(*it, ap);
+ }
}
else
+ kdWarning() << k_funcinfo << "Could not get a list of wireless accesspoints over DBus." << endl;
+
+}
+
+QValueList WirelessDevice::accessPointsForEssid( QByteArray essid)
+{
+ QValueList aps;
+ // the DBus proxy is shared
+ for (QMap::Iterator it = d->aps.begin(); it != d->aps.end(); ++it)
{
- ap = it.data();
+ AccessPoint * ap = it.data();
+ if (essid.isNull() || (ap && ap->getSsidByteArray() == essid))
+ aps.append(ap);
+ }
+ return aps;
+}
- // notify about the AP removal
- emit accessPointRemoved(AccessPoint(QString(obj_path), ap));
+AccessPoint * WirelessDevice::getActiveAccessPoint()
+{
+ QDBusError err;
+ QDBusObjectPath obj_path;
- // remove the appropriate AP from our list
- d->aps.remove(obj_path);
- delete ap;
+ AccessPoint * ap = 0;
+ //fixme, listen to signal and use cached value
+ obj_path = d->nmWireless.getActiveAccessPoint(err);
+ if (!obj_path.isEmpty()) {
+ if (d->aps.contains(obj_path)) {
+ ap = d->aps[obj_path];
+ } else {
+ kdWarning() << k_funcinfo << "No object for active access point found!" << endl;
+ }
}
+ return ap;
+}
+
+Q_UINT32 WirelessDevice::getWirelessCapabilities() const
+{
+ QDBusError err;
+ return d->nmWireless.getWirelessCapabilities(err);
+}
+
+Q_UINT32 WirelessDevice::getBitrate() const
+{
+ QDBusError err;
+ return d->nmWireless.getBitrate(err);
}
#include "knetworkmanager-wireless_device.moc"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/knetworkmanager-0.7r815869/knetworkmanager/src/knetworkmanager-wireless_device.h new/knetworkmanager-0.7r815970/knetworkmanager/src/knetworkmanager-wireless_device.h
--- old/knetworkmanager-0.7r815869/knetworkmanager/src/knetworkmanager-wireless_device.h 2008-06-02 20:33:34.000000000 +0200
+++ new/knetworkmanager-0.7r815970/knetworkmanager/src/knetworkmanager-wireless_device.h 2008-06-03 00:01:30.000000000 +0200
@@ -45,9 +45,9 @@
~WirelessDevice ();
Q_UINT32 getWirelessCapabilities() const;
- void attachAccessPoints(QValueList<AccessPoint>&, QByteArray essid = QByteArray());
- QValueList<AccessPoint> getAccessPoints();
- AccessPoint getActiveAccessPoint();
+ QValueList accessPointsForEssid(QByteArray essid = QByteArray());
+ QValueList accessPoints();
+ AccessPoint * getActiveAccessPoint();
Q_UINT32 getBitrate() const;
public slots:
@@ -57,8 +57,8 @@
signals:
void propertiesChanged();
- void accessPointAdded(const AccessPoint&);
- void accessPointRemoved(const AccessPoint&);
+ void accessPointAdded(AccessPoint *);
+ void accessPointRemoved(const QString &);
private:
void updateAPList();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/knetworkmanager-0.7r815869/knetworkmanager/src/knetworkmanager-wireless_device_tray.cpp new/knetworkmanager-0.7r815970/knetworkmanager/src/knetworkmanager-wireless_device_tray.cpp
--- old/knetworkmanager-0.7r815869/knetworkmanager/src/knetworkmanager-wireless_device_tray.cpp 2008-06-02 20:33:34.000000000 +0200
+++ new/knetworkmanager-0.7r815970/knetworkmanager/src/knetworkmanager-wireless_device_tray.cpp 2008-06-03 00:01:30.000000000 +0200
@@ -23,6 +23,7 @@
**************************************************************************/
// KDE includes
+#include
#include
#include
@@ -51,19 +52,20 @@
class WirelessDeviceTrayPrivate
{
public:
- WirelessDeviceTrayPrivate() {}
+ WirelessDeviceTrayPrivate() :dev(0), activeAccessPoint(0) { }
~WirelessDeviceTrayPrivate() {}
WirelessDevice* dev;
+ AccessPoint * activeAccessPoint;
};
QString WirelessDeviceTray::getToolTipText()
{
QString tooltip = DeviceTrayComponent::getToolTipText();
- AccessPoint ap = d->dev->getActiveAccessPoint();
- if (ap.isValid())
- tooltip += "\n" + i18n("Network: %1").arg(ap.getDisplaySsid());
+ AccessPoint * ap = d->dev->getActiveAccessPoint();
+ if (ap)
+ tooltip += "\n" + i18n("Network: %1").arg(ap->getDisplaySsid());
return tooltip;
}
@@ -121,12 +123,10 @@
void WirelessDeviceTray::addWirelessNetworks(KPopupMenu* menu)
{
// get all wireless networks
- QValueList<WirelessNetwork> nets;
- WirelessManager::getWirelessNetworks(nets, d->dev);
+ QValueList<WirelessNetwork> nets = WirelessManager::getWirelessNetworks(d->dev);
// get all wireless connections
- QValueList conns;
- WirelessManager::getWirelessConnections(conns);
+ QValueList conns = WirelessManager::getWirelessConnections();
// get the currently active connection
NMProxy* nm = NMProxy::getInstance();
@@ -134,11 +134,6 @@
if (active_conn)
printf("%s\n", active_conn->getObjectPath().data());
- // no need to bloat the menu with an subhead, I think
- if ( false /*conns.count()*/ ) {
- Subhead* subhead = new Subhead (menu, "subhead", i18n("Available Wireless Connections"), SmallIcon("wireless", QIconSet::Automatic));
- menu->insertItem (subhead, -1, -1);
- }
// add all wireless connections in range
// (we may have more then one connection per network)
for (QValueList::iterator it = conns.begin(); it != conns.end(); ++it)
@@ -234,28 +229,30 @@
void WirelessDeviceTray::slotUpdateDeviceState(NMDeviceState state)
{
+ slotCheckActiveAccessPoint();
if (state == NM_DEVICE_STATE_ACTIVATED)
{
// trigger an update of the connections seen bssids property
- slotActiveAccessPointChanged();
-
- AccessPoint ap = d->dev->getActiveAccessPoint();
- int strength = ap.getStrength();
- if (strength > 80)
- setPixmapForState((NMDeviceState)state, SmallIcon("nm_signal_100"));
- else if (strength > 55)
- setPixmapForState((NMDeviceState)state, SmallIcon("nm_signal_75"));
- else if (strength > 30)
- setPixmapForState((NMDeviceState)state, SmallIcon("nm_signal_50"));
- else if (strength > 5)
- setPixmapForState((NMDeviceState)state, SmallIcon("nm_signal_25"));
- else
- setPixmapForState((NMDeviceState)state, SmallIcon("nm_signal_00"));
+ AccessPoint * ap = d->dev->getActiveAccessPoint();
+ if (ap) {
+ int strength = ap->getStrength();
+
+ if (strength > 80)
+ setPixmapForState((NMDeviceState)state, SmallIcon("nm_signal_100"));
+ else if (strength > 55)
+ setPixmapForState((NMDeviceState)state, SmallIcon("nm_signal_75"));
+ else if (strength > 30)
+ setPixmapForState((NMDeviceState)state, SmallIcon("nm_signal_50"));
+ else if (strength > 5)
+ setPixmapForState((NMDeviceState)state, SmallIcon("nm_signal_25"));
+ else
+ setPixmapForState((NMDeviceState)state, SmallIcon("nm_signal_00"));
+ }
}
}
-void WirelessDeviceTray::slotActiveAccessPointChanged()
+void WirelessDeviceTray::slotCheckActiveAccessPoint()
{
// the active AP changed, if a connection is already active we have roamed
// thus add the bssid to the list of seen bssids
@@ -266,11 +263,33 @@
WirelessConnection* active_conn = dynamic_cast(nm->getActiveConnection(d->dev));
if (active_conn && d->dev->getState() == NM_DEVICE_STATE_ACTIVATED)
{
- AccessPoint ap = d->dev->getActiveAccessPoint();
- ConnectionSettings::Wireless* wireless = active_conn->getWirelessSetting();
- wireless->addSeenBssid(ap.getHwAddress());
+ if ( d->activeAccessPoint != d->dev->getActiveAccessPoint()) {
+ disconnect( d->activeAccessPoint, SIGNAL(strengthChanged(Q_UINT8)), this, SLOT(apStrengthChanged(Q_UINT8)));
+ d->activeAccessPoint = d->dev->getActiveAccessPoint();
+ if ( d->activeAccessPoint ) {
+ connect( d->activeAccessPoint, SIGNAL(strengthChanged(Q_UINT8)), this, SLOT(apStrengthChanged(Q_UINT8)));
+ ConnectionSettings::Wireless* wireless = active_conn->getWirelessSetting();
+ wireless->addSeenBssid(d->activeAccessPoint->getHwAddress());
+ }
+ }
}
-
+}
+
+void WirelessDeviceTray::apStrengthChanged(Q_UINT8 strength)
+{
+ kdDebug() << k_funcinfo << (uint)strength << endl;
+ NMDeviceState state = device()->getState();
+ if (strength > 80)
+ setPixmapForState(state, SmallIcon("nm_signal_100"));
+ else if (strength > 55)
+ setPixmapForState(state, SmallIcon("nm_signal_75"));
+ else if (strength > 30)
+ setPixmapForState(state, SmallIcon("nm_signal_50"));
+ else if (strength > 5)
+ setPixmapForState(state, SmallIcon("nm_signal_25"));
+ else
+ setPixmapForState(state, SmallIcon("nm_signal_00"));
+ emit uiUpdated();
}
WirelessDeviceTray::WirelessDeviceTray (WirelessDevice* dev, KSystemTray * parent, const char * name)
@@ -290,7 +309,7 @@
connect(dev, SIGNAL(StateChanged(NMDeviceState)), this, SLOT(slotUpdateDeviceState(NMDeviceState)));
// if the active access point changed but not the connection we roamed to a new AP
- connect(dev, SIGNAL(propertiesChanged()), this, SLOT(slotActiveAccessPointChanged()));
+ connect(dev, SIGNAL(propertiesChanged()), this, SLOT(slotCheckActiveAccessPoint()));
}
WirelessDeviceTray::~WirelessDeviceTray ()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/knetworkmanager-0.7r815869/knetworkmanager/src/knetworkmanager-wireless_device_tray.h new/knetworkmanager-0.7r815970/knetworkmanager/src/knetworkmanager-wireless_device_tray.h
--- old/knetworkmanager-0.7r815869/knetworkmanager/src/knetworkmanager-wireless_device_tray.h 2008-06-02 20:33:34.000000000 +0200
+++ new/knetworkmanager-0.7r815970/knetworkmanager/src/knetworkmanager-wireless_device_tray.h 2008-06-03 00:01:30.000000000 +0200
@@ -60,9 +60,10 @@
public slots:
void slotUpdateDeviceState(NMDeviceState);
- void slotActiveAccessPointChanged();
+ void slotCheckActiveAccessPoint();
void newConnection();
-
+ protected slots:
+ void apStrengthChanged(Q_UINT8 strength);
private:
void addWirelessNetworks (KPopupMenu* menu);
QValueList<WirelessNetwork> getWirelessNetworks();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/knetworkmanager-0.7r815869/knetworkmanager/src/knetworkmanager-wireless_manager.cpp new/knetworkmanager-0.7r815970/knetworkmanager/src/knetworkmanager-wireless_manager.cpp
--- old/knetworkmanager-0.7r815869/knetworkmanager/src/knetworkmanager-wireless_manager.cpp 2008-06-02 20:33:34.000000000 +0200
+++ new/knetworkmanager-0.7r815970/knetworkmanager/src/knetworkmanager-wireless_manager.cpp 2008-06-03 00:01:30.000000000 +0200
@@ -42,60 +42,66 @@
#include "knetworkmanager-devicestore.h"
-void WirelessManager::getWirelessNetworks(QValueList<WirelessNetwork>& nets, WirelessDevice* dev, Q_UINT32 match)
+QValueList<WirelessNetwork> WirelessManager::getWirelessNetworks(WirelessDevice* dev, Q_UINT32 match)
{
- QValueList<AccessPoint> aps;
+ QValueList<WirelessNetwork> nets;
+ QValueList aps;
// fetch all APs
- WirelessManager::getAccessPoints(aps, dev);
+ aps = WirelessManager::getAccessPoints(dev);
// now group the APs together according to their security settings
- for (QValueList<AccessPoint>::Iterator apit = aps.begin(); apit != aps.end(); ++apit)
+ for (QValueList::Iterator apit = aps.begin(); apit != aps.end(); ++apit)
{
bool found = false;
// no hidden APs
- if ((*apit).getSsid().count() == 0)
- continue;
+ AccessPoint * ap = *apit;
+ if ( ap ) {
+ if (ap->getSsid().count() == 0)
+ continue;
- // check if we have a network matching this AP
- for (QValueList<WirelessNetwork>::Iterator net = nets.begin(); net != nets.end(); ++net)
- {
- if ((*net) == (*apit))
+ // check if we have a network matching this AP
+ for (QValueList<WirelessNetwork>::Iterator netIt = nets.begin(); netIt != nets.end(); ++netIt)
{
- // we alread have a network where this AP belongs to
- found = true;
-
- // attach this ap to the network
- (*net).addAP((*apit));
-
-/* // FIXME active?
- if (active_ap)
+ if ((*netIt).contains(ap) )
{
+ // we alread have a network where this AP belongs to
+ found = true;
+
+ // attach this ap to the network
+ (*netIt).addAP(ap);
+
+ /* // FIXME active?
+ if (active_ap)
+ {
// here is the active_ap
if (!(*net).getActive() && ((*ap) == *active_ap))
- (*net).setActive(true);
- }*/
- break;
+ (*net).setActive(true);
+ }*/
+ break;
+ }
+ }
+
+ if (!found)
+ {
+ // create a new network-descriptor according to this ap
+ WirelessNetwork net(match);
+ net.addAP(ap);
+ nets.append(net);
}
- }
-
- if (!found)
- {
- // create a new network-descriptor according to this ap
- WirelessNetwork net(match);
- net.addAP((*apit));
- nets.append(net);
}
}
+ return nets;
}
-void WirelessManager::getAccessPoints(QValueList<AccessPoint>& aps, WirelessDevice* dev)
+QValueList WirelessManager::getAccessPoints(WirelessDevice* dev)
{
// build up AP list depending on one device or on all devices
- if (dev)
- dev->attachAccessPoints(aps);
- else
- {
+ if (dev) {
+ return dev->accessPoints();
+ }
+ else {
+ QValueList aps;
DeviceStore* store = DeviceStore::getInstance();
if (store)
{
@@ -106,14 +112,16 @@
if (!wdev)
continue;
// add all APs from this device
- wdev->attachAccessPoints(aps);
+ aps +=wdev->accessPoints();
}
}
+ return aps;
}
}
-void WirelessManager::getWirelessConnections(QValueList& conns)
+QValueList WirelessManager::getWirelessConnections()
{
+ QValueList conns;
ConnectionStore* store = ConnectionStore::getInstance();
// get all wireless connections
@@ -126,15 +134,17 @@
continue;
conns.append(wireless_conn);
}
+ return conns;
}
-void WirelessManager::getAccessPoints(QByteArray essid, QValueList<AccessPoint>& aps, WirelessDevice* dev)
+QValueList WirelessManager::getAccessPointsForEssid(QByteArray essid, WirelessDevice* dev)
{
// build up AP list depending on one device or on all devices
if (dev)
- dev->attachAccessPoints(aps, essid);
+ return dev->accessPointsForEssid(essid);
else
{
+ QValueList aps;
DeviceStore* store = DeviceStore::getInstance();
if (store)
{
@@ -145,9 +155,10 @@
if (!wdev)
continue;
// add all APs from this device
- wdev->attachAccessPoints(aps, essid);
+ aps += wdev->accessPointsForEssid(essid);
}
}
+ return aps;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/knetworkmanager-0.7r815869/knetworkmanager/src/knetworkmanager-wireless_manager.h new/knetworkmanager-0.7r815970/knetworkmanager/src/knetworkmanager-wireless_manager.h
--- old/knetworkmanager-0.7r815869/knetworkmanager/src/knetworkmanager-wireless_manager.h 2008-06-02 20:33:34.000000000 +0200
+++ new/knetworkmanager-0.7r815970/knetworkmanager/src/knetworkmanager-wireless_manager.h 2008-06-03 00:01:30.000000000 +0200
@@ -46,16 +46,16 @@
public:
// get all accesspoints from device dev or from all devices if dev is NULL
// and group them together using all properties specified in match
- static void getWirelessNetworks(QValueList<WirelessNetwork>&, WirelessDevice* dev = NULL, Q_UINT32 match = WirelessNetwork::MATCH_SSID);
+ static QValueList<WirelessNetwork> getWirelessNetworks(WirelessDevice* dev = 0, Q_UINT32 match = WirelessNetwork::MATCH_SSID);
// get all aps from either one device or from all available devices
- static void getAccessPoints(QValueList<AccessPoint>&, WirelessDevice* dev = NULL);
+ static QValueList getAccessPoints(WirelessDevice* dev = 0);
// get a list of all known wireless connections
- static void getWirelessConnections(QValueListConnectionSettings::WirelessConnection*& conns);
+ static QValueListConnectionSettings::WirelessConnection* getWirelessConnections();
// get a list of all APs with a specific SSID
- static void getAccessPoints(QByteArray, QValueList<AccessPoint>&, WirelessDevice* dev = NULL);
+ static QValueList getAccessPointsForEssid(QByteArray, WirelessDevice* dev = 0);
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/knetworkmanager-0.7r815869/knetworkmanager/src/knetworkmanager-wireless_network.cpp new/knetworkmanager-0.7r815970/knetworkmanager/src/knetworkmanager-wireless_network.cpp
--- old/knetworkmanager-0.7r815869/knetworkmanager/src/knetworkmanager-wireless_network.cpp 2008-06-02 20:33:34.000000000 +0200
+++ new/knetworkmanager-0.7r815970/knetworkmanager/src/knetworkmanager-wireless_network.cpp 2008-06-03 00:01:30.000000000 +0200
@@ -57,7 +57,7 @@
bool active;
Q_UINT32 match;
- QValueList<AccessPoint> aps;
+ QValueList aps;
};
WirelessNetwork::WirelessNetwork(const WirelessNetwork& other)
@@ -86,18 +86,18 @@
return *this;
}
-bool WirelessNetwork::operator== (const AccessPoint& ap)
+bool WirelessNetwork::contains (const AccessPoint * const ap)
{
- if ( (d->match & MATCH_SSID) && getSsid() != ap.getSsidByteArray())
+ if ( (d->match & MATCH_SSID) && getSsid() != ap->getSsidByteArray())
return false;
// AP matches
return true;
}
-bool WirelessNetwork::addAP(const AccessPoint& ap)
+bool WirelessNetwork::addAP(const AccessPoint * const ap)
{
- if ((*this) == ap || d->aps.isEmpty())
+ if ( this->contains( ap ) || d->aps.isEmpty())
{
d->aps.append(ap);
return true;
@@ -107,7 +107,11 @@
const QByteArray WirelessNetwork::getSsid() const
{
- return (*(d->aps.begin())).getSsidByteArray();
+ if ( !d->aps.isEmpty() ) {
+ return (*(d->aps.begin()))->getSsidByteArray();
+ } else {
+ return QByteArray();
+ }
}
void WirelessNetwork::setSsid(const QByteArray& ssid)
@@ -117,15 +121,19 @@
QString WirelessNetwork::getDisplaySsid() const
{
- return (*(d->aps.begin())).getDisplaySsid();
+ if (!d->aps.isEmpty()) {
+ return (*(d->aps.begin()))->getDisplaySsid();
+ } else {
+ return QString();
+ }
}
Q_UINT32 WirelessNetwork::getFlags() const
{
Q_UINT32 flags = NM_802_11_AP_FLAGS_NONE;
- for (QValueList<AccessPoint>::Iterator it = d->aps.begin(); it != d->aps.end(); ++it)
+ for (QValueList::Iterator it = d->aps.begin(); it != d->aps.end(); ++it)
{
- flags |= (*it).getFlags();
+ flags |= (*it)->getFlags();
}
return flags;
}
@@ -138,9 +146,9 @@
Q_UINT32 WirelessNetwork::getWpaFlags() const
{
Q_UINT32 flags = NM_802_11_AP_SEC_NONE;
- for (QValueList<AccessPoint>::Iterator it = d->aps.begin(); it != d->aps.end(); ++it)
+ for (QValueList::Iterator it = d->aps.begin(); it != d->aps.end(); ++it)
{
- flags |= (*it).getWpaFlags();
+ flags |= (*it)->getWpaFlags();
}
return flags;
}
@@ -153,9 +161,9 @@
Q_UINT32 WirelessNetwork::getRsnFlags() const
{
Q_UINT32 flags = NM_802_11_AP_SEC_NONE;
- for (QValueList<AccessPoint>::Iterator it = d->aps.begin(); it != d->aps.end(); ++it)
+ for (QValueList::Iterator it = d->aps.begin(); it != d->aps.end(); ++it)
{
- flags |= (*it).getRsnFlags();
+ flags |= (*it)->getRsnFlags();
}
return flags;
}
@@ -170,18 +178,13 @@
return (getFlags() && NM_802_11_AP_FLAGS_PRIVACY);
}
-void WirelessNetwork::setStrength(Q_UINT8 strength)
-{
-
-}
-
Q_UINT8 WirelessNetwork::getStrength() const
{
Q_UINT8 strength = 0;
- for (QValueList<AccessPoint>::Iterator it = d->aps.begin(); it != d->aps.end(); ++it)
+ for (QValueList::Iterator it = d->aps.begin(); it != d->aps.end(); ++it)
{
- if ((*it).getStrength() > strength)
- strength = (*it).getStrength();
+ if ((*it)->getStrength() > strength)
+ strength = (*it)->getStrength();
}
return strength;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/knetworkmanager-0.7r815869/knetworkmanager/src/knetworkmanager-wireless_network.h new/knetworkmanager-0.7r815970/knetworkmanager/src/knetworkmanager-wireless_network.h
--- old/knetworkmanager-0.7r815869/knetworkmanager/src/knetworkmanager-wireless_network.h 2008-06-02 20:33:34.000000000 +0200
+++ new/knetworkmanager-0.7r815970/knetworkmanager/src/knetworkmanager-wireless_network.h 2008-06-03 00:01:30.000000000 +0200
@@ -61,10 +61,10 @@
WirelessNetwork& operator= (const WirelessNetwork&);
// check if the AccessPoint represents the same net
- bool operator== (const AccessPoint&);
+ bool contains(const AccessPoint * const);
// add an AP to the Network
- bool addAP(const AccessPoint& ap);
+ bool addAP(const AccessPoint * const);
// combined flags of all APs
Q_UINT32 getFlags() const;
@@ -87,7 +87,6 @@
// strength of the best AP
Q_UINT8 getStrength() const;
- void setStrength(Q_UINT8);
void setActive(bool active);
bool getActive() const;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/knetworkmanager-0.7r815869/knetworkmanager/src/traycomponent.h new/knetworkmanager-0.7r815970/knetworkmanager/src/traycomponent.h
--- old/knetworkmanager-0.7r815869/knetworkmanager/src/traycomponent.h 2008-06-02 20:33:34.000000000 +0200
+++ new/knetworkmanager-0.7r815970/knetworkmanager/src/traycomponent.h 2008-06-03 00:01:30.000000000 +0200
@@ -39,6 +39,8 @@
virtual ~TrayComponent();
virtual void addMenuItems(KPopupMenu* menu) = 0;
KSystemTray * tray() const;;
+signals:
+ void uiUpdated();
private:
KSystemTray * m_tray;
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/knetworkmanager-0.7r815869/knm_dist.log new/knetworkmanager-0.7r815970/knm_dist.log
--- old/knetworkmanager-0.7r815869/knm_dist.log 2008-06-02 20:34:12.000000000 +0200
+++ new/knetworkmanager-0.7r815970/knm_dist.log 2008-06-03 00:01:50.000000000 +0200
@@ -1,11 +1,11 @@
-svn2dist log on Mo 2. Jun 20:33:34 CEST 2008
-Module: /tmp/knm/svn/knetworkmanager/.; Directory: knetworkmanager-0.7; Name: knetworkmanager; Version 0.7r815869.
--v 0.7r815869 -n knetworkmanager . knetworkmanager-0.7 --i18n-module extragear-network --log=./knm_dist.log
+svn2dist log on Tue Jun 3 00:01:30 CEST 2008
+Module: /tmp/knm/svn/knetworkmanager/.; Directory: knetworkmanager-0.7; Name: knetworkmanager; Version 0.7r815970.
+-v 0.7r815970 -n knetworkmanager . knetworkmanager-0.7 --i18n-module extragear-network --log=./knm_dist.log
--------
No svn root specified, and --no-i18n option is not given..
Using anonymous svn..
Temporary directory is /tmp/knm/svn/knetworkmanager/./svn2dist-tmp.
-cp -R /tmp/knm/svn/knetworkmanager/./knetworkmanager-0.7 /tmp/knm/svn/knetworkmanager/./svn2dist-tmp/knetworkmanager-0.7r815869/knetworkmanager
+cp -R /tmp/knm/svn/knetworkmanager/./knetworkmanager-0.7 /tmp/knm/svn/knetworkmanager/./svn2dist-tmp/knetworkmanager-0.7r815970/knetworkmanager
Getting i18n subdirs
available languages: af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fo fr fy ga gl he hi hr hsb hu id is it ja ka kk km kn ko ku ky lb lo lt lv mi mk mn ms mt nb nds nl nn nso oc pa pl pt pt_BR ro ru rw se sk sl sr sr@Latn sq ss sv ta te tg th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW zu (Pofiles to fetch: knetworkmanager.po )
Getting l10n-kde3/af/messages/extragear-network/knetworkmanager.po
@@ -188,6 +188,10 @@
zh_TW's knetworkmanager.po file included.
Getting l10n-kde3/zu/messages/extragear-network/knetworkmanager.po
zu's knetworkmanager.po does not exist.
-cp -pRL /tmp/knm/svn/knetworkmanager/./admin /tmp/knm/svn/knetworkmanager/./svn2dist-tmp/knetworkmanager-0.7r815869
+cp -pRL /tmp/knm/svn/knetworkmanager/./admin /tmp/knm/svn/knetworkmanager/./svn2dist-tmp/knetworkmanager-0.7r815970
Copying over files from the module directory:
-cp /tmp/knm/svn/knetworkmanager/./knm_dist.log /tmp/knm/svn/knetworkmanager/./svn2dist-tmp/knetworkmanager-0.7r815869
+cp /tmp/knm/svn/knetworkmanager/./stamp-h.in /tmp/knm/svn/knetworkmanager/./svn2dist-tmp/knetworkmanager-0.7r815970
+cp /tmp/knm/svn/knetworkmanager/./configure.in /tmp/knm/svn/knetworkmanager/./svn2dist-tmp/knetworkmanager-0.7r815970
+cp /tmp/knm/svn/knetworkmanager/./configure.files /tmp/knm/svn/knetworkmanager/./svn2dist-tmp/knetworkmanager-0.7r815970
+cp /tmp/knm/svn/knetworkmanager/./.autoconf_trace /tmp/knm/svn/knetworkmanager/./svn2dist-tmp/knetworkmanager-0.7r815970
+cp /tmp/knm/svn/knetworkmanager/./knm_dist.log /tmp/knm/svn/knetworkmanager/./svn2dist-tmp/knetworkmanager-0.7r815970
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/knetworkmanager-0.7r815869/VERSION new/knetworkmanager-0.7r815970/VERSION
--- old/knetworkmanager-0.7r815869/VERSION 2008-06-02 20:34:12.000000000 +0200
+++ new/knetworkmanager-0.7r815970/VERSION 2008-06-03 00:01:50.000000000 +0200
@@ -1 +1 @@
-knetworkmanager version 0.7r815869
+knetworkmanager version 0.7r815970
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org