Hello community,
here is the log from the commit of package NetworkManager-kde
checked in at Mon Aug 18 18:56:07 CEST 2008.
--------
--- KDE/NetworkManager-kde/NetworkManager-kde.changes 2008-07-17 16:28:36.000000000 +0200
+++ NetworkManager-kde/NetworkManager-kde.changes 2008-08-18 12:51:52.286796000 +0200
@@ -1,0 +2,6 @@
+Mon Aug 18 12:40:28 CEST 2008 - hschaa@suse.de
+
+- Update to r848570
+ * Fix build issues introduced due to NetworkManager API changes
+
+-------------------------------------------------------------------
Old:
----
knetworkmanager-0.7r826733.tar.bz2
New:
----
fix_build.patch
fix_lang.patch
knetworkmanager-0.7r848570.tar.bz2
nm_vpn_routes.patch
revert_nm_vpn_api1.patch
revert_nm_vpn_api2.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-kde.spec ++++++
--- /var/tmp/diff_new_pack.oM6219/_old 2008-08-18 18:55:07.000000000 +0200
+++ /var/tmp/diff_new_pack.oM6219/_new 2008-08-18 18:55:07.000000000 +0200
@@ -1,10 +1,17 @@
#
-# spec file for package NetworkManager-kde (Version 0.7r826733)
+# spec file for package NetworkManager-kde (Version 0.7r848570)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -20,14 +27,19 @@
License: GPL v2 or later
Group: System/GUI/KDE
AutoReqProv: on
-Version: 0.7r826733
-Release: 6
+Version: 0.7r848570
+Release: 1
Summary: KNetworkManager application for use with NetworkManager
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: NetworkManager >= 0.7
Provides: NetworkManager-client
Source0: %{appname}-%{version}.tar.bz2
Source1: knetworkmanager.default.sh
+Patch0: revert_nm_vpn_api2.patch
+Patch1: revert_nm_vpn_api1.patch
+Patch2: nm_vpn_routes.patch
+Patch3: fix_build.patch
+Patch4: fix_lang.patch
%description
KNetworkManager is a system tray applet for controlling network
@@ -96,10 +108,15 @@
%prep
%setup -n %{appname}-%{version} -q
+%patch0 -R -p0
+%patch1 -R -p0
+%patch2 -p0
+%patch3 -p0
+%patch4 -R -p0
%build
. /etc/opt/kde3/common_options
-update_admin
+update_admin --no-unsermake
./configure $configkde --with-distro=suse --with-dbus-sys=%{_sysconfdir}/dbus-1/system.d --with-openvpn --with-vpnc --disable-final
make
@@ -159,6 +176,9 @@
/opt/kde3/share/services/%{appname}_vpnc.desktop
%changelog
+* Mon Aug 18 2008 hschaa@suse.de
+- Update to r848570
+ * Fix build issues introduced due to NetworkManager API changes
* Thu Jul 17 2008 wstephenson@suse.de
- Don't autostart in other desktops
* Tue Jul 01 2008 hschaa@suse.de
++++++ fix_build.patch ++++++
diff -ur knetworkmanager/configure.in.in knetworkmanager-0.7r848570_2//knetworkmanager/configure.in.in
--- knetworkmanager/configure.in.in 2008-08-18 08:19:15.000000000 +0200
+++ knetworkmanager/configure.in.in 2008-08-18 09:27:10.000000000 +0200
@@ -135,5 +135,5 @@
# set include path for knetworkmanager-plugin.h and knetworkmanager-vpnplugin.h when vpn plugins are built together with knetworkmanager
-KNETWORKMANAGER_CFLAGS="-I\$(top_srcdir)/src"
+KNETWORKMANAGER_CFLAGS="-I\$(top_srcdir)/knetworkmanager/src"
AC_SUBST(KNETWORKMANAGER_CFLAGS)
++++++ fix_lang.patch ++++++
Index: knetworkmanager/po/Makefile.am
===================================================================
--- knetworkmanager/po/Makefile.am (Revision 832764)
+++ knetworkmanager/po/Makefile.am (Revision 832765)
@@ -1,3 +1,2 @@
-PACKAGE = knetworkmanager
POFILES = AUTO
++++++ knetworkmanager-0.7r826733.tar.bz2 -> knetworkmanager-0.7r848570.tar.bz2 ++++++
++++ 1945 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.7r826733/.autoconf_trace new/knetworkmanager-0.7r848570/.autoconf_trace
--- old/knetworkmanager-0.7r826733/.autoconf_trace 2008-07-01 09:37:10.000000000 +0200
+++ new/knetworkmanager-0.7r848570/.autoconf_trace 2008-08-18 08:19:15.000000000 +0200
@@ -294,64 +294,57 @@
configure.in:75:AC_SUBST:DOXYGEN_PROJECT_NAME
configure.in:75:AC_SUBST:DOXYGEN_PROJECT_NUMBER
configure.in:75:AC_SUBST:KDE_HAS_DOXYGEN
-configure.in:87:AC_SUBST:LIB_ARTS
-configure.in:90:AC_SUBST:QTDOCDIR
-configure.in:90:AC_SUBST:KDE_HAVE_DOT
-configure.in:90:AC_SUBST:DOXYGEN
-configure.in:90:AC_SUBST:DOXYGEN_PROJECT_NAME
-configure.in:90:AC_SUBST:DOXYGEN_PROJECT_NUMBER
-configure.in:90:AC_SUBST:KDE_HAS_DOXYGEN
-configure.in:104:AC_SUBST:PKG_CONFIG
-configure.in:104:AC_SUBST:HAL_CFLAGS
-configure.in:104:AC_SUBST:HAL_LIBS
-configure.in:111:AC_SUBST:PKG_CONFIG
-configure.in:111:AC_SUBST:LIBNMUTIL_CFLAGS
-configure.in:111:AC_SUBST:LIBNMUTIL_LIBS
-configure.in:118:AC_SUBST:PKG_CONFIG
-configure.in:118:AC_SUBST:LIBNMGLIB_CFLAGS
-configure.in:118:AC_SUBST:LIBNMGLIB_LIBS
-configure.in:125:AC_SUBST:PKG_CONFIG
-configure.in:125:AC_SUBST:LIBNL_CFLAGS
-configure.in:125:AC_SUBST:LIBNL_LIBS
-configure.in:132:AC_SUBST:PKG_CONFIG
-configure.in:132:AC_SUBST:DBUS_QT3_CFLAGS
-configure.in:132:AC_SUBST:DBUS_QT3_LIBS
-configure.in:137:AC_SUBST:DBUSXML2QT3
-configure.in:153:AC_SUBST:DBUS_SYS_DIR
-configure.in:156:AC_SUBST:PACKAGE_CFLAGS
-configure.in:157:AC_SUBST:PACKAGE_LIBS
-configure.in:158:AC_SUBST:LIB_DL
-configure.in:236:AC_SUBST:WITH_OPENVPN_TRUE
-configure.in:236:AC_SUBST:WITH_OPENVPN_FALSE
-configure.in:244:AC_SUBST:WITH_VPNC_TRUE
-configure.in:244:AC_SUBST:WITH_VPNC_FALSE
-configure.in:252:AC_SUBST:WITH_PPTP_TRUE
-configure.in:252:AC_SUBST:WITH_PPTP_FALSE
-configure.in:257:AC_SUBST:KNETWORKMANAGER_CFLAGS
-configure.in:266:AC_SUBST:PKG_CONFIG
-configure.in:266:AC_SUBST:DBUS_QT3_CFLAGS
-configure.in:266:AC_SUBST:DBUS_QT3_LIBS
-configure.in:274:AC_SUBST:OPENVPN_CFLAGS
-configure.in:275:AC_SUBST:OPENVPN_LIBS
-configure.in:284:AC_SUBST:PKG_CONFIG
-configure.in:284:AC_SUBST:DBUS_QT3_CFLAGS
-configure.in:284:AC_SUBST:DBUS_QT3_LIBS
-configure.in:292:AC_SUBST:VPNC_CFLAGS
-configure.in:293:AC_SUBST:VPNC_LIBS
-configure.in:294:AC_SUBST:TOPSUBDIRS
-configure.in:295:AC_SUBST:knetworkmanager_0_7_SUBDIR_included_TRUE
-configure.in:295:AC_SUBST:knetworkmanager_0_7_SUBDIR_included_FALSE
-configure.in:296:AC_CONFIG_FILES:Makefile
-configure.in:297:AC_CONFIG_FILES:knetworkmanager-0.7/Makefile
-configure.in:298:AC_CONFIG_FILES:knetworkmanager-0.7/introspection/Makefile
-configure.in:299:AC_CONFIG_FILES:knetworkmanager-0.7/pics/Makefile
-configure.in:300:AC_CONFIG_FILES:knetworkmanager-0.7/po/Makefile
-configure.in:301:AC_CONFIG_FILES:knetworkmanager-0.7/src/Makefile
-configure.in:302:AC_CONFIG_FILES:knetworkmanager-0.7/src/dbus/Makefile
-configure.in:303:AC_CONFIG_FILES:knetworkmanager-0.7/vpn-plugins/Makefile
-configure.in:304:AC_CONFIG_FILES:knetworkmanager-0.7/vpn-plugins/openvpn/Makefile
-configure.in:305:AC_CONFIG_FILES:knetworkmanager-0.7/vpn-plugins/openvpn/src/Makefile
-configure.in:306:AC_CONFIG_FILES:knetworkmanager-0.7/vpn-plugins/vpnc/Makefile
-configure.in:307:AC_CONFIG_FILES:knetworkmanager-0.7/vpn-plugins/vpnc/src/Makefile
-configure.in:308:AC_SUBST:LIBOBJS:$ac_libobjs
-configure.in:308:AC_SUBST:LTLIBOBJS:$ac_ltlibobjs
+configure.in:94:AC_SUBST:PKG_CONFIG
+configure.in:94:AC_SUBST:HAL_CFLAGS
+configure.in:94:AC_SUBST:HAL_LIBS
+configure.in:101:AC_SUBST:PKG_CONFIG
+configure.in:101:AC_SUBST:LIBNMUTIL_CFLAGS
+configure.in:101:AC_SUBST:LIBNMUTIL_LIBS
+configure.in:108:AC_SUBST:PKG_CONFIG
+configure.in:108:AC_SUBST:LIBNMGLIB_CFLAGS
+configure.in:108:AC_SUBST:LIBNMGLIB_LIBS
+configure.in:115:AC_SUBST:PKG_CONFIG
+configure.in:115:AC_SUBST:LIBNL_CFLAGS
+configure.in:115:AC_SUBST:LIBNL_LIBS
+configure.in:122:AC_SUBST:PKG_CONFIG
+configure.in:122:AC_SUBST:DBUS_QT3_CFLAGS
+configure.in:122:AC_SUBST:DBUS_QT3_LIBS
+configure.in:127:AC_SUBST:DBUSXML2QT3
+configure.in:143:AC_SUBST:DBUS_SYS_DIR
+configure.in:146:AC_SUBST:PACKAGE_CFLAGS
+configure.in:147:AC_SUBST:PACKAGE_LIBS
+configure.in:148:AC_SUBST:LIB_DL
+configure.in:198:AC_SUBST:WITH_OPENVPN_TRUE
+configure.in:198:AC_SUBST:WITH_OPENVPN_FALSE
+configure.in:206:AC_SUBST:WITH_VPNC_TRUE
+configure.in:206:AC_SUBST:WITH_VPNC_FALSE
+configure.in:214:AC_SUBST:WITH_PPTP_TRUE
+configure.in:214:AC_SUBST:WITH_PPTP_FALSE
+configure.in:219:AC_SUBST:KNETWORKMANAGER_CFLAGS
+configure.in:228:AC_SUBST:PKG_CONFIG
+configure.in:228:AC_SUBST:DBUS_QT3_CFLAGS
+configure.in:228:AC_SUBST:DBUS_QT3_LIBS
+configure.in:236:AC_SUBST:OPENVPN_CFLAGS
+configure.in:237:AC_SUBST:OPENVPN_LIBS
+configure.in:246:AC_SUBST:PKG_CONFIG
+configure.in:246:AC_SUBST:DBUS_QT3_CFLAGS
+configure.in:246:AC_SUBST:DBUS_QT3_LIBS
+configure.in:254:AC_SUBST:VPNC_CFLAGS
+configure.in:255:AC_SUBST:VPNC_LIBS
+configure.in:256:AC_SUBST:TOPSUBDIRS
+configure.in:257:AC_SUBST:knetworkmanager_0_7_SUBDIR_included_TRUE
+configure.in:257:AC_SUBST:knetworkmanager_0_7_SUBDIR_included_FALSE
+configure.in:258:AC_CONFIG_FILES:Makefile
+configure.in:259:AC_CONFIG_FILES:knetworkmanager-0.7/Makefile
+configure.in:260:AC_CONFIG_FILES:knetworkmanager-0.7/introspection/Makefile
+configure.in:261:AC_CONFIG_FILES:knetworkmanager-0.7/pics/Makefile
+configure.in:262:AC_CONFIG_FILES:knetworkmanager-0.7/po/Makefile
+configure.in:263:AC_CONFIG_FILES:knetworkmanager-0.7/src/Makefile
+configure.in:264:AC_CONFIG_FILES:knetworkmanager-0.7/src/dbus/Makefile
+configure.in:265:AC_CONFIG_FILES:knetworkmanager-0.7/vpn-plugins/Makefile
+configure.in:266:AC_CONFIG_FILES:knetworkmanager-0.7/vpn-plugins/openvpn/Makefile
+configure.in:267:AC_CONFIG_FILES:knetworkmanager-0.7/vpn-plugins/openvpn/src/Makefile
+configure.in:268:AC_CONFIG_FILES:knetworkmanager-0.7/vpn-plugins/vpnc/Makefile
+configure.in:269:AC_CONFIG_FILES:knetworkmanager-0.7/vpn-plugins/vpnc/src/Makefile
+configure.in:270:AC_SUBST:LIBOBJS:$ac_libobjs
+configure.in:270:AC_SUBST:LTLIBOBJS:$ac_ltlibobjs
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.7r826733/config.h.in new/knetworkmanager-0.7r848570/config.h.in
--- old/knetworkmanager-0.7r826733/config.h.in 2008-07-01 09:37:29.000000000 +0200
+++ new/knetworkmanager-0.7r848570/config.h.in 2008-08-18 08:19:33.000000000 +0200
@@ -21,9 +21,6 @@
/* Define to 1 if you have the header file. */
#undef HAVE_INTTYPES_H
-/* Enable Leap support */
-#undef HAVE_LEAP
-
/* Define if you have libjpeg */
#undef HAVE_LIBJPEG
@@ -42,9 +39,6 @@
/* Define if your system needs _NSGetEnviron to set up the environment */
#undef HAVE_NSGETENVIRON
-/* Enable phase2 authentication */
-#undef HAVE_PHASE2_AUTH
-
/* Define if you have res_init */
#undef HAVE_RES_INIT
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.7r826733/configure.in new/knetworkmanager-0.7r848570/configure.in
--- old/knetworkmanager-0.7r826733/configure.in 2008-07-01 09:37:11.000000000 +0200
+++ new/knetworkmanager-0.7r848570/configure.in 2008-08-18 08:19:17.000000000 +0200
@@ -40,7 +40,7 @@
AC_ARG_PROGRAM
dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(knetworkmanager, 0.7r826733) dnl searches for some needed programs
+AM_INIT_AUTOMAKE(knetworkmanager, 0.7r848570) dnl searches for some needed programs
KDE_SET_PREFIX
@@ -81,14 +81,7 @@
#MIN_CONFIG(3.2)
CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
-if test "$build_arts" = "yes"; then
- AC_DEFINE(USE_ARTS, 1, [If we use arts volume])
- LIB_ARTS="-lartskde"
- AC_SUBST(LIB_ARTS)
-fi
-
-KDE_INIT_DOXYGEN([KEG Network API Reference], [Version $VERSION])
-dnl dnl PACKAGE set before
+dnl PACKAGE set before
AC_C_BIGENDIAN
AC_CHECK_KDEMAXPATHLEN
@@ -97,9 +90,6 @@
AC_DEFINE_UNQUOTED(KNETWORKMANAGER_VERSION, $KNETWORKMANAGER_VERSION, [KNetworkManager Version])
AC_DEFINE_UNQUOTED(KNETWORKMANAGER_VERSION_STRING, "$KNETWORKMANAGER_VERSION", [KNetworkManager Version String])
-# test if variables are already set
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-
# check for dbus, hal, libnm-util and libnl
PKG_CHECK_MODULES(HAL, [hal], [], [
AC_MSG_RESULT([no])
@@ -157,34 +147,6 @@
AC_SUBST(PACKAGE_LIBS)
AC_SUBST(LIB_DL)
-# Check for D-Bus Qt3 bindings
-
-safe_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $PACKAGE_CFLAGS $all_includes"
-safe_LIBS=$LIBS
-LIBS="$PACKAGE_LIBS"
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-
-AC_MSG_CHECKING([for phase2 authentication support in NetworkManager])
-AC_TRY_COMPILE([#include ]
-, [#ifdef NM_PHASE2_AUTH_NONE
- int ok;
- #else
- choke me
- #endif]
-, [AC_MSG_RESULT([yes])
- AC_DEFINE([HAVE_PHASE2_AUTH], [], [Enable phase2 authentication])
-]
-, [AC_MSG_RESULT([no])])
-
-
-AC_CHECK_FUNC([nmu_security_serialize_leap_with_cipher], [AC_DEFINE([HAVE_LEAP], [], [Enable Leap support])])
-
-CPPFLAGS=$safe_CPPFLAGS
-LIBS=$safe_LIBS
-AC_LANG_RESTORE
-
AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: suse, gentoo, fedora]))
if test "x$with_distro" = "x"; then
AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
@@ -253,7 +215,7 @@
# set include path for knetworkmanager-plugin.h and knetworkmanager-vpnplugin.h when vpn plugins are built together with knetworkmanager
-KNETWORKMANAGER_CFLAGS="-I\$(top_srcdir)/knetworkmanager/src"
+KNETWORKMANAGER_CFLAGS="-I\$(top_srcdir)/src"
AC_SUBST(KNETWORKMANAGER_CFLAGS)
dnl =======================================================
dnl FILE: ./knetworkmanager/vpn-plugins/openvpn/configure.in.in
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.7r826733/knetworkmanager/configure.in.in new/knetworkmanager-0.7r848570/knetworkmanager/configure.in.in
--- old/knetworkmanager-0.7r826733/knetworkmanager/configure.in.in 2008-07-01 09:37:10.000000000 +0200
+++ new/knetworkmanager-0.7r848570/knetworkmanager/configure.in.in 2008-08-18 08:19:15.000000000 +0200
@@ -1,14 +1,7 @@
#MIN_CONFIG(3.2)
CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
-if test "$build_arts" = "yes"; then
- AC_DEFINE(USE_ARTS, 1, [If we use arts volume])
- LIB_ARTS="-lartskde"
- AC_SUBST(LIB_ARTS)
-fi
-
-KDE_INIT_DOXYGEN([KEG Network API Reference], [Version $VERSION])
-dnl AM_INIT_AUTOMAKE(knetworkmanager, 0.7, thoenig@suse.de)
+AM_INIT_AUTOMAKE(knetworkmanager, 0.7, thoenig@suse.de)
AC_C_BIGENDIAN
AC_CHECK_KDEMAXPATHLEN
@@ -17,9 +10,6 @@
AC_DEFINE_UNQUOTED(KNETWORKMANAGER_VERSION, $KNETWORKMANAGER_VERSION, [KNetworkManager Version])
AC_DEFINE_UNQUOTED(KNETWORKMANAGER_VERSION_STRING, "$KNETWORKMANAGER_VERSION", [KNetworkManager Version String])
-# test if variables are already set
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-
# check for dbus, hal, libnm-util and libnl
PKG_CHECK_MODULES(HAL, [hal], [], [
AC_MSG_RESULT([no])
@@ -77,34 +67,6 @@
AC_SUBST(PACKAGE_LIBS)
AC_SUBST(LIB_DL)
-# Check for D-Bus Qt3 bindings
-
-safe_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $PACKAGE_CFLAGS $all_includes"
-safe_LIBS=$LIBS
-LIBS="$PACKAGE_LIBS"
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-
-AC_MSG_CHECKING([for phase2 authentication support in NetworkManager])
-AC_TRY_COMPILE([#include ]
-, [#ifdef NM_PHASE2_AUTH_NONE
- int ok;
- #else
- choke me
- #endif]
-, [AC_MSG_RESULT([yes])
- AC_DEFINE([HAVE_PHASE2_AUTH], [], [Enable phase2 authentication])
-]
-, [AC_MSG_RESULT([no])])
-
-
-AC_CHECK_FUNC([nmu_security_serialize_leap_with_cipher], [AC_DEFINE([HAVE_LEAP], [], [Enable Leap support])])
-
-CPPFLAGS=$safe_CPPFLAGS
-LIBS=$safe_LIBS
-AC_LANG_RESTORE
-
AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: suse, gentoo, fedora]))
if test "x$with_distro" = "x"; then
AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
@@ -173,5 +135,5 @@
# set include path for knetworkmanager-plugin.h and knetworkmanager-vpnplugin.h when vpn plugins are built together with knetworkmanager
-KNETWORKMANAGER_CFLAGS="-I\$(top_srcdir)/knetworkmanager/src"
+KNETWORKMANAGER_CFLAGS="-I\$(top_srcdir)/src"
AC_SUBST(KNETWORKMANAGER_CFLAGS)
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.7r826733/knetworkmanager/introspection/Makefile.am new/knetworkmanager-0.7r848570/knetworkmanager/introspection/Makefile.am
--- old/knetworkmanager-0.7r826733/knetworkmanager/introspection/Makefile.am 2008-07-01 09:37:10.000000000 +0200
+++ new/knetworkmanager-0.7r848570/knetworkmanager/introspection/Makefile.am 2008-08-18 08:19:15.000000000 +0200
@@ -1,13 +1,17 @@
EXTRA_DIST = \
nm-access-point.xml \
- nm-device-802-11-wireless.xml \
- nm-device-802-3-ethernet.xml \
+ nm-active-connection.xml \
+ nm-device-802-11-wireless.xml \
+ nm-device-802-3-ethernet.xml \
+ nm-device-cdma.xml \
+ nm-device-gsm.xml \
nm-device.xml \
+ nm-exported-connection.xml \
nm-ip4-config.xml \
nm-manager.xml \
nm-manager-client.xml \
+ nm-ppp-manager.xml \
nm-settings.xml \
- nm-settings-connection.xml \
nm-vpn-manager.xml \
nm-vpn-plugin.xml \
nm-vpn-connection.xml
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.7r826733/knetworkmanager/Makefile.am.in new/knetworkmanager-0.7r848570/knetworkmanager/Makefile.am.in
--- old/knetworkmanager-0.7r826733/knetworkmanager/Makefile.am.in 2008-07-01 09:37:10.000000000 +0200
+++ new/knetworkmanager-0.7r848570/knetworkmanager/Makefile.am.in 2008-08-18 08:19:15.000000000 +0200
@@ -6,5 +6,5 @@
dbusservicedir = $(DBUS_SYS_DIR)
dbusservice_DATA = knetworkmanager.conf
-EXTRA_DIST = COPYING configure.in.in $(dbusservice_DATA)
+EXTRA_DIST = COPYING configure.in.in admin $(dbusservice_DATA)
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.7r826733/knetworkmanager/po/Makefile.am new/knetworkmanager-0.7r848570/knetworkmanager/po/Makefile.am
--- old/knetworkmanager-0.7r826733/knetworkmanager/po/Makefile.am 2008-07-01 09:37:10.000000000 +0200
+++ new/knetworkmanager-0.7r848570/knetworkmanager/po/Makefile.am 2008-08-18 08:19:15.000000000 +0200
@@ -1,3 +1,2 @@
-PACKAGE = knetworkmanager
POFILES = AUTO
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.7r826733/knetworkmanager/src/dbus/Makefile.am new/knetworkmanager-0.7r848570/knetworkmanager/src/dbus/Makefile.am
--- old/knetworkmanager-0.7r826733/knetworkmanager/src/dbus/Makefile.am 2008-07-01 09:37:10.000000000 +0200
+++ new/knetworkmanager-0.7r848570/knetworkmanager/src/dbus/Makefile.am 2008-08-18 08:19:15.000000000 +0200
@@ -1,7 +1,6 @@
INCLUDES = $(DBUS_QT3_CFLAGS) $(QT_INCLUDES)
INTROSPECTIONPATH = $(srcdir)/../../introspection/
-DBUSXML2QT3 = dbusxml2qt3
MOCHEADERS = accesspointproxy.h deviceproxy.h networkmanagerproxy.h \
wiredproxy.h wirelessproxy.h activeconnectionproxy.h gsmproxy.h cdmaproxy.h
@@ -59,32 +58,8 @@
CLEANFILES = $(DBUSPROXY) $(DBUSPROXYHEADERS) $(MOCSUBS)
-activeconnectionproxy.moc: activeconnectionproxy.h
- $(MOC) activeconnectionproxy.h -o activeconnectionproxy.moc
-
-accesspointproxy.moc: accesspointproxy.h
- $(MOC) accesspointproxy.h -o accesspointproxy.moc
-
-deviceproxy.moc: deviceproxy.h
- $(MOC) deviceproxy.h -o deviceproxy.moc
-
-#ip4configproxy.moc: ip4configproxy.h
-# $(MOC) ip4configproxy.h -o ip4configproxy.moc
-
-networkmanagerproxy.moc: networkmanagerproxy.h
- $(MOC) networkmanagerproxy.h -o networkmanagerproxy.moc
-
-wiredproxy.moc: wiredproxy.h
- $(MOC) wiredproxy.h -o wiredproxy.moc
-
-wirelessproxy.moc: wirelessproxy.h
- $(MOC) wirelessproxy.h -o wirelessproxy.moc
-
-gsmproxy.moc: gsmproxy.h
- $(MOC) gsmproxy.h -o gsmproxy.moc
-
-cdmaproxy.moc: cdmaproxy.h
- $(MOC) cdmaproxy.h -o cdmaproxy.moc
+.h.moc:
+ $(MOC) $< -o $@
mocfiles.cpp: $(MOCSUBS)
cat $(MOCSUBS) > mocfiles.cpp
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.7r826733/knetworkmanager/src/knetworkmanager-connection_setting_ipv4.cpp new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-connection_setting_ipv4.cpp
--- old/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-connection_setting_ipv4.cpp 2008-07-01 09:37:10.000000000 +0200
+++ new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-connection_setting_ipv4.cpp 2008-08-18 08:19:15.000000000 +0200
@@ -61,6 +61,8 @@
: ConnectionSetting(conn, NM_SETTING_IP4_CONFIG_SETTING_NAME)
{
_method = METHOD_DHCP;
+ _ignore_auto_dns = false;
+ _ignore_auto_routes = false;
}
QValueList<IPv4Address> IPv4::getAddresses() const
@@ -109,6 +111,32 @@
return _method;
}
+void
+IPv4::setIgnoreAutoDNS(bool ignore)
+{
+ _ignore_auto_dns = ignore;
+ emitValidityChanged();
+}
+
+bool
+IPv4::getIgnoreAutoDNS() const
+{
+ return _ignore_auto_dns;
+}
+
+void
+IPv4::setIgnoreAutoRoutes(bool ignore)
+{
+ _ignore_auto_routes = ignore;
+ emitValidityChanged();
+}
+
+bool
+IPv4::getIgnoreAutoRoutes() const
+{
+ return _ignore_auto_routes;
+}
+
bool
IPv4::isValid() const
{
@@ -149,9 +177,11 @@
SettingsMap map;
if (_method == METHOD_DHCP)
- map.insert(NM_SETTING_IP4_CONFIG_METHOD, QDBusData::fromString(NM_SETTING_IP4_CONFIG_METHOD_DHCP));
+ map.insert(NM_SETTING_IP4_CONFIG_METHOD, QDBusData::fromString(NM_SETTING_IP4_CONFIG_METHOD_AUTO));
else if (_method == METHOD_AUTOIP)
- map.insert(NM_SETTING_IP4_CONFIG_METHOD, QDBusData::fromString(NM_SETTING_IP4_CONFIG_METHOD_AUTOIP));
+ map.insert(NM_SETTING_IP4_CONFIG_METHOD, QDBusData::fromString(NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL));
+ else if (_method == METHOD_SHARED)
+ map.insert(NM_SETTING_IP4_CONFIG_METHOD, QDBusData::fromString(NM_SETTING_IP4_CONFIG_METHOD_SHARED));
else if (_method == METHOD_MANUAL)
{
map.insert(NM_SETTING_IP4_CONFIG_METHOD, QDBusData::fromString(NM_SETTING_IP4_CONFIG_METHOD_MANUAL));
@@ -195,6 +225,8 @@
map.insert(NM_SETTING_IP4_CONFIG_ADDRESSES, QDBusData::fromQValueList(ips));
}
}
+ map.insert(NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES, QDBusData::fromBool(_ignore_auto_routes));
+ map.insert(NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS, QDBusData::fromBool(_ignore_auto_dns));
return map;
}
@@ -205,10 +237,12 @@
if ((it = map.find(NM_SETTING_IP4_CONFIG_METHOD)) != map.end())
{
- if (it.data().toString() == NM_SETTING_IP4_CONFIG_METHOD_DHCP)
+ if (it.data().toString() == NM_SETTING_IP4_CONFIG_METHOD_AUTO || it.data().toString() == "dhcp")
_method = METHOD_DHCP;
- else if (it.data().toString() == NM_SETTING_IP4_CONFIG_METHOD_AUTOIP)
+ else if (it.data().toString() == NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL || it.data().toString() == "autoip")
_method = METHOD_AUTOIP;
+ else if (it.data().toString() == NM_SETTING_IP4_CONFIG_METHOD_SHARED)
+ _method = METHOD_SHARED;
else if (it.data().toString() == NM_SETTING_IP4_CONFIG_METHOD_MANUAL)
_method = METHOD_MANUAL;
}
@@ -251,4 +285,9 @@
}
}
+ if ((it = map.find(NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES)) != map.end())
+ _ignore_auto_routes = it.data().toBool();
+
+ if ((it = map.find(NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS)) != map.end())
+ _ignore_auto_dns = it.data().toBool();
}
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.7r826733/knetworkmanager/src/knetworkmanager-connection_setting_ipv4.h new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-connection_setting_ipv4.h
--- old/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-connection_setting_ipv4.h 2008-07-01 09:37:10.000000000 +0200
+++ new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-connection_setting_ipv4.h 2008-08-18 08:19:15.000000000 +0200
@@ -58,8 +58,11 @@
enum IPV4METHOD
{
METHOD_DHCP = 1
+ , METHOD_AUTO = METHOD_DHCP // DHCP is obsolete now
, METHOD_AUTOIP
+ , METHOD_LINK_LOCAL = METHOD_AUTOIP // AUTOIP is obsolete now
, METHOD_MANUAL
+ , METHOD_SHARED
};
IPv4(Connection* conn);
@@ -82,6 +85,12 @@
void setMethod(IPV4METHOD);
IPV4METHOD getMethod() const;
+ void setIgnoreAutoDNS(bool);
+ bool getIgnoreAutoDNS() const;
+
+ void setIgnoreAutoRoutes(bool);
+ bool getIgnoreAutoRoutes() const;
+
bool isValid() const;
bool useSetting();
@@ -91,6 +100,10 @@
QStringList _dns_search;
QValueList<IPv4Address> _addresses;
IPV4METHOD _method;
+ bool _ignore_auto_dns;
+ bool _ignore_auto_routes;
+
+ // TODO routes, dhcp-client-id, dhcp-hostname
};
}
#endif /* KNETWORKMANAGER_CONNECTION_SETTING_IPV4_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.7r826733/knetworkmanager/src/knetworkmanager-connection_setting_vpn.cpp new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-connection_setting_vpn.cpp
--- old/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-connection_setting_vpn.cpp 2008-07-01 09:37:10.000000000 +0200
+++ new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-connection_setting_vpn.cpp 2008-08-18 08:19:15.000000000 +0200
@@ -82,6 +82,29 @@
emitValidityChanged();
}
+void VPN::setData(QMap data)
+{
+ _data = data;
+ emitValidityChanged();
+}
+
+QMap VPN::getData() const
+{
+ return _data;
+}
+
+void VPN::setSecrets(const QMap& data)
+{
+ _secrets = data;
+ emitValidityChanged();
+}
+
+QMap VPN::getSecrets() const
+{
+ return _secrets;
+}
+
+
SettingsMap
VPN::toMap() const
{
@@ -99,6 +122,18 @@
}
map.insert(NM_SETTING_VPN_ROUTES, QDBusData::fromQValueList(list));
}
+
+ // NM expects a String/String map -> convert
+ QDBusDataMap<QString> data;
+
+ for (QMap::ConstIterator it = _data.begin(); it != _data.end(); ++it)
+ {
+ data.insert(it.key(), QDBusData::fromString(it.data()));
+ }
+
+ map.insert(NM_SETTING_VPN_DATA, QDBusData::fromStringKeyMap(data));
+
+
return map;
}
@@ -123,6 +158,48 @@
}
}
+ QDBusDataMap<QString> data;
+ _data.clear();
+
+ if ((it = map.find(NM_SETTING_VPN_DATA)) != map.end())
+ {
+ data = it.data().toStringKeyMap();
+ for (QMap::ConstIterator it = data.begin(); it != data.end(); ++it)
+ {
+ _data.insert(it.key(), it.data().toString());
+ }
+ }
+}
+
+SettingsMap
+VPN::toSecretsMap(bool with_settings) const
+{
+ SettingsMap map;
+
+ // NM does not want the settings too
+/* if (with_settings)
+ map = toMap();*/
+
+ // copy all secrets into the map
+ for (QMap::ConstIterator it = _secrets.begin(); it != _secrets.end(); ++it)
+ map.insert(it.key(), QDBusData::fromString(it.data()));
+
+ return map;
+}
+
+bool
+VPN::fromSecretsMap(const SettingsMap& map)
+{
+/* SettingsMap::ConstIterator it;
+ QDBusDataMap<QString> data;
+
+ if ((it = map.find(NM_SETTING_VPN_DATA)) != map.end())
+ {
+ data = it.data().toStringKeyMap();
+ _data = data.toQMap();
+ }*/
+ // FIXME
+ return false;
}
bool
@@ -132,5 +209,9 @@
if (_userName.isEmpty() || _serviceType.isEmpty())
return false;
+ // data is essential
+ if (_data.isEmpty())
+ return false;
+
return true;
}
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.7r826733/knetworkmanager/src/knetworkmanager-connection_setting_vpn.h new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-connection_setting_vpn.h
--- old/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-connection_setting_vpn.h 2008-07-01 09:37:10.000000000 +0200
+++ new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-connection_setting_vpn.h 2008-08-18 08:19:15.000000000 +0200
@@ -50,6 +50,9 @@
SettingsMap toMap() const;
void fromMap(const SettingsMap&);
+ SettingsMap toSecretsMap(bool with_settings = true) const;
+ bool fromSecretsMap(const SettingsMap&);
+
QString getUserName() const;
void setUserName(const QString&);
@@ -59,12 +62,21 @@
QValueList<QString> getRoutes() const;
void setRoutes(const QValueList<QString>&);
+ QMap getData() const;
+ void setData(QMap data);
+
+ // Ugh, that is ugly
+ QMap getSecrets() const;
+ void setSecrets(const QMap& secrets);
+
bool isValid() const;
private:
QString _userName;
QString _serviceType;
QValueList<QString> _routes;
+ QMap _data;
+ QMap _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.7r826733/knetworkmanager/src/knetworkmanager-connection_setting_vpn_properties.cpp new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-connection_setting_vpn_properties.cpp
--- old/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-connection_setting_vpn_properties.cpp 2008-07-01 09:37:10.000000000 +0200
+++ new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-connection_setting_vpn_properties.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,156 +0,0 @@
-/***************************************************************************
- *
- * knetworkmanager-connection_setting_vpn.cpp - A NetworkManager frontend for KDE
- *
- * Copyright (C) 2005, 2006 Novell, Inc.
- *
- * Author: Helmut Schaa ,
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- **************************************************************************/
-
-/* qt headers */
-#include
-#include
-
-/* kde headers */
-#include
-#include
-
-/* QDBus headers*/
-#include
-#include
-#include
-
-/* knetworkmanager headers */
-#include "knetworkmanager.h"
-#include "knetworkmanager-connection_setting_vpn_properties.h"
-
-
-using namespace ConnectionSettings;
-
-/*
- class VPNProperties
-*/
-VPNProperties::VPNProperties(Connection* conn)
- : ConnectionSetting(conn, NM_SETTING_VPN_PROPERTIES_SETTING_NAME)
-{
-
-}
-
-void VPNProperties::setData(QMap data)
-{
- _data = data;
- emitValidityChanged();
-}
-
-QMap VPNProperties::getData() const
-{
- return _data;
-}
-
-void VPNProperties::setSecrets(const QMap& data)
-{
- _secrets = data;
- emitValidityChanged();
-}
-
-QMap VPNProperties::getSecrets() const
-{
- return _secrets;
-}
-
-
-SettingsMap
-VPNProperties::toMap() const
-{
- SettingsMap map;
-
- // NM expects a String/Variant map -> convert
- QDBusDataMap<QString> data;
-
- for (QMap::ConstIterator it = _data.begin(); it != _data.end(); ++it)
- {
- QDBusVariant variant;
- variant.value = it.data();
- variant.signature = it.data().buildDBusSignature();
- data.insert(it.key(), QDBusData::fromVariant(variant));
- }
-
- map.insert(NM_SETTING_VPN_PROPERTIES_DATA, QDBusData::fromStringKeyMap(data));
-
- return map;
-}
-
-void
-VPNProperties::fromMap(const SettingsMap& map)
-{
- SettingsMap::ConstIterator it;
- QDBusDataMap<QString> data;
- _data.clear();
-
- if ((it = map.find(NM_SETTING_VPN_PROPERTIES_DATA)) != map.end())
- {
- data = it.data().toStringKeyMap();
- for (QMap::ConstIterator it = data.begin(); it != data.end(); ++it)
- {
- QDBusVariant variant = it.data().toVariant();
- _data.insert(it.key(), variant.value);
- }
- }
-}
-
-SettingsMap
-VPNProperties::toSecretsMap(bool with_settings) const
-{
- SettingsMap map;
-
- // NM does not want the settings too
-/* if (with_settings)
- map = toMap();*/
-
- // copy all secrets into the map
- for (QMap::ConstIterator it = _secrets.begin(); it != _secrets.end(); ++it)
- map.insert(it.key(), it.data());
-
- return map;
-}
-
-bool
-VPNProperties::fromSecretsMap(const SettingsMap& map)
-{
-/* SettingsMap::ConstIterator it;
- QDBusDataMap<QString> data;
-
- if ((it = map.find(NM_SETTING_VPN_PROPERTIES_DATA)) != map.end())
- {
- data = it.data().toStringKeyMap();
- _data = data.toQMap();
- }*/
- // FIXME
- return false;
-}
-
-
-bool
-VPNProperties::isValid() const
-{
- // data is essential
- if (_data.isEmpty())
- return false;
-
- return true;
-}
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.7r826733/knetworkmanager/src/knetworkmanager-connection_setting_vpn_properties.h new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-connection_setting_vpn_properties.h
--- old/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-connection_setting_vpn_properties.h 2008-07-01 09:37:10.000000000 +0200
+++ new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-connection_setting_vpn_properties.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,71 +0,0 @@
-/***************************************************************************
- *
- * knetworkmanager-connection_setting_vpn_properties.h - A NetworkManager frontend for KDE
- *
- * Copyright (C) 2005, 2006 Novell, Inc.
- *
- * Author: Helmut Schaa ,
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- **************************************************************************/
-
-#ifndef KNETWORKMANAGER_CONNECTION_SETTING_VPN_PROPERTIES_H
-#define KNETWORKMANAGER_CONNECTION_SETTING_VPN_PROPERTIES_H
-
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include "knetworkmanager-connection_setting.h"
-
-/* NM headers */
-#include
-
-namespace ConnectionSettings
-{
-
-// info setting
-class VPNProperties : public ConnectionSetting
-{
- public:
- VPNProperties(Connection* conn);
-
- SettingsMap toMap() const;
- void fromMap(const SettingsMap&);
-
- SettingsMap toSecretsMap(bool with_settings = true) const;
- bool fromSecretsMap(const SettingsMap&);
-
- bool isValid() const;
-
- QMap getData() const;
- void setData(QMap data);
-
- // Ugh, that is ugly
- QMap getSecrets() const;
- void setSecrets(const QMap& secrets);
-
- private:
- QMap _data;
- QMap _secrets;
-};
-
-}
-#endif /* KNETWORKMANAGER_CONNECTION_SETTING_VPN_PROPERTIES_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.7r826733/knetworkmanager/src/knetworkmanager-connection_setting_vpn_widget.cpp new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-connection_setting_vpn_widget.cpp
--- old/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-connection_setting_vpn_widget.cpp 2008-07-01 09:37:10.000000000 +0200
+++ new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-connection_setting_vpn_widget.cpp 2008-08-18 08:19:15.000000000 +0200
@@ -36,7 +36,6 @@
// knm headers
#include "knetworkmanager-connection.h"
#include "knetworkmanager-connection_setting_vpn.h"
-#include "knetworkmanager-connection_setting_vpn_properties.h"
#include "knetworkmanager-connection_setting_vpn_widget.h"
#include "knetworkmanager-device.h"
#include "knetworkmanager-vpnmanager.h"
@@ -49,7 +48,6 @@
, _new_conn(new_conn)
{
_vpnsetting = dynamic_castConnectionSettings::VPN* (conn->getSetting(NM_SETTING_VPN_SETTING_NAME));
- _vpnprop = dynamic_castConnectionSettings::VPNProperties* (conn->getSetting(NM_SETTING_VPN_PROPERTIES_SETTING_NAME));
QVBoxLayout* layout = new QVBoxLayout(this, 1, 1);
_mainWid = new ConnectionSettingVPNWidget(this);
@@ -157,7 +155,7 @@
VPNConfigWidget* config = getVPNConfigWidget(service);
_mainWid->widgetStack->raiseWidget(config);
- config->setVPNData(_vpnsetting->getRoutes(), _vpnprop->getData());
+ config->setVPNData(_vpnsetting->getRoutes(), _vpnsetting->getData());
}
}
else
@@ -180,7 +178,7 @@
if (config)
{
// update the vpn properties
- _vpnprop->setData(config->getVPNProperties());
+ _vpnsetting->setData(config->getVPNProperties());
}
}
}
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.7r826733/knetworkmanager/src/knetworkmanager-connection_setting_vpn_widget.h new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-connection_setting_vpn_widget.h
--- old/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-connection_setting_vpn_widget.h 2008-07-01 09:37:10.000000000 +0200
+++ new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-connection_setting_vpn_widget.h 2008-08-18 08:19:15.000000000 +0200
@@ -41,7 +41,6 @@
namespace ConnectionSettings
{
-class VPNProperties;
class Connection;
class VPNWidgetImpl : public WidgetInterface
@@ -60,7 +59,6 @@
bool _new_conn;
VPN* _vpnsetting;
- VPNProperties* _vpnprop;
ConnectionSettingVPNWidget* _mainWid;
QMap _mapServiceCombo;
QMap _mapServiceWidget;
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.7r826733/knetworkmanager/src/knetworkmanager-nm_proxy.cpp new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-nm_proxy.cpp
--- old/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-nm_proxy.cpp 2008-07-01 09:37:10.000000000 +0200
+++ new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-nm_proxy.cpp 2008-08-18 08:19:15.000000000 +0200
@@ -166,6 +166,7 @@
QValueList > map;
ConnectionStore* cstore = ConnectionStore::getInstance();
DeviceStore* dstore = DeviceStore::getInstance();
+ bool found = false;
if (!dstore || !cstore)
return map;
@@ -186,12 +187,23 @@
QDBusObjectPath conn = act_conn->getConnection(err);
QDBusObjectPath specific_obj = act_conn->getSpecificObject(err);
QValueList<QDBusObjectPath> devs = act_conn->getDevices(err);
+ found = false;
for (QValueList<QDBusObjectPath>::Iterator it2 = devs.begin(); it2 != devs.end(); ++it2)
{
Device* device = dstore->getDevice(*it2);
ConnectionSettings::Connection* connection = cstore->getConnection(QString(conn));
if (connection)
+ {
map.append(QPair(connection, device));
+ found = true;
+ }
+ }
+ if (!found)
+ {
+ // no device found for this connection -> just add it without device
+ ConnectionSettings::Connection* connection = cstore->getConnection(QString(conn));
+ if (connection)
+ map.append(QPair(connection, NULL));
}
delete act_conn;
}
@@ -226,17 +238,24 @@
{
if (act_conn->getConnection(err) == conn->getObjectPath())
{
- // get details about the active connection
- QValueList<QDBusObjectPath> devs = act_conn->getDevices(err);
- for (QValueList<QDBusObjectPath>::Iterator it2 = devs.begin(); it2 != devs.end(); ++it2)
+ if (dev)
{
- if (QString(*it2) == dev->getObjectPath())
+ // get details about the active connection
+ QValueList<QDBusObjectPath> devs = act_conn->getDevices(err);
+ for (QValueList<QDBusObjectPath>::Iterator it2 = devs.begin(); it2 != devs.end(); ++it2)
{
- // this is the right one
- DeactivateConnection(*it, err);
- return;
+ if (QString(*it2) == dev->getObjectPath())
+ {
+ // this is the right one
+ DeactivateConnection(*it, err);
+ return;
+ }
}
}
+ else
+ {
+ DeactivateConnection(*it, err);
+ }
}
delete act_conn;
}
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.7r826733/knetworkmanager/src/knetworkmanager-storage.cpp new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-storage.cpp
--- old/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-storage.cpp 2008-07-01 09:37:10.000000000 +0200
+++ new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-storage.cpp 2008-08-18 08:19:15.000000000 +0200
@@ -214,7 +214,7 @@
}
// restore all appropriate secrets
- QStringList secrets= grp.readListEntry("Secrets");
+ QStringList secrets = grp.readListEntry("Secrets");
for (QStringList::ConstIterator it = secrets.begin(); it != secrets.end(); ++it)
{
@@ -558,7 +558,7 @@
}
// delete all associated secrets
- QStringList secrets= grp.readListEntry("Secrets");
+ QStringList secrets = grp.readListEntry("Secrets");
for (QStringList::ConstIterator it = secrets.begin(); it != secrets.end(); ++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.7r826733/knetworkmanager/src/knetworkmanager-tray.cpp new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-tray.cpp
--- old/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-tray.cpp 2008-07-01 09:37:10.000000000 +0200
+++ new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-tray.cpp 2008-08-18 08:19:15.000000000 +0200
@@ -215,7 +215,7 @@
if (!conn)
continue;
- QString actionName = QString("disable_connection_%1_%2").arg(conn->getID()).arg(dev->getInterface());
+ QString actionName = QString("disable_connection_%1_%2").arg(conn->getID()).arg(dev ? dev->getInterface() : "");
KAction * deviceNewConnAction = actionCollection ()->action (actionName);
QString actionText = conn->getInfoSetting()->getName();
if (dev)
@@ -223,10 +223,10 @@
if (!deviceNewConnAction) {
deviceNewConnAction = new KAction (actionText, 0, &d->signalMapper, SLOT(map()), actionCollection(), actionName);
- d->signalMapper.setMapping(deviceNewConnAction, d->current_idx);
- d->act_conn_map.insert(d->current_idx, QPair (conn, dev));
- d->current_idx++;
}
+ d->signalMapper.setMapping(deviceNewConnAction, d->current_idx);
+ d->act_conn_map.insert(d->current_idx, QPair (conn, dev));
+ d->current_idx++;
disableStuffActionMenu->insert(deviceNewConnAction);
}
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.7r826733/knetworkmanager/src/knetworkmanager-vpnauthenticationdialog.cpp new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-vpnauthenticationdialog.cpp
--- old/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-vpnauthenticationdialog.cpp 2008-07-01 09:37:10.000000000 +0200
+++ new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-vpnauthenticationdialog.cpp 2008-08-18 08:19:15.000000000 +0200
@@ -43,7 +43,6 @@
#include "knetworkmanager-vpn_connection.h"
#include "knetworkmanager-connection_setting_vpn.h"
#include "knetworkmanager-connection_setting_info.h"
-#include "knetworkmanager-connection_setting_vpn_properties.h"
using namespace ConnectionSettings;
@@ -78,7 +77,7 @@
_vpnAuthWidget = vpnPlugin->CreateAuthenticationWidget(widgetStack);
if (_vpnAuthWidget)
{
- _vpnAuthWidget->setVPNData(conn->getVPNSetting()->getRoutes(), conn->getVPNPropertiesSetting()->getData());
+ _vpnAuthWidget->setVPNData(conn->getVPNSetting()->getRoutes(), conn->getVPNSetting()->getData());
widgetStack->raiseWidget(_vpnAuthWidget);
}
}
@@ -121,7 +120,7 @@
void VPNAuthenticationDialog::ok()
{
// good, we have new secrets now, update the setting
- VPNProperties* prop = _conn->getVPNPropertiesSetting();
+ VPN* prop = _conn->getVPNSetting();
prop->setSecrets(_vpnAuthWidget->getPasswords());
_conn->slotSecretsProvided(prop);
QDialog::done(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.7r826733/knetworkmanager/src/knetworkmanager-vpn_connection.cpp new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-vpn_connection.cpp
--- old/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-vpn_connection.cpp 2008-07-01 09:37:10.000000000 +0200
+++ new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-vpn_connection.cpp 2008-08-18 08:19:15.000000000 +0200
@@ -48,7 +48,6 @@
#include "knetworkmanager-connection_setting_info.h"
#include "knetworkmanager-connection_setting_ipv4.h"
#include "knetworkmanager-connection_setting_vpn.h"
-#include "knetworkmanager-connection_setting_vpn_properties.h"
#include "knetworkmanager-nmsettings.h"
using namespace ConnectionSettings;
@@ -61,7 +60,6 @@
{
// add all settings needed for a VPN connection
appendSetting(new VPN(this));
- appendSetting(new VPNProperties(this));
// TODO: Maybe IPv4 Setting?
}
@@ -71,11 +69,6 @@
return dynamic_cast(getSetting(NM_SETTING_VPN_SETTING_NAME));
}
-VPNProperties* VPNConnection::getVPNPropertiesSetting() const
-{
- return dynamic_cast(getSetting(NM_SETTING_VPN_PROPERTIES_SETTING_NAME));
-}
-
Connection* VPNConnection::duplicate()
{
VPNConnection* conn = new VPNConnection();
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.7r826733/knetworkmanager/src/knetworkmanager-vpn_connection.h new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-vpn_connection.h
--- old/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-vpn_connection.h 2008-07-01 09:37:10.000000000 +0200
+++ new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-vpn_connection.h 2008-08-18 08:19:15.000000000 +0200
@@ -38,7 +38,6 @@
{
class VPN;
- class VPNProperties;
class VPNConnection : public GenericConnection
{
@@ -47,7 +46,6 @@
VPNConnection();
VPN* getVPNSetting() const;
- VPNProperties* getVPNPropertiesSetting() const;
Connection* duplicate();
};
}
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.7r826733/knetworkmanager/src/knetworkmanager-vpnplugin.cpp new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-vpnplugin.cpp
--- old/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-vpnplugin.cpp 2008-07-01 09:37:10.000000000 +0200
+++ new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-vpnplugin.cpp 2008-08-18 08:19:15.000000000 +0200
@@ -41,12 +41,12 @@
}
-void VPNConfigWidget::setVPNData(const QStringList& /*routes*/, const QMap& /*properties*/)
+void VPNConfigWidget::setVPNData(const QStringList& /*routes*/, const QMap& /*properties*/)
{
}
-QMap VPNConfigWidget::getVPNProperties()
+QMap VPNConfigWidget::getVPNProperties()
{
return QMap();
}
@@ -87,7 +87,7 @@
return QMap();
}
-void VPNAuthenticationWidget::setVPNData(const QStringList& /*routes*/, const QMap& /*properties*/)
+void VPNAuthenticationWidget::setVPNData(const QStringList& /*routes*/, const QMap& /*properties*/)
{
}
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.7r826733/knetworkmanager/src/knetworkmanager-vpnplugin.h new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-vpnplugin.h
--- old/knetworkmanager-0.7r826733/knetworkmanager/src/knetworkmanager-vpnplugin.h 2008-07-01 09:37:10.000000000 +0200
+++ new/knetworkmanager-0.7r848570/knetworkmanager/src/knetworkmanager-vpnplugin.h 2008-08-18 08:19:15.000000000 +0200
@@ -40,8 +40,8 @@
virtual ~VPNConfigWidget();
VPNConfigWidget(QWidget* parent = NULL, const char* name = NULL);
- virtual void setVPNData(const QStringList&, const QMap&);
- virtual QMap getVPNProperties();
+ virtual void setVPNData(const QStringList&, const QMap&);
+ virtual QMap getVPNProperties();
virtual QStringList getVPNRoutes();
virtual bool hasChanged();
virtual bool isValid(QStringList&);
@@ -54,8 +54,8 @@
virtual ~VPNAuthenticationWidget();
VPNAuthenticationWidget(QWidget* parent = NULL, const char* name = NULL);
- virtual void setVPNData(const QStringList&, const QMap&);
- virtual QMap getPasswords();
+ virtual void setVPNData(const QStringList&, const QMap&);
+ virtual QMap getPasswords();
virtual bool needsUserInteraction();
};
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.7r826733/knetworkmanager/src/Makefile.am new/knetworkmanager-0.7r848570/knetworkmanager/src/Makefile.am
--- old/knetworkmanager-0.7r826733/knetworkmanager/src/Makefile.am 2008-07-01 09:37:10.000000000 +0200
+++ new/knetworkmanager-0.7r848570/knetworkmanager/src/Makefile.am 2008-08-18 08:19:15.000000000 +0200
@@ -35,7 +35,6 @@
knetworkmanager-connection_setting_wireless_security.h \
knetworkmanager-connection_setting_8021x.h \
knetworkmanager-connection_setting_vpn.h \
- knetworkmanager-connection_setting_vpn_properties.h \
knetworkmanager-connection_setting_serial.h \
knetworkmanager-connection_setting_cdma.h \
knetworkmanager-connection_setting_gsm.h \
@@ -146,7 +145,6 @@
knetworkmanager-connection_setting_wireless_security.cpp \
knetworkmanager-connection_setting_8021x.cpp \
knetworkmanager-connection_setting_vpn.cpp \
- knetworkmanager-connection_setting_vpn_properties.cpp \
knetworkmanager-connection_setting_serial.cpp \
knetworkmanager-connection_setting_cdma.cpp \
knetworkmanager-connection_setting_gsm.cpp \
@@ -206,10 +204,11 @@
# this is where the desktop file will go
xdg_apps_DATA = knetworkmanager.desktop
-EXTRA_DIST = $(shellrc_DATA)
-
mydatadir = $(kde_datadir)/knetworkmanager
mydata_DATA = eventsrc
servicetype_DATA = knetworkmanager_plugin.desktop knetworkmanager_vpnplugin.desktop
servicetypedir = $(kde_servicetypesdir)
+
+EXTRA_DIST = $(xdg_apps_DATA) $(mydata_DATA) $(servicetype_DATA)
+
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.7r826733/knetworkmanager/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp new/knetworkmanager-0.7r848570/knetworkmanager/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp
--- old/knetworkmanager-0.7r826733/knetworkmanager/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp 2008-07-01 09:37:10.000000000 +0200
+++ new/knetworkmanager-0.7r848570/knetworkmanager/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp 2008-08-18 08:19:15.000000000 +0200
@@ -221,7 +221,7 @@
_openvpnWidget->chkDefaultPort->setChecked(true);
}
}
- else if (entry == "proto")
+ else if (entry == "proto" || entry == "proto-tcp")
{
_openvpnWidget->chkUseTCP->setChecked( value.toBool() );
}
@@ -246,7 +246,7 @@
{
_openvpnWidget->chkUseLZO->setChecked(value.toBool());
}
- else if (entry == "shared-key")
+ else if (entry == "shared-key" || entry == "static-key")
{
_openvpnWidget->editSharedKey->setURL(value.toString());
}
@@ -262,7 +262,7 @@
{
_openvpnWidget->editRemoteIP->setText(value.toString());
}
- else if (entry == "dev")
+ else if (entry == "dev" || entry == "tap-dev")
_openvpnWidget->chkUseTAP->setChecked( value.toBool() );
else if (entry == "ta")
{
@@ -292,6 +292,8 @@
// build a StingList of properties
QMap strlist;
+ // TODO sync properties with NM trunk
+
strlist.insert("connection-type", QDBusData::fromInt32(OpenVPNConnectionType::mapConnectionType2String((OpenVPNConnectionType::CONNECTIONTYPE)_openvpnWidget->cboConnectionType->currentItem())));
strlist.insert("remote", QDBusData::fromString(_openvpnWidget->gateway->text()));
@@ -309,12 +311,12 @@
if (_openvpnWidget->chkUseLZO->isChecked())
strlist.insert("comp-lzo", QDBusData::fromBool(true));
- strlist.insert("shared-key", QDBusData::fromString(_openvpnWidget->editSharedKey->url()));
+ strlist.insert("static-key", QDBusData::fromString(_openvpnWidget->editSharedKey->url()));
strlist.insert("username", QDBusData::fromString(_openvpnWidget->editUsername->text()));
strlist.insert("local-ip", QDBusData::fromString(_openvpnWidget->editLocalIP->text()));
strlist.insert("remote-ip", QDBusData::fromString(_openvpnWidget->editRemoteIP->text()));
- strlist.insert("dev", QDBusData::fromBool(_openvpnWidget->chkUseTAP->isChecked()));
- strlist.insert("proto", QDBusData::fromBool(_openvpnWidget->chkUseTCP->isChecked()));
+ strlist.insert("tap-dev", QDBusData::fromBool(_openvpnWidget->chkUseTAP->isChecked()));
+ strlist.insert("proto-tcp", QDBusData::fromBool(_openvpnWidget->chkUseTCP->isChecked()));
if (_openvpnWidget->chkUseTLS->isChecked())
strlist.insert("ta", QDBusData::fromString(_openvpnWidget->editTLSAuth->url()));
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.7r826733/knm_dist.log new/knetworkmanager-0.7r848570/knm_dist.log
--- old/knetworkmanager-0.7r826733/knm_dist.log 2008-07-01 09:37:10.000000000 +0200
+++ new/knetworkmanager-0.7r848570/knm_dist.log 2008-08-18 08:19:15.000000000 +0200
@@ -1,9 +1,9 @@
-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
+svn2dist log on Mo 18. Aug 08:19:15 CEST 2008
+Module: /tmp/knm/svn/knetworkmanager/.; Directory: knetworkmanager-0.7; Name: knetworkmanager; Version 0.7r848570.
+-v 0.7r848570 -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.7r826733/knetworkmanager
-cp -pRL /tmp/knm/svn/knetworkmanager/./admin /tmp/knm/svn/knetworkmanager/./svn2dist-tmp/knetworkmanager-0.7r826733
+cp -R /tmp/knm/svn/knetworkmanager/./knetworkmanager-0.7 /tmp/knm/svn/knetworkmanager/./svn2dist-tmp/knetworkmanager-0.7r848570/knetworkmanager
+cp -pRL /tmp/knm/svn/knetworkmanager/./admin /tmp/knm/svn/knetworkmanager/./svn2dist-tmp/knetworkmanager-0.7r848570
Copying over files from the module directory:
-cp /tmp/knm/svn/knetworkmanager/./knm_dist.log /tmp/knm/svn/knetworkmanager/./svn2dist-tmp/knetworkmanager-0.7r826733
+cp /tmp/knm/svn/knetworkmanager/./knm_dist.log /tmp/knm/svn/knetworkmanager/./svn2dist-tmp/knetworkmanager-0.7r848570
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.7r826733/VERSION new/knetworkmanager-0.7r848570/VERSION
--- old/knetworkmanager-0.7r826733/VERSION 2008-07-01 09:37:10.000000000 +0200
+++ new/knetworkmanager-0.7r848570/VERSION 2008-08-18 08:19:15.000000000 +0200
@@ -1 +1 @@
-knetworkmanager version 0.7r826733
+knetworkmanager version 0.7r848570
++++++ nm_vpn_routes.patch ++++++
diff -ur knetworkmanager/src/knetworkmanager-connection_setting_vpn.cpp knetworkmanager-0.7r848570_2//knetworkmanager/src/knetworkmanager-connection_setting_vpn.cpp
--- knetworkmanager/src/knetworkmanager-connection_setting_vpn.cpp 2008-08-18 09:05:24.000000000 +0200
+++ knetworkmanager/src/knetworkmanager-connection_setting_vpn.cpp 2008-08-18 09:04:38.000000000 +0200
@@ -90,15 +90,6 @@
map.insert(NM_SETTING_VPN_SERVICE_TYPE, QDBusData::fromString(_serviceType));
map.insert(NM_SETTING_VPN_USER_NAME, QDBusData::fromString(_userName));
- if (!_routes.isEmpty())
- {
- QValueList<QDBusData> list;
- for (QValueList<QString>::ConstIterator it = _routes.begin(); it != _routes.end(); ++it)
- {
- list.append(QDBusData::fromString(*it));
- }
- map.insert(NM_SETTING_VPN_ROUTES, QDBusData::fromQValueList(list));
- }
return map;
}
@@ -113,16 +104,6 @@
if ((it = map.find(NM_SETTING_VPN_USER_NAME)) != map.end())
_userName = it.data().toString();
- if ((it = map.find(NM_SETTING_VPN_ROUTES)) != map.end())
- {
- QValueList<QDBusData> list = it.data().toQValueList();
- _routes.clear();
- for (QValueList<QDBusData>::Iterator it2 = list.begin(); it2 != list.end(); ++it2)
- {
- _routes.append((*it2).toString());
- }
- }
-
}
bool
++++++ revert_nm_vpn_api1.patch ++++++
Index: knetworkmanager/src/knetworkmanager-connection_setting_vpn_properties.h
===================================================================
--- knetworkmanager/src/knetworkmanager-connection_setting_vpn_properties.h (Revision 848499)
+++ knetworkmanager/src/knetworkmanager-connection_setting_vpn_properties.h (Revision 848500)
@@ -1,71 +0,0 @@
-/***************************************************************************
- *
- * knetworkmanager-connection_setting_vpn_properties.h - A NetworkManager frontend for KDE
- *
- * Copyright (C) 2005, 2006 Novell, Inc.
- *
- * Author: Helmut Schaa ,
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- **************************************************************************/
-
-#ifndef KNETWORKMANAGER_CONNECTION_SETTING_VPN_PROPERTIES_H
-#define KNETWORKMANAGER_CONNECTION_SETTING_VPN_PROPERTIES_H
-
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include "knetworkmanager-connection_setting.h"
-
-/* NM headers */
-#include
-
-namespace ConnectionSettings
-{
-
-// info setting
-class VPNProperties : public ConnectionSetting
-{
- public:
- VPNProperties(Connection* conn);
-
- SettingsMap toMap() const;
- void fromMap(const SettingsMap&);
-
- SettingsMap toSecretsMap(bool with_settings = true) const;
- bool fromSecretsMap(const SettingsMap&);
-
- bool isValid() const;
-
- QMap getData() const;
- void setData(QMap data);
-
- // Ugh, that is ugly
- QMap getSecrets() const;
- void setSecrets(const QMap& secrets);
-
- private:
- QMap _data;
- QMap _secrets;
-};
-
-}
-#endif /* KNETWORKMANAGER_CONNECTION_SETTING_VPN_PROPERTIES_H */
Index: knetworkmanager/src/knetworkmanager-connection_setting_vpn_properties.cpp
===================================================================
--- knetworkmanager/src/knetworkmanager-connection_setting_vpn_properties.cpp (Revision 848499)
+++ knetworkmanager/src/knetworkmanager-connection_setting_vpn_properties.cpp (Revision 848500)
@@ -1,156 +0,0 @@
-/***************************************************************************
- *
- * knetworkmanager-connection_setting_vpn.cpp - A NetworkManager frontend for KDE
- *
- * Copyright (C) 2005, 2006 Novell, Inc.
- *
- * Author: Helmut Schaa ,
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- **************************************************************************/
-
-/* qt headers */
-#include
-#include
-
-/* kde headers */
-#include
-#include
-
-/* QDBus headers*/
-#include
-#include
-#include
-
-/* knetworkmanager headers */
-#include "knetworkmanager.h"
-#include "knetworkmanager-connection_setting_vpn_properties.h"
-
-
-using namespace ConnectionSettings;
-
-/*
- class VPNProperties
-*/
-VPNProperties::VPNProperties(Connection* conn)
- : ConnectionSetting(conn, NM_SETTING_VPN_PROPERTIES_SETTING_NAME)
-{
-
-}
-
-void VPNProperties::setData(QMap data)
-{
- _data = data;
- emitValidityChanged();
-}
-
-QMap VPNProperties::getData() const
-{
- return _data;
-}
-
-void VPNProperties::setSecrets(const QMap& data)
-{
- _secrets = data;
- emitValidityChanged();
-}
-
-QMap VPNProperties::getSecrets() const
-{
- return _secrets;
-}
-
-
-SettingsMap
-VPNProperties::toMap() const
-{
- SettingsMap map;
-
- // NM expects a String/Variant map -> convert
- QDBusDataMap<QString> data;
-
- for (QMap::ConstIterator it = _data.begin(); it != _data.end(); ++it)
- {
- QDBusVariant variant;
- variant.value = it.data();
- variant.signature = it.data().buildDBusSignature();
- data.insert(it.key(), QDBusData::fromVariant(variant));
- }
-
- map.insert(NM_SETTING_VPN_PROPERTIES_DATA, QDBusData::fromStringKeyMap(data));
-
- return map;
-}
-
-void
-VPNProperties::fromMap(const SettingsMap& map)
-{
- SettingsMap::ConstIterator it;
- QDBusDataMap<QString> data;
- _data.clear();
-
- if ((it = map.find(NM_SETTING_VPN_PROPERTIES_DATA)) != map.end())
- {
- data = it.data().toStringKeyMap();
- for (QMap::ConstIterator it = data.begin(); it != data.end(); ++it)
- {
- QDBusVariant variant = it.data().toVariant();
- _data.insert(it.key(), variant.value);
- }
- }
-}
-
-SettingsMap
-VPNProperties::toSecretsMap(bool with_settings) const
-{
- SettingsMap map;
-
- // NM does not want the settings too
-/* if (with_settings)
- map = toMap();*/
-
- // copy all secrets into the map
- for (QMap::ConstIterator it = _secrets.begin(); it != _secrets.end(); ++it)
- map.insert(it.key(), it.data());
-
- return map;
-}
-
-bool
-VPNProperties::fromSecretsMap(const SettingsMap& map)
-{
-/* SettingsMap::ConstIterator it;
- QDBusDataMap<QString> data;
-
- if ((it = map.find(NM_SETTING_VPN_PROPERTIES_DATA)) != map.end())
- {
- data = it.data().toStringKeyMap();
- _data = data.toQMap();
- }*/
- // FIXME
- return false;
-}
-
-
-bool
-VPNProperties::isValid() const
-{
- // data is essential
- if (_data.isEmpty())
- return false;
-
- return true;
-}
Index: knetworkmanager/src/knetworkmanager-vpn_connection.cpp
===================================================================
--- knetworkmanager/src/knetworkmanager-vpn_connection.cpp (Revision 848499)
+++ knetworkmanager/src/knetworkmanager-vpn_connection.cpp (Revision 848500)
@@ -48,7 +48,6 @@
#include "knetworkmanager-connection_setting_info.h"
#include "knetworkmanager-connection_setting_ipv4.h"
#include "knetworkmanager-connection_setting_vpn.h"
-#include "knetworkmanager-connection_setting_vpn_properties.h"
#include "knetworkmanager-nmsettings.h"
using namespace ConnectionSettings;
@@ -61,7 +60,6 @@
{
// add all settings needed for a VPN connection
appendSetting(new VPN(this));
- appendSetting(new VPNProperties(this));
// TODO: Maybe IPv4 Setting?
}
@@ -71,11 +69,6 @@
return dynamic_cast(getSetting(NM_SETTING_VPN_SETTING_NAME));
}
-VPNProperties* VPNConnection::getVPNPropertiesSetting() const
-{
- return dynamic_cast(getSetting(NM_SETTING_VPN_PROPERTIES_SETTING_NAME));
-}
-
Connection* VPNConnection::duplicate()
{
VPNConnection* conn = new VPNConnection();
Index: knetworkmanager/src/knetworkmanager-vpnauthenticationdialog.cpp
===================================================================
--- knetworkmanager/src/knetworkmanager-vpnauthenticationdialog.cpp (Revision 848499)
+++ knetworkmanager/src/knetworkmanager-vpnauthenticationdialog.cpp (Revision 848500)
@@ -43,7 +43,6 @@
#include "knetworkmanager-vpn_connection.h"
#include "knetworkmanager-connection_setting_vpn.h"
#include "knetworkmanager-connection_setting_info.h"
-#include "knetworkmanager-connection_setting_vpn_properties.h"
using namespace ConnectionSettings;
@@ -78,7 +77,7 @@
_vpnAuthWidget = vpnPlugin->CreateAuthenticationWidget(widgetStack);
if (_vpnAuthWidget)
{
- _vpnAuthWidget->setVPNData(conn->getVPNSetting()->getRoutes(), conn->getVPNPropertiesSetting()->getData());
+ _vpnAuthWidget->setVPNData(conn->getVPNSetting()->getRoutes(), conn->getVPNSetting()->getData());
widgetStack->raiseWidget(_vpnAuthWidget);
}
}
@@ -121,7 +120,7 @@
void VPNAuthenticationDialog::ok()
{
// good, we have new secrets now, update the setting
- VPNProperties* prop = _conn->getVPNPropertiesSetting();
+ VPN* prop = _conn->getVPNSetting();
prop->setSecrets(_vpnAuthWidget->getPasswords());
_conn->slotSecretsProvided(prop);
QDialog::done(0);
Index: knetworkmanager/src/knetworkmanager-connection_setting_vpn.h
===================================================================
--- knetworkmanager/src/knetworkmanager-connection_setting_vpn.h (Revision 848499)
+++ knetworkmanager/src/knetworkmanager-connection_setting_vpn.h (Revision 848500)
@@ -50,6 +50,9 @@
SettingsMap toMap() const;
void fromMap(const SettingsMap&);
+ SettingsMap toSecretsMap(bool with_settings = true) const;
+ bool fromSecretsMap(const SettingsMap&);
+
QString getUserName() const;
void setUserName(const QString&);
@@ -59,12 +62,21 @@
QValueList<QString> getRoutes() const;
void setRoutes(const QValueList<QString>&);
+ QMap getData() const;
+ void setData(QMap data);
+
+ // Ugh, that is ugly
+ QMap getSecrets() const;
+ void setSecrets(const QMap& secrets);
+
bool isValid() const;
private:
QString _userName;
QString _serviceType;
QValueList<QString> _routes;
+ QMap _data;
+ QMap _secrets;
};
}
Index: knetworkmanager/src/knetworkmanager-connection_setting_vpn_widget.h
===================================================================
--- knetworkmanager/src/knetworkmanager-connection_setting_vpn_widget.h (Revision 848499)
+++ knetworkmanager/src/knetworkmanager-connection_setting_vpn_widget.h (Revision 848500)
@@ -41,7 +41,6 @@
namespace ConnectionSettings
{
-class VPNProperties;
class Connection;
class VPNWidgetImpl : public WidgetInterface
@@ -60,7 +59,6 @@
bool _new_conn;
VPN* _vpnsetting;
- VPNProperties* _vpnprop;
ConnectionSettingVPNWidget* _mainWid;
QMap _mapServiceCombo;
QMap _mapServiceWidget;
Index: knetworkmanager/src/Makefile.am
===================================================================
--- knetworkmanager/src/Makefile.am (Revision 848499)
+++ knetworkmanager/src/Makefile.am (Revision 848500)
@@ -35,7 +35,6 @@
knetworkmanager-connection_setting_wireless_security.h \
knetworkmanager-connection_setting_8021x.h \
knetworkmanager-connection_setting_vpn.h \
- knetworkmanager-connection_setting_vpn_properties.h \
knetworkmanager-connection_setting_serial.h \
knetworkmanager-connection_setting_cdma.h \
knetworkmanager-connection_setting_gsm.h \
@@ -146,7 +145,6 @@
knetworkmanager-connection_setting_wireless_security.cpp \
knetworkmanager-connection_setting_8021x.cpp \
knetworkmanager-connection_setting_vpn.cpp \
- knetworkmanager-connection_setting_vpn_properties.cpp \
knetworkmanager-connection_setting_serial.cpp \
knetworkmanager-connection_setting_cdma.cpp \
knetworkmanager-connection_setting_gsm.cpp \
Index: knetworkmanager/src/knetworkmanager-connection_setting_vpn_widget.cpp
===================================================================
--- knetworkmanager/src/knetworkmanager-connection_setting_vpn_widget.cpp (Revision 848499)
+++ knetworkmanager/src/knetworkmanager-connection_setting_vpn_widget.cpp (Revision 848500)
@@ -36,7 +36,6 @@
// knm headers
#include "knetworkmanager-connection.h"
#include "knetworkmanager-connection_setting_vpn.h"
-#include "knetworkmanager-connection_setting_vpn_properties.h"
#include "knetworkmanager-connection_setting_vpn_widget.h"
#include "knetworkmanager-device.h"
#include "knetworkmanager-vpnmanager.h"
@@ -49,7 +48,6 @@
, _new_conn(new_conn)
{
_vpnsetting = dynamic_castConnectionSettings::VPN* (conn->getSetting(NM_SETTING_VPN_SETTING_NAME));
- _vpnprop = dynamic_castConnectionSettings::VPNProperties* (conn->getSetting(NM_SETTING_VPN_PROPERTIES_SETTING_NAME));
QVBoxLayout* layout = new QVBoxLayout(this, 1, 1);
_mainWid = new ConnectionSettingVPNWidget(this);
@@ -157,7 +155,7 @@
VPNConfigWidget* config = getVPNConfigWidget(service);
_mainWid->widgetStack->raiseWidget(config);
- config->setVPNData(_vpnsetting->getRoutes(), _vpnprop->getData());
+ config->setVPNData(_vpnsetting->getRoutes(), _vpnsetting->getData());
}
}
else
@@ -180,7 +178,7 @@
if (config)
{
// update the vpn properties
- _vpnprop->setData(config->getVPNProperties());
+ _vpnsetting->setData(config->getVPNProperties());
}
}
}
Index: knetworkmanager/src/knetworkmanager-connection_setting_vpn.cpp
===================================================================
--- knetworkmanager/src/knetworkmanager-connection_setting_vpn.cpp (Revision 848499)
+++ knetworkmanager/src/knetworkmanager-connection_setting_vpn.cpp (Revision 848500)
@@ -82,6 +82,29 @@
emitValidityChanged();
}
+void VPN::setData(QMap data)
+{
+ _data = data;
+ emitValidityChanged();
+}
+
+QMap VPN::getData() const
+{
+ return _data;
+}
+
+void VPN::setSecrets(const QMap& data)
+{
+ _secrets = data;
+ emitValidityChanged();
+}
+
+QMap VPN::getSecrets() const
+{
+ return _secrets;
+}
+
+
SettingsMap
VPN::toMap() const
{
@@ -99,6 +122,21 @@
}
map.insert(NM_SETTING_VPN_ROUTES, QDBusData::fromQValueList(list));
}
+
+ // NM expects a String/Variant map -> convert
+ QDBusDataMap<QString> data;
+
+ for (QMap::ConstIterator it = _data.begin(); it != _data.end(); ++it)
+ {
+ QDBusVariant variant;
+ variant.value = it.data();
+ variant.signature = it.data().buildDBusSignature();
+ data.insert(it.key(), QDBusData::fromVariant(variant));
+ }
+
+ map.insert(NM_SETTING_VPN_PROPERTIES_DATA, QDBusData::fromStringKeyMap(data));
+
+
return map;
}
@@ -123,14 +161,61 @@
}
}
+ QDBusDataMap<QString> data;
+ _data.clear();
+
+ if ((it = map.find(NM_SETTING_VPN_PROPERTIES_DATA)) != map.end())
+ {
+ data = it.data().toStringKeyMap();
+ for (QMap::ConstIterator it = data.begin(); it != data.end(); ++it)
+ {
+ QDBusVariant variant = it.data().toVariant();
+ _data.insert(it.key(), variant.value);
+ }
+ }
}
+SettingsMap
+VPN::toSecretsMap(bool with_settings) const
+{
+ SettingsMap map;
+
+ // NM does not want the settings too
+/* if (with_settings)
+ map = toMap();*/
+
+ // copy all secrets into the map
+ for (QMap::ConstIterator it = _secrets.begin(); it != _secrets.end(); ++it)
+ map.insert(it.key(), it.data());
+
+ return map;
+}
+
bool
+VPN::fromSecretsMap(const SettingsMap& map)
+{
+/* SettingsMap::ConstIterator it;
+ QDBusDataMap<QString> data;
+
+ if ((it = map.find(NM_SETTING_VPN_PROPERTIES_DATA)) != map.end())
+ {
+ data = it.data().toStringKeyMap();
+ _data = data.toQMap();
+ }*/
+ // FIXME
+ return false;
+}
+
+bool
VPN::isValid() const
{
// name is essential
if (_userName.isEmpty() || _serviceType.isEmpty())
return false;
+ // data is essential
+ if (_data.isEmpty())
+ return false;
+
return true;
}
Index: knetworkmanager/src/knetworkmanager-vpn_connection.h
===================================================================
--- knetworkmanager/src/knetworkmanager-vpn_connection.h (Revision 848499)
+++ knetworkmanager/src/knetworkmanager-vpn_connection.h (Revision 848500)
@@ -38,7 +38,6 @@
{
class VPN;
- class VPNProperties;
class VPNConnection : public GenericConnection
{
@@ -47,7 +46,6 @@
VPNConnection();
VPN* getVPNSetting() const;
- VPNProperties* getVPNPropertiesSetting() const;
Connection* duplicate();
};
}
++++++ revert_nm_vpn_api2.patch ++++++
Index: knetworkmanager/src/knetworkmanager-vpnplugin.cpp
===================================================================
--- knetworkmanager/src/knetworkmanager-vpnplugin.cpp (Revision 848502)
+++ knetworkmanager/src/knetworkmanager-vpnplugin.cpp (Revision 848503)
@@ -41,12 +41,12 @@
}
-void VPNConfigWidget::setVPNData(const QStringList& /*routes*/, const QMap& /*properties*/)
+void VPNConfigWidget::setVPNData(const QStringList& /*routes*/, const QMap& /*properties*/)
{
}
-QMap VPNConfigWidget::getVPNProperties()
+QMap VPNConfigWidget::getVPNProperties()
{
return QMap();
}
@@ -87,7 +87,7 @@
return QMap();
}
-void VPNAuthenticationWidget::setVPNData(const QStringList& /*routes*/, const QMap& /*properties*/)
+void VPNAuthenticationWidget::setVPNData(const QStringList& /*routes*/, const QMap& /*properties*/)
{
}
Index: knetworkmanager/src/knetworkmanager-connection_setting_vpn.h
===================================================================
--- knetworkmanager/src/knetworkmanager-connection_setting_vpn.h (Revision 848502)
+++ knetworkmanager/src/knetworkmanager-connection_setting_vpn.h (Revision 848503)
@@ -62,12 +62,12 @@
QValueList<QString> getRoutes() const;
void setRoutes(const QValueList<QString>&);
- QMap getData() const;
- void setData(QMap data);
+ QMap getData() const;
+ void setData(QMap data);
// Ugh, that is ugly
- QMap getSecrets() const;
- void setSecrets(const QMap& secrets);
+ QMap getSecrets() const;
+ void setSecrets(const QMap& secrets);
bool isValid() const;
@@ -75,8 +75,8 @@
QString _userName;
QString _serviceType;
QValueList<QString> _routes;
- QMap _data;
- QMap _secrets;
+ QMap _data;
+ QMap _secrets;
};
}
Index: knetworkmanager/src/knetworkmanager-connection_setting_vpn.cpp
===================================================================
--- knetworkmanager/src/knetworkmanager-connection_setting_vpn.cpp (Revision 848502)
+++ knetworkmanager/src/knetworkmanager-connection_setting_vpn.cpp (Revision 848503)
@@ -82,24 +82,24 @@
emitValidityChanged();
}
-void VPN::setData(QMap data)
+void VPN::setData(QMap data)
{
_data = data;
emitValidityChanged();
}
-QMap VPN::getData() const
+QMap VPN::getData() const
{
return _data;
}
-void VPN::setSecrets(const QMap& data)
+void VPN::setSecrets(const QMap& data)
{
_secrets = data;
emitValidityChanged();
}
-QMap VPN::getSecrets() const
+QMap VPN::getSecrets() const
{
return _secrets;
}
@@ -123,18 +123,15 @@
map.insert(NM_SETTING_VPN_ROUTES, QDBusData::fromQValueList(list));
}
- // NM expects a String/Variant map -> convert
+ // NM expects a String/String map -> convert
QDBusDataMap<QString> data;
- for (QMap::ConstIterator it = _data.begin(); it != _data.end(); ++it)
+ for (QMap::ConstIterator it = _data.begin(); it != _data.end(); ++it)
{
- QDBusVariant variant;
- variant.value = it.data();
- variant.signature = it.data().buildDBusSignature();
- data.insert(it.key(), QDBusData::fromVariant(variant));
+ data.insert(it.key(), QDBusData::fromString(it.data()));
}
- map.insert(NM_SETTING_VPN_PROPERTIES_DATA, QDBusData::fromStringKeyMap(data));
+ map.insert(NM_SETTING_VPN_DATA, QDBusData::fromStringKeyMap(data));
return map;
@@ -164,13 +161,12 @@
QDBusDataMap<QString> data;
_data.clear();
- if ((it = map.find(NM_SETTING_VPN_PROPERTIES_DATA)) != map.end())
+ if ((it = map.find(NM_SETTING_VPN_DATA)) != map.end())
{
data = it.data().toStringKeyMap();
for (QMap::ConstIterator it = data.begin(); it != data.end(); ++it)
{
- QDBusVariant variant = it.data().toVariant();
- _data.insert(it.key(), variant.value);
+ _data.insert(it.key(), it.data().toString());
}
}
}
@@ -185,8 +181,8 @@
map = toMap();*/
// copy all secrets into the map
- for (QMap::ConstIterator it = _secrets.begin(); it != _secrets.end(); ++it)
- map.insert(it.key(), it.data());
+ for (QMap::ConstIterator it = _secrets.begin(); it != _secrets.end(); ++it)
+ map.insert(it.key(), QDBusData::fromString(it.data()));
return map;
}
@@ -197,7 +193,7 @@
/* SettingsMap::ConstIterator it;
QDBusDataMap<QString> data;
- if ((it = map.find(NM_SETTING_VPN_PROPERTIES_DATA)) != map.end())
+ if ((it = map.find(NM_SETTING_VPN_DATA)) != map.end())
{
data = it.data().toStringKeyMap();
_data = data.toQMap();
Index: knetworkmanager/src/knetworkmanager-vpnplugin.h
===================================================================
--- knetworkmanager/src/knetworkmanager-vpnplugin.h (Revision 848502)
+++ knetworkmanager/src/knetworkmanager-vpnplugin.h (Revision 848503)
@@ -40,8 +40,8 @@
virtual ~VPNConfigWidget();
VPNConfigWidget(QWidget* parent = NULL, const char* name = NULL);
- virtual void setVPNData(const QStringList&, const QMap&);
- virtual QMap getVPNProperties();
+ virtual void setVPNData(const QStringList&, const QMap&);
+ virtual QMap getVPNProperties();
virtual QStringList getVPNRoutes();
virtual bool hasChanged();
virtual bool isValid(QStringList&);
@@ -54,8 +54,8 @@
virtual ~VPNAuthenticationWidget();
VPNAuthenticationWidget(QWidget* parent = NULL, const char* name = NULL);
- virtual void setVPNData(const QStringList&, const QMap&);
- virtual QMap getPasswords();
+ virtual void setVPNData(const QStringList&, const QMap&);
+ virtual QMap getPasswords();
virtual bool needsUserInteraction();
};
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org