Hello community,
here is the log from the commit of package NetworkManager-kde
checked in at Tue Jul 1 12:45:16 CEST 2008.
--------
--- KDE/NetworkManager-kde/NetworkManager-kde.changes 2008-06-16 19:02:58.000000000 +0200
+++ /mounts/work_src_done/STABLE/NetworkManager-kde/NetworkManager-kde.changes 2008-07-01 09:49:54.463142000 +0200
@@ -1,0 +2,8 @@
+Tue Jul 1 09:45:34 CEST 2008 - hschaa@suse.de
+
+- Update to r826733
+ * Fix crash after resuming from s2ram (bnc#404896)
+ * Add tooltips to the tray icon
+ * Add WPA-EAP TTLS and PEAP support
+
+-------------------------------------------------------------------
Old:
----
knetworkmanager-0.7r821121.tar.bz2
New:
----
knetworkmanager-0.7r826733.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-kde.spec ++++++
--- /var/tmp/diff_new_pack.w28130/_old 2008-07-01 12:45:00.000000000 +0200
+++ /var/tmp/diff_new_pack.w28130/_new 2008-07-01 12:45:00.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package NetworkManager-kde (Version 0.7r821121)
+# spec file for package NetworkManager-kde (Version 0.7r826733)
#
# 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.7r821121
+Version: 0.7r826733
Release: 1
Summary: KNetworkManager application for use with NetworkManager
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -158,6 +158,11 @@
/opt/kde3/share/services/%{appname}_vpnc.desktop
%changelog
+* Tue Jul 01 2008 hschaa@suse.de
+- Update to r826733
+ * Fix crash after resuming from s2ram (bnc#404896)
+ * Add tooltips to the tray icon
+ * Add WPA-EAP TTLS and PEAP support
* Mon Jun 16 2008 hschaa@suse.de
- Update to r821121
* Select the correct security mode for wireless connections
++++++ knetworkmanager-0.7r821121.tar.bz2 -> knetworkmanager-0.7r826733.tar.bz2 ++++++
++++ 2453 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.7r821121/acinclude.m4 new/knetworkmanager-0.7r826733/acinclude.m4
--- old/knetworkmanager-0.7r821121/acinclude.m4 2008-06-16 15:48:26.000000000 +0200
+++ new/knetworkmanager-0.7r826733/acinclude.m4 2008-07-01 09:37:11.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.7r821121/admin/acinclude.m4.in new/knetworkmanager-0.7r826733/admin/acinclude.m4.in
--- old/knetworkmanager-0.7r821121/admin/acinclude.m4.in 2008-01-10 22:23:53.000000000 +0100
+++ new/knetworkmanager-0.7r826733/admin/acinclude.m4.in 2008-06-07 04:40:56.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.7r821121/admin/cvs.sh new/knetworkmanager-0.7r826733/admin/cvs.sh
--- old/knetworkmanager-0.7r821121/admin/cvs.sh 2007-05-14 22:11:46.000000000 +0200
+++ new/knetworkmanager-0.7r826733/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.7r821121/admin/detect-autoconf.pl new/knetworkmanager-0.7r826733/admin/detect-autoconf.pl
--- old/knetworkmanager-0.7r821121/admin/detect-autoconf.pl 2008-01-10 22:23:53.000000000 +0100
+++ new/knetworkmanager-0.7r826733/admin/detect-autoconf.pl 2008-06-07 04:40:56.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.7r821121/admin/Doxyfile.am new/knetworkmanager-0.7r826733/admin/Doxyfile.am
--- old/knetworkmanager-0.7r821121/admin/Doxyfile.am 2006-01-12 17:14:51.000000000 +0100
+++ new/knetworkmanager-0.7r826733/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.7r821121/.autoconf_trace new/knetworkmanager-0.7r826733/.autoconf_trace
--- old/knetworkmanager-0.7r821121/.autoconf_trace 2008-06-16 15:48:25.000000000 +0200
+++ new/knetworkmanager-0.7r826733/.autoconf_trace 2008-07-01 09:37:10.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.7r821121/configure.in new/knetworkmanager-0.7r826733/configure.in
--- old/knetworkmanager-0.7r821121/configure.in 2008-06-16 15:48:27.000000000 +0200
+++ new/knetworkmanager-0.7r826733/configure.in 2008-07-01 09:37:11.000000000 +0200
@@ -40,7 +40,7 @@
AC_ARG_PROGRAM
dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(knetworkmanager, 0.7r821121) dnl searches for some needed programs
+AM_INIT_AUTOMAKE(knetworkmanager, 0.7r826733) 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.7r821121/knetworkmanager/src/devicetraycomponent.cpp new/knetworkmanager-0.7r826733/knetworkmanager/src/devicetraycomponent.cpp
--- old/knetworkmanager-0.7r821121/knetworkmanager/src/devicetraycomponent.cpp 2008-06-16 15:48:24.000000000 +0200
+++ new/knetworkmanager-0.7r826733/knetworkmanager/src/devicetraycomponent.cpp 2008-07-01 09:37:10.000000000 +0200
@@ -53,6 +53,16 @@
m_pixmaps[NM_DEVICE_STATE_FAILED] = SmallIcon("nm_no_connection");
+ m_tooltips[NM_DEVICE_STATE_UNKNOWN] = i18n("Unknown");
+ m_tooltips[NM_DEVICE_STATE_UNAVAILABLE] = i18n("Down");
+ m_tooltips[NM_DEVICE_STATE_UNMANAGED] = i18n("Unmanaged");
+ m_tooltips[NM_DEVICE_STATE_DISCONNECTED] = i18n("Disconnected");
+ m_tooltips[NM_DEVICE_STATE_PREPARE] = i18n("Preparing");
+ m_tooltips[NM_DEVICE_STATE_CONFIG] = i18n("Configuration");
+ m_tooltips[NM_DEVICE_STATE_NEED_AUTH] = i18n("Awaiting authentication");
+ m_tooltips[NM_DEVICE_STATE_IP_CONFIG] = i18n("IP configuration");
+ m_tooltips[NM_DEVICE_STATE_ACTIVATED] = i18n("Activated");
+ m_tooltips[NM_DEVICE_STATE_FAILED] = i18n("Failed");
}
DeviceTrayComponent::~DeviceTrayComponent()
@@ -64,15 +74,15 @@
return m_device;
}
-QString DeviceTrayComponent::getToolTipText()
+QStringList DeviceTrayComponent::getToolTipText()
{
- NMDeviceState state = m_device->getState();
-
- if (m_tooltips.contains(state)) {
- return i18n("State: %1").arg(m_tooltips[state]);
- } else {
- return QString();
- }
+ QStringList list;
+ NMDeviceState state = m_device->getState();
+ if (m_tooltips.contains(state)) {
+ list.append(i18n("Device: %1").arg(m_device->getInterface()));
+ list.append(i18n("State: %1").arg(m_tooltips[state]));
+ }
+ return 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.7r821121/knetworkmanager/src/devicetraycomponent.h new/knetworkmanager-0.7r826733/knetworkmanager/src/devicetraycomponent.h
--- old/knetworkmanager-0.7r821121/knetworkmanager/src/devicetraycomponent.h 2008-06-16 15:48:24.000000000 +0200
+++ new/knetworkmanager-0.7r826733/knetworkmanager/src/devicetraycomponent.h 2008-07-01 09:37:10.000000000 +0200
@@ -42,7 +42,7 @@
virtual ~DeviceTrayComponent();
QPixmap pixmapForState(NMDeviceState state);
QMovie movieForState(NMDeviceState state);
- virtual QString getToolTipText();
+ virtual QStringList getToolTipText();
Device* device() const;
signals:
void needsCenterStage(TrayComponent *, bool);
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.7r821121/knetworkmanager/src/knetworkmanager-cdma_connection.cpp new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-cdma_connection.cpp
--- old/knetworkmanager-0.7r821121/knetworkmanager/src/knetworkmanager-cdma_connection.cpp 2008-06-16 15:48:24.000000000 +0200
+++ new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-cdma_connection.cpp 2008-07-01 09:37:10.000000000 +0200
@@ -49,6 +49,13 @@
return dynamic_cast(getSetting(NM_SETTING_SERIAL_SETTING_NAME));
}
+ConnectionSettings::Connection* ConnectionSettings::CDMAConnection::duplicate()
+{
+ CDMAConnection* conn = new CDMAConnection();
+ conn->updateSettings(this);
+ return conn;
+}
+
#include "knetworkmanager-cdma_connection.moc"
// vim: sw=4 sts=4 noet tw=100
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.7r821121/knetworkmanager/src/knetworkmanager-cdma_connection.h new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-cdma_connection.h
--- old/knetworkmanager-0.7r821121/knetworkmanager/src/knetworkmanager-cdma_connection.h 2008-06-16 15:48:24.000000000 +0200
+++ new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-cdma_connection.h 2008-07-01 09:37:10.000000000 +0200
@@ -41,6 +41,7 @@
~CDMAConnection();
CDMA* getCDMASetting() const;
Serial* getSerialSetting() const;
+ Connection* duplicate();
};
} // namespace ConnectionSettings
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.7r821121/knetworkmanager/src/knetworkmanager-connection.cpp new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-connection.cpp
--- old/knetworkmanager-0.7r821121/knetworkmanager/src/knetworkmanager-connection.cpp 2008-06-16 15:48:24.000000000 +0200
+++ new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-connection.cpp 2008-07-01 09:37:10.000000000 +0200
@@ -261,4 +261,25 @@
d->conn_dbus->slotUpdated();
}
+void
+Connection::updateSettings(Connection* conn)
+{
+ QValueList settings = conn->getSettings();
+ // copy all settings over to the new connection
+ for (QValueList::Iterator it = settings.begin(); it != settings.end(); ++it)
+ {
+ ConnectionSetting* other_setting = *it;
+ ConnectionSetting* my_setting = getSetting(other_setting->getType());
+ if (my_setting)
+ {
+ my_setting->fromMap(other_setting->toMap());
+ my_setting->fromSecretsMap(other_setting->toSecretsMap(false));
+ }
+ else
+ {
+ // should not happen
+ }
+ }
+}
+
#include "knetworkmanager-connection.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.7r821121/knetworkmanager/src/knetworkmanager-connection.h new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-connection.h
--- old/knetworkmanager-0.7r821121/knetworkmanager/src/knetworkmanager-connection.h 2008-06-16 15:48:24.000000000 +0200
+++ new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-connection.h 2008-07-01 09:37:10.000000000 +0200
@@ -83,6 +83,12 @@
// the connections type (only for KNM use)
virtual QString getType();
+ // duplicate
+ virtual Connection* duplicate() = 0;
+
+ // update the settings from another connection
+ void updateSettings(Connection*);
+
public slots:
// gets called from NM when it needs the secrets
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.7r821121/knetworkmanager/src/knetworkmanager-connection_setting_8021x.cpp new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-connection_setting_8021x.cpp
--- old/knetworkmanager-0.7r821121/knetworkmanager/src/knetworkmanager-connection_setting_8021x.cpp 2008-06-16 15:48:24.000000000 +0200
+++ new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-connection_setting_8021x.cpp 2008-07-01 09:37:10.000000000 +0200
@@ -59,7 +59,7 @@
, _phase1PeapVer(QString::null)
, _phase1PeapLabel(QString::null)
, _phase1FastProvisioning(QString::null)
- , _phase2Auth(QString::null)
+ , _eapPhase2(EAP_PHASE2_AUTH_NONE)
, _phase2AuthEAP(QString::null)
, _phase2CaPath(QString::null)
{
@@ -132,6 +132,17 @@
_eap = eap;
}
+IEEE8021x::EAP_PHASE2
+IEEE8021x::getPhase2EAP(void) const
+{
+ return _eapPhase2;
+}
+
+void
+IEEE8021x::setPhase2EAP(EAP_PHASE2 eap)
+{
+ _eapPhase2 = eap;
+}
SettingsMap
IEEE8021x::toMap() const
@@ -146,6 +157,11 @@
eap_methods.append(QDBusData::fromString(eap));
map.insert(NM_SETTING_802_1X_EAP, QDBusData::fromQValueList(eap_methods));
}
+ // Phase2 EAP
+ if (_eapPhase2 != EAP_PHASE2_AUTH_NONE)
+ {
+ map.insert(NM_SETTING_802_1X_PHASE2_AUTH, QDBusData::fromString(_eapMap[(EAP)_eapPhase2]));
+ }
if (!_identity.isNull())
map.insert(NM_SETTING_802_1X_IDENTITY, QDBusData::fromString(_identity));
@@ -180,9 +196,6 @@
if (!_phase1FastProvisioning.isNull())
map.insert(NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING, QDBusData::fromString(_phase1FastProvisioning));
- if (!_phase2Auth.isNull())
- map.insert(NM_SETTING_802_1X_PHASE2_AUTH, QDBusData::fromString(_phase2Auth));
-
if (!_phase2AuthEAP.isNull())
map.insert(NM_SETTING_802_1X_PHASE2_AUTHEAP, QDBusData::fromString(_phase2AuthEAP));
@@ -250,6 +263,13 @@
}
}
}
+ else if (it.key() == NM_SETTING_802_1X_PHASE2_AUTH)
+ {
+ QString eapPhase2 = it.data().toString();
+ QBiDirectionalMap::Iterator it2;
+ if (_eapMap.end() != (it2 = _eapMap.findData(eapPhase2)))
+ setPhase2EAP((EAP_PHASE2)it2.key());
+ }
else if (it.key() == NM_SETTING_802_1X_IDENTITY)
_identity = it.data().toString();
else if (it.key() == NM_SETTING_802_1X_ANONYMOUS_IDENTITY)
@@ -262,8 +282,6 @@
_phase1PeapLabel = it.data().toString();
else if (it.key() == NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING)
_phase1FastProvisioning = it.data().toString();
- else if (it.key() == NM_SETTING_802_1X_PHASE2_AUTH)
- _phase2Auth = it.data().toString();
else if (it.key() == NM_SETTING_802_1X_PHASE2_AUTHEAP)
_phase2AuthEAP = it.data().toString();
else if (it.key() == NM_SETTING_802_1X_PHASE2_CA_PATH)
@@ -286,6 +304,12 @@
if (!_password.isNull())
map.insert(NM_SETTING_802_1X_PASSWORD, QDBusData::fromString(_password));
+ if (!_privateKeyPasswd.isNull())
+ map.insert(NM_SETTING_802_1X_PRIVATE_KEY, QDBusData::fromString(_privateKeyPasswd));
+
+ if (!_phase2PrivateKeyPasswd.isNull())
+ map.insert(NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, QDBusData::fromString(_phase2PrivateKeyPasswd));
+
return map;
}
@@ -297,9 +321,11 @@
for (SettingsMap::ConstIterator it = map.begin(); it != map.end(); ++it)
{
if (it.key() == NM_SETTING_802_1X_PASSWORD)
- {
_password = it.data().toString();
- }
+ else if (it.key() == NM_SETTING_802_1X_PRIVATE_KEY)
+ _privateKeyPasswd = it.data().toString();
+ else if (it.key() == NM_SETTING_802_1X_PHASE2_PRIVATE_KEY)
+ _phase2PrivateKeyPasswd = it.data().toString();
else
kdWarning() << k_funcinfo << " Unknown setting: " << it.key() << endl;
}
@@ -312,3 +338,25 @@
return true;
}
+QValueListIEEE8021x::EAP_PHASE2
+IEEE8021x::getAllowedPhase2Methods() const
+{
+ QValueList phase2;
+ // TODO : not sure if this is correct, jsut copied from nm-applet
+ switch(_eap)
+ {
+ case EAP_PHASE1_TTLS:
+ phase2.append(EAP_PHASE2_AUTH_MSCHAPV2);
+ phase2.append(EAP_PHASE2_AUTH_MSCHAP);
+ phase2.append(EAP_PHASE2_AUTH_CHAP);
+ phase2.append(EAP_PHASE2_AUTH_PAP);
+ break;
+ case EAP_PHASE1_PEAP:
+ phase2.append(EAP_PHASE2_AUTH_MSCHAPV2);
+ phase2.append(EAP_PHASE2_AUTH_MD5);
+ break;
+ default:
+ phase2.append(EAP_PHASE2_AUTH_NONE);
+ }
+ return phase2;
+}
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.7r821121/knetworkmanager/src/knetworkmanager-connection_setting_8021x.h new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-connection_setting_8021x.h
--- old/knetworkmanager-0.7r821121/knetworkmanager/src/knetworkmanager-connection_setting_8021x.h 2008-06-16 15:48:24.000000000 +0200
+++ new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-connection_setting_8021x.h 2008-07-01 09:37:10.000000000 +0200
@@ -84,7 +84,7 @@
, EAP_PHASE1_FAST = EAP_FAST
};
- enum EAP_PHASE2_AUTH
+ enum EAP_PHASE2
{
EAP_PHASE2_AUTH_NONE = EAP_NONE
, EAP_PHASE2_AUTH_PAP = EAP_PAP
@@ -126,6 +126,9 @@
EAP_PHASE1 getEAP(void) const;
void setEAP(EAP_PHASE1);
+ EAP_PHASE2 getPhase2EAP(void) const;
+ void setPhase2EAP(EAP_PHASE2);
+
QString getIdentity(void) const;
void setIdentity(const QString&);
@@ -150,11 +153,16 @@
PEAPVER getPhase1PeapVer(void) const;
void setPhase1PeapVer(PEAPVER);
+ // get a list of allowed phase2 methods
+ QValueList getAllowedPhase2Methods() const;
+
bool isValid() const;
private:
// settigs
EAP_PHASE1 _eap;
+ EAP_PHASE2 _eapPhase2;
+
QString _identity;
QString _anonIdentity;
QByteArray _caCert;
@@ -164,7 +172,6 @@
QString _phase1PeapVer;
QString _phase1PeapLabel;
QString _phase1FastProvisioning;
- QString _phase2Auth;
QString _phase2AuthEAP;
QByteArray _phase2CaCert;
QString _phase2CaPath;
@@ -173,11 +180,10 @@
// secrets
QString _password;
- QString _eappsk;
QString _privateKeyPasswd;
QString _phase2PrivateKeyPasswd;
- QCString String2Hex(QByteArray bytes, int final_len) const;
+ // map the different eap types (enum EAP) to their string representation
QBiDirectionalMap _eapMap;
};
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.7r821121/knetworkmanager/src/knetworkmanager-connection_setting.h new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-connection_setting.h
--- old/knetworkmanager-0.7r821121/knetworkmanager/src/knetworkmanager-connection_setting.h 2008-06-16 15:48:24.000000000 +0200
+++ new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-connection_setting.h 2008-07-01 09:37:10.000000000 +0200
@@ -85,7 +85,6 @@
Connection* _conn;
private:
- // TODO: move these to a private class
QString _type;
bool _enabled;
};
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.7r821121/knetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.cpp new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.cpp
--- old/knetworkmanager-0.7r821121/knetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.cpp 2008-06-16 15:48:24.000000000 +0200
+++ new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.cpp 2008-07-01 09:37:10.000000000 +0200
@@ -475,29 +475,44 @@
/*
class WirelessSecurityEAPImpl
*/
-WirelessSecurityEAPImpl::WirelessSecurityEAPImpl(IEEE8021x* security_setting, QWidget* parent, const char* name, WFlags fl)
+WirelessSecurityEAPImpl::WirelessSecurityEAPImpl(IEEE8021x* security_setting, WirelessSecurityPhase2Impl* phase2_widget, QWidget* parent, const char* name, WFlags fl)
: ConnectionSettingWirelessSecurityEAP(parent, name, fl)
, _security_setting(security_setting)
+ , _phase2_widget(phase2_widget)
{
// insert all EAP-Methods
- cboMethod->insertItem(i18n("None"), IEEE8021x::EAP_NONE);
- cboMethod->insertItem(i18n("Leap"), IEEE8021x::EAP_LEAP);
- cboMethod->insertItem(i18n("MD5"), IEEE8021x::EAP_MD5);
- cboMethod->insertItem(i18n("PAP"), IEEE8021x::EAP_PAP);
- cboMethod->insertItem(i18n("CHAP"), IEEE8021x::EAP_CHAP);
- cboMethod->insertItem(i18n("MSCHAP"), IEEE8021x::EAP_MSCHAP);
- cboMethod->insertItem(i18n("MSCHAPv2"), IEEE8021x::EAP_MSCHAPV2);
- cboMethod->insertItem(i18n("FAST"), IEEE8021x::EAP_FAST);
- cboMethod->insertItem(i18n("PSK"), IEEE8021x::EAP_PSK);
- cboMethod->insertItem(i18n("PAX"), IEEE8021x::EAP_PAX);
- cboMethod->insertItem(i18n("SAKE"), IEEE8021x::EAP_SAKE);
- cboMethod->insertItem(i18n("GPSK"), IEEE8021x::EAP_GPSK);
- cboMethod->insertItem(i18n("TLS"), IEEE8021x::EAP_TLS);
- cboMethod->insertItem(i18n("PEAP"), IEEE8021x::EAP_PEAP);
- cboMethod->insertItem(i18n("TTLS"), IEEE8021x::EAP_TTLS);
- cboMethod->insertItem(i18n("SIM"), IEEE8021x::EAP_SIM);
- cboMethod->insertItem(i18n("GTC"), IEEE8021x::EAP_GTC);
- cboMethod->insertItem(i18n("OTP"), IEEE8021x::EAP_OTP);
+ int index = 0;
+ cboMethod->insertItem(i18n("None"), index);
+ _eapIndexMap[index] = IEEE8021x::EAP_PHASE1_NONE;
+
+ cboMethod->insertItem(i18n("TTLS"), ++index);
+ _eapIndexMap[index] = IEEE8021x::EAP_PHASE1_TTLS;
+
+ cboMethod->insertItem(i18n("PEAP"), ++index);
+ _eapIndexMap[index] = IEEE8021x::EAP_PHASE1_PEAP;
+
+ cboMethod->insertItem(i18n("TLS"), ++index);
+ _eapIndexMap[index] = IEEE8021x::EAP_PHASE1_TLS;
+
+ cboMethod->insertItem(i18n("Leap"), ++index);
+ _eapIndexMap[index] = IEEE8021x::EAP_PHASE1_LEAP;
+
+ cboMethod->insertItem(i18n("MD5"), ++index);
+ _eapIndexMap[index] = IEEE8021x::EAP_PHASE1_MD5;
+
+ cboMethod->insertItem(i18n("FAST"), ++index);
+ _eapIndexMap[index] = IEEE8021x::EAP_PHASE1_FAST;
+
+ cboMethod->insertItem(i18n("SIM"), ++index);
+ _eapIndexMap[index] = IEEE8021x::EAP_PHASE1_SIM;
+
+ // preselect the correct method
+ QBiDirectionalMap::Iterator it = _eapIndexMap.findData(_security_setting->getEAP());
+ cboMethod->setCurrentItem(it.key());
+
+ txtIdentity->setText(_security_setting->getIdentity());
+ txtAnonIdentity->setText(_security_setting->getAnonIdentity());
+ txtPassword->setText(_security_setting->getPassword());
// get notified if the method changes
connect(cboMethod, SIGNAL(activated(int)), this, SLOT(slotMethodChanged(int)));
@@ -509,8 +524,10 @@
void WirelessSecurityEAPImpl::slotMethodChanged(int index)
{
// new method choosen
- IEEE8021x::EAP eap = (IEEE8021x::EAP) index;
- _security_setting->setEAP((IEEE8021x::EAP_PHASE1)eap);
+ IEEE8021x::EAP_PHASE1 eap = _eapIndexMap[index];
+ _security_setting->setEAP(eap);
+
+ _phase2_widget->setAllowedPhase2Methods(_security_setting->getAllowedPhase2Methods());
}
void WirelessSecurityEAPImpl::slotIdentityChanged(const QString& identity)
@@ -525,17 +542,112 @@
void WirelessSecurityEAPImpl::slotPasswordChanged(const QString& pwd)
{
- _security_setting->setPassword(pwd);
+ _security_setting->setPassword(QString(txtPassword->password()));
}
/*
class WirelessSecurityPhase2Impl
*/
-WirelessSecurityPhase2Impl::WirelessSecurityPhase2Impl(WirelessSecurity* security_setting, QWidget* parent, const char* name, WFlags fl)
+WirelessSecurityPhase2Impl::WirelessSecurityPhase2Impl(IEEE8021x* security_setting, QWidget* parent, const char* name, WFlags fl)
: ConnectionSettingWirelessSecurityPhase2(parent, name, fl)
, _security_setting(security_setting)
{
+ _allowed_methods.append(IEEE8021x::EAP_PHASE2_AUTH_NONE);
+ updateMethodComboBox();
+
+ connect(cboPhase2Method, SIGNAL(activated(int)), this, SLOT(slotPhase2MethodChanged(int)));
+}
+
+void WirelessSecurityPhase2Impl::updateMethodComboBox()
+{
+ // insert all phase2 EAP-Methods
+ int index = 0;
+ cboPhase2Method->clear();
+ _eapIndexMap.clear();
+
+ for (QValueListIEEE8021x::EAP_PHASE2::Iterator it = _allowed_methods.begin(); it != _allowed_methods.end(); ++it)
+ {
+ if ((*it) == IEEE8021x::EAP_PHASE2_AUTH_NONE)
+ {
+ cboPhase2Method->insertItem(i18n("None"), index);
+ _eapIndexMap[index] = IEEE8021x::EAP_PHASE2_AUTH_NONE;
+ index++;
+ }
+ else if ((*it) == IEEE8021x::EAP_PHASE2_AUTH_MSCHAPV2)
+ {
+ cboPhase2Method->insertItem(i18n("MSCHAPv2"), index);
+ _eapIndexMap[index] = IEEE8021x::EAP_PHASE2_AUTH_MSCHAPV2;
+ index++;
+ }
+ else if ((*it) == IEEE8021x::EAP_PHASE2_AUTH_PAP)
+ {
+ cboPhase2Method->insertItem(i18n("PAP"), index);
+ _eapIndexMap[index] = IEEE8021x::EAP_PHASE2_AUTH_PAP;
+ index++;
+ }
+ else if ((*it) == IEEE8021x::EAP_PHASE2_AUTH_CHAP)
+ {
+ cboPhase2Method->insertItem(i18n("CHAP"), index);
+ _eapIndexMap[index] = IEEE8021x::EAP_PHASE2_AUTH_CHAP;
+ index++;
+ }
+ else if ((*it) == IEEE8021x::EAP_PHASE2_AUTH_MSCHAP)
+ {
+ cboPhase2Method->insertItem(i18n("MSCHAP"), index);
+ _eapIndexMap[index] = IEEE8021x::EAP_PHASE2_AUTH_MSCHAP;
+ index++;
+ }
+ else if ((*it) == IEEE8021x::EAP_PHASE2_AUTH_GTC)
+ {
+ cboPhase2Method->insertItem(i18n("GTC"), index);
+ _eapIndexMap[index] = IEEE8021x::EAP_PHASE2_AUTH_GTC;
+ index++;
+ }
+ else if ((*it) == IEEE8021x::EAP_PHASE2_AUTH_OTP)
+ {
+ cboPhase2Method->insertItem(i18n("OTP"), index);
+ _eapIndexMap[index] = IEEE8021x::EAP_PHASE2_AUTH_OTP;
+ index++;
+ }
+ else if ((*it) == IEEE8021x::EAP_PHASE2_AUTH_MD5)
+ {
+ cboPhase2Method->insertItem(i18n("MD5"), index);
+ _eapIndexMap[index] = IEEE8021x::EAP_PHASE2_AUTH_MD5;
+ index++;
+ }
+ else if ((*it) == IEEE8021x::EAP_PHASE2_AUTH_TLS)
+ {
+ cboPhase2Method->insertItem(i18n("TLS"), index);
+ _eapIndexMap[index] = IEEE8021x::EAP_PHASE2_AUTH_TLS;
+ index++;
+ }
+ }
+
+ // preselect the correct method
+ QBiDirectionalMap::Iterator it = _eapIndexMap.findData(_security_setting->getPhase2EAP());
+ if (it != _eapIndexMap.end())
+ {
+ cboPhase2Method->setCurrentItem(it.key());
+ _security_setting->setPhase2EAP(it.data());
+ }
+ else
+ {
+ cboPhase2Method->setCurrentItem(0);
+ _security_setting->setPhase2EAP(_eapIndexMap[0]);
+ }
+}
+
+void WirelessSecurityPhase2Impl::setAllowedPhase2Methods(const QValueListIEEE8021x::EAP_PHASE2& list)
+{
+ _allowed_methods = list;
+ updateMethodComboBox();
+}
+void WirelessSecurityPhase2Impl::slotPhase2MethodChanged(int index)
+{
+ // new method choosen
+ IEEE8021x::EAP_PHASE2 eap = _eapIndexMap[index];
+ _security_setting->setPhase2EAP(eap);
}
/*
@@ -562,9 +674,9 @@
{
// create all security widgets...
QWidget* wep = new WirelessSecurityWEPImpl(_security_setting, _mainWid->groupUseEncryption);
- QWidget* eap = new WirelessSecurityEAPImpl(_ieee8021x_setting, _mainWid->groupUseEncryption);
+ QWidget* phase2 = new WirelessSecurityPhase2Impl(_ieee8021x_setting, _mainWid->groupUseEncryption);
+ QWidget* eap = new WirelessSecurityEAPImpl(_ieee8021x_setting, (WirelessSecurityPhase2Impl*)phase2, _mainWid->groupUseEncryption);
QWidget* wpaversion = new WirelessSecurityWPAVersionImpl(_security_setting, _mainWid->groupUseEncryption);
- QWidget* phase2 = new WirelessSecurityPhase2Impl(_security_setting, _mainWid->groupUseEncryption);
QWidget* wpacipher = new WirelessSecurityWPACipherImpl(_security_setting, _mainWid->groupUseEncryption);
QWidget* wpapsk = new WirelessSecurityWPAPSKImpl(_security_setting, _wireless_setting, _mainWid->groupUseEncryption);
QWidget* wepencryption = new WirelessSecurityWEPEncryptionImpl(_security_setting, _mainWid->groupUseEncryption);
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.7r821121/knetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.h new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.h
--- old/knetworkmanager-0.7r821121/knetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.h 2008-06-16 15:48:24.000000000 +0200
+++ new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.h 2008-07-01 09:37:10.000000000 +0200
@@ -37,6 +37,7 @@
/* knetworkmanager headers */
#include "knetworkmanager-connection_setting.h"
+#include "knetworkmanager-connection_setting_8021x.h"
#include "knetworkmanager-connection_setting_widget_interface.h"
namespace ConnectionSettings
@@ -45,6 +46,7 @@
class WirelessSecurity;
class Wireless;
class IEEE8021x;
+ class WirelessSecurityPhase2Impl;
class WirelessSecurityWEPImpl : public ConnectionSettingWirelessSecurityWEP
{
@@ -149,7 +151,7 @@
{
Q_OBJECT
public:
- WirelessSecurityEAPImpl(IEEE8021x* security_setting, QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
+ WirelessSecurityEAPImpl(IEEE8021x* security_setting, WirelessSecurityPhase2Impl* phase2_widget, QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
public slots:
void slotMethodChanged(int index);
@@ -159,16 +161,24 @@
private:
IEEE8021x* _security_setting;
+ QBiDirectionalMap _eapIndexMap;
+ WirelessSecurityPhase2Impl* _phase2_widget;
};
class WirelessSecurityPhase2Impl : public ConnectionSettingWirelessSecurityPhase2
{
Q_OBJECT
public:
- WirelessSecurityPhase2Impl(WirelessSecurity* security_setting, QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
+ WirelessSecurityPhase2Impl(IEEE8021x* security_setting, QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
+ public slots:
+ void setAllowedPhase2Methods(const QValueListIEEE8021x::EAP_PHASE2&);
+ void slotPhase2MethodChanged(int index);
private:
- WirelessSecurity* _security_setting;
+ void updateMethodComboBox();
+ IEEE8021x* _security_setting;
+ QBiDirectionalMap _eapIndexMap;
+ QValueListIEEE8021x::EAP_PHASE2 _allowed_methods;
};
class WirelessSecurityWidgetImpl : public WidgetInterface
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.7r821121/knetworkmanager/src/knetworkmanager-gsm_connection.cpp new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-gsm_connection.cpp
--- old/knetworkmanager-0.7r821121/knetworkmanager/src/knetworkmanager-gsm_connection.cpp 2008-06-16 15:48:24.000000000 +0200
+++ new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-gsm_connection.cpp 2008-07-01 09:37:10.000000000 +0200
@@ -49,6 +49,12 @@
return dynamic_cast(getSetting(NM_SETTING_SERIAL_SETTING_NAME));
}
+ConnectionSettings::Connection* ConnectionSettings::GSMConnection::duplicate()
+{
+ GSMConnection* conn = new GSMConnection();
+ conn->updateSettings(this);
+ return conn;
+}
#include "knetworkmanager-gsm_connection.moc"
// vim: sw=4 sts=4 noet tw=100
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.7r821121/knetworkmanager/src/knetworkmanager-gsm_connection.h new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-gsm_connection.h
--- old/knetworkmanager-0.7r821121/knetworkmanager/src/knetworkmanager-gsm_connection.h 2008-06-16 15:48:24.000000000 +0200
+++ new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-gsm_connection.h 2008-07-01 09:37:10.000000000 +0200
@@ -41,6 +41,7 @@
~GSMConnection();
GSM* getGSMSetting() const;
Serial* getSerialSetting() const;
+ Connection* duplicate();
};
}; // namespace ConnectionSettings
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.7r821121/knetworkmanager/src/knetworkmanager-tray.cpp new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-tray.cpp
--- old/knetworkmanager-0.7r821121/knetworkmanager/src/knetworkmanager-tray.cpp 2008-06-16 15:48:24.000000000 +0200
+++ new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-tray.cpp 2008-07-01 09:37:10.000000000 +0200
@@ -83,15 +83,12 @@
{
public:
TrayPrivate(QObject* parent)
- : tooltip("")
- , foregroundTrayComponent(0)
+ : foregroundTrayComponent(0)
, signalMapper(parent, "signal_mapper")
, current_idx(0)
{}
~TrayPrivate() {}
- QString tooltip;
-
static Tray* tray;
QValueList trayComponents;
DeviceTrayComponent * foregroundTrayComponent;
@@ -303,8 +300,20 @@
{
// show tooltip
QToolTip::remove (this);
- if (!d->tooltip.isEmpty())
- QToolTip::add (this, d->tooltip);
+ QString tooltip = "";
+
+ // build up the tooltip from all tray components
+ for (QValueList::Iterator it = d->trayComponents.begin(); it != d->trayComponents.end(); ++it)
+ {
+ TrayComponent* comp = *it;
+ if (comp->getToolTipText().isEmpty())
+ continue;
+ if (!tooltip.isEmpty())
+ tooltip += "\n\n";
+ tooltip += comp->getToolTipText().join("\n");
+ }
+ if (!tooltip.isEmpty())
+ QToolTip::add (this, tooltip);
}
void
@@ -576,9 +585,11 @@
{
// stop the old movie to avoid unnecessary wakups
DeviceTrayComponent * dtc = d->foregroundTrayComponent;
+
+ if (movie())
+ movie()->pause();
+
if (dtc) {
- if (movie())
- movie()->pause();
if (!dtc->movieForState(state).isNull())
{
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.7r821121/knetworkmanager/src/knetworkmanager-vpn_connection.cpp new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-vpn_connection.cpp
--- old/knetworkmanager-0.7r821121/knetworkmanager/src/knetworkmanager-vpn_connection.cpp 2008-06-16 15:48:24.000000000 +0200
+++ new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-vpn_connection.cpp 2008-07-01 09:37:10.000000000 +0200
@@ -76,4 +76,12 @@
return dynamic_cast(getSetting(NM_SETTING_VPN_PROPERTIES_SETTING_NAME));
}
+Connection* VPNConnection::duplicate()
+{
+ VPNConnection* conn = new VPNConnection();
+ conn->updateSettings(this);
+ return conn;
+}
+
+
#include "knetworkmanager-vpn_connection.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.7r821121/knetworkmanager/src/knetworkmanager-vpn_connection.h new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-vpn_connection.h
--- old/knetworkmanager-0.7r821121/knetworkmanager/src/knetworkmanager-vpn_connection.h 2008-06-16 15:48:24.000000000 +0200
+++ new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-vpn_connection.h 2008-07-01 09:37:10.000000000 +0200
@@ -48,6 +48,7 @@
VPN* getVPNSetting() const;
VPNProperties* getVPNPropertiesSetting() const;
+ Connection* duplicate();
};
}
#endif /* KNETWORKMANAGER_VPN_CONNECTION_H */
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.7r821121/knetworkmanager/src/knetworkmanager-wired_connection.cpp new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-wired_connection.cpp
--- old/knetworkmanager-0.7r821121/knetworkmanager/src/knetworkmanager-wired_connection.cpp 2008-06-16 15:48:24.000000000 +0200
+++ new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-wired_connection.cpp 2008-07-01 09:37:10.000000000 +0200
@@ -74,4 +74,11 @@
return dynamic_cast(getSetting("ipv4"));
}
+Connection* WiredConnection::duplicate()
+{
+ WiredConnection* conn = new WiredConnection();
+ conn->updateSettings(this);
+ return conn;
+}
+
#include "knetworkmanager-wired_connection.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.7r821121/knetworkmanager/src/knetworkmanager-wired_connection.h new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-wired_connection.h
--- old/knetworkmanager-0.7r821121/knetworkmanager/src/knetworkmanager-wired_connection.h 2008-06-16 15:48:24.000000000 +0200
+++ new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-wired_connection.h 2008-07-01 09:37:10.000000000 +0200
@@ -48,6 +48,7 @@
Wired* getWiredSetting() const;
IPv4* getIPv4Setting() const;
+ Connection* duplicate();
};
}
#endif /* KNETWORKMANAGER_WIRED_CONNECTION_H */
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.7r821121/knetworkmanager/src/knetworkmanager-wireless_connection.cpp new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-wireless_connection.cpp
--- old/knetworkmanager-0.7r821121/knetworkmanager/src/knetworkmanager-wireless_connection.cpp 2008-06-16 15:48:24.000000000 +0200
+++ new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-wireless_connection.cpp 2008-07-01 09:37:10.000000000 +0200
@@ -84,4 +84,11 @@
return dynamic_cast(getSetting(NM_SETTING_IP4_CONFIG_SETTING_NAME));
}
+Connection* WirelessConnection::duplicate()
+{
+ WirelessConnection* conn = new WirelessConnection();
+ conn->updateSettings(this);
+ return conn;
+}
+
#include "knetworkmanager-wireless_connection.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.7r821121/knetworkmanager/src/knetworkmanager-wireless_connection.h new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-wireless_connection.h
--- old/knetworkmanager-0.7r821121/knetworkmanager/src/knetworkmanager-wireless_connection.h 2008-06-16 15:48:24.000000000 +0200
+++ new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-wireless_connection.h 2008-07-01 09:37:10.000000000 +0200
@@ -52,6 +52,7 @@
Wireless* getWirelessSetting() const;
WirelessSecurity* getWirelessSecuritySetting() const;
IPv4* getIPv4Setting() const;
+ Connection* duplicate();
};
}
#endif /* KNETWORKMANAGER_WIRELESS_CONNECTION_H */
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.7r821121/knetworkmanager/src/knetworkmanager-wireless_device_tray.cpp new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-wireless_device_tray.cpp
--- old/knetworkmanager-0.7r821121/knetworkmanager/src/knetworkmanager-wireless_device_tray.cpp 2008-06-16 15:48:24.000000000 +0200
+++ new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-wireless_device_tray.cpp 2008-07-01 09:37:10.000000000 +0200
@@ -22,6 +22,9 @@
*
**************************************************************************/
+// QT includes
+#include
+
// KDE includes
#include
#include
@@ -57,16 +60,16 @@
~WirelessDeviceTrayPrivate() {}
WirelessDevice* dev;
- AccessPoint * activeAccessPoint;
+ QGuardedPtr<AccessPoint> activeAccessPoint;
};
-QString WirelessDeviceTray::getToolTipText()
+QStringList WirelessDeviceTray::getToolTipText()
{
- QString tooltip = DeviceTrayComponent::getToolTipText();
+ QStringList tooltip = DeviceTrayComponent::getToolTipText();
AccessPoint * ap = d->dev->getActiveAccessPoint();
if (ap)
- tooltip += "\n" + i18n("Network: %1").arg(ap->getDisplaySsid());
+ tooltip.append(i18n("Network: %1").arg(ap->getDisplaySsid()));
return tooltip;
}
@@ -265,8 +268,10 @@
WirelessConnection* active_conn = dynamic_cast(nm->getActiveConnection(d->dev));
if (active_conn && d->dev->getState() == NM_DEVICE_STATE_ACTIVATED)
{
- if ( d->activeAccessPoint != d->dev->getActiveAccessPoint()) {
- disconnect( d->activeAccessPoint, SIGNAL(strengthChanged(Q_UINT8)), this, SLOT(apStrengthChanged(Q_UINT8)));
+ if ( d->dev->getActiveAccessPoint() != d->activeAccessPoint) {
+ if (!d->activeAccessPoint.isNull())
+ 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)));
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.7r821121/knetworkmanager/src/knetworkmanager-wireless_device_tray.h new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-wireless_device_tray.h
--- old/knetworkmanager-0.7r821121/knetworkmanager/src/knetworkmanager-wireless_device_tray.h 2008-06-16 15:48:24.000000000 +0200
+++ new/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-wireless_device_tray.h 2008-07-01 09:37:10.000000000 +0200
@@ -56,7 +56,7 @@
/**
* Reimplementation
*/
- QString getToolTipText();
+ QStringList getToolTipText();
public slots:
void slotUpdateDeviceState(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.7r821121/knetworkmanager/src/traycomponent.cpp new/knetworkmanager-0.7r826733/knetworkmanager/src/traycomponent.cpp
--- old/knetworkmanager-0.7r821121/knetworkmanager/src/traycomponent.cpp 2008-06-16 15:48:24.000000000 +0200
+++ new/knetworkmanager-0.7r826733/knetworkmanager/src/traycomponent.cpp 2008-07-01 09:37:10.000000000 +0200
@@ -38,4 +38,9 @@
return m_tray;
}
+QStringList TrayComponent::getToolTipText()
+{
+ return QStringList();
+}
+
#include "traycomponent.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.7r821121/knetworkmanager/src/traycomponent.h new/knetworkmanager-0.7r826733/knetworkmanager/src/traycomponent.h
--- old/knetworkmanager-0.7r821121/knetworkmanager/src/traycomponent.h 2008-06-16 15:48:24.000000000 +0200
+++ new/knetworkmanager-0.7r826733/knetworkmanager/src/traycomponent.h 2008-07-01 09:37:10.000000000 +0200
@@ -39,6 +39,7 @@
virtual ~TrayComponent();
virtual void addMenuItems(KPopupMenu* menu) = 0;
KSystemTray * tray() const;;
+ virtual QStringList getToolTipText();
signals:
void uiUpdated();
private:
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.7r821121/knm_dist.log new/knetworkmanager-0.7r826733/knm_dist.log
--- old/knetworkmanager-0.7r821121/knm_dist.log 2008-06-16 15:48:25.000000000 +0200
+++ new/knetworkmanager-0.7r826733/knm_dist.log 2008-07-01 09:37:10.000000000 +0200
@@ -1,9 +1,9 @@
-svn2dist log on Mo 16. Jun 15:48:24 CEST 2008
-Module: /tmp/knm/svn/knetworkmanager/.; Directory: knetworkmanager-0.7; Name: knetworkmanager; Version 0.7r821121.
--v 0.7r821121 -n knetworkmanager . knetworkmanager-0.7 --no-i18n -m --log=./knm_dist.log
+svn2dist log on Di 1. Jul 09:37:10 CEST 2008
+Module: /tmp/knm/svn/knetworkmanager/.; Directory: knetworkmanager-0.7; Name: knetworkmanager; Version 0.7r826733.
+-v 0.7r826733 -n knetworkmanager . knetworkmanager-0.7 --no-i18n -m --log=./knm_dist.log
--------
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.7r821121/knetworkmanager
-cp -pRL /tmp/knm/svn/knetworkmanager/./admin /tmp/knm/svn/knetworkmanager/./svn2dist-tmp/knetworkmanager-0.7r821121
+cp -R /tmp/knm/svn/knetworkmanager/./knetworkmanager-0.7 /tmp/knm/svn/knetworkmanager/./svn2dist-tmp/knetworkmanager-0.7r826733/knetworkmanager
+cp -pRL /tmp/knm/svn/knetworkmanager/./admin /tmp/knm/svn/knetworkmanager/./svn2dist-tmp/knetworkmanager-0.7r826733
Copying over files from the module directory:
-cp /tmp/knm/svn/knetworkmanager/./knm_dist.log /tmp/knm/svn/knetworkmanager/./svn2dist-tmp/knetworkmanager-0.7r821121
+cp /tmp/knm/svn/knetworkmanager/./knm_dist.log /tmp/knm/svn/knetworkmanager/./svn2dist-tmp/knetworkmanager-0.7r826733
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.7r821121/VERSION new/knetworkmanager-0.7r826733/VERSION
--- old/knetworkmanager-0.7r821121/VERSION 2008-06-16 15:48:25.000000000 +0200
+++ new/knetworkmanager-0.7r826733/VERSION 2008-07-01 09:37:10.000000000 +0200
@@ -1 +1 @@
-knetworkmanager version 0.7r821121
+knetworkmanager version 0.7r826733
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org