Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/knetworkmanager9

390 files changed, 10 insertions, 3495 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 698bf06..195d7ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ cmake_minimum_required( VERSION 2.6 )
 ##### general package setup #####################
 
 project( knetworkmanager )
-set( KNETWORKMANAGER_VERSION "0.8" )
+set( KNETWORKMANAGER_VERSION "0.9" )
 
 
 ##### include essential cmake modules ###########
@@ -63,7 +63,7 @@ set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
 
 ##### source directories ########################
 
-add_subdirectory( knetworkmanager-0.8 )
+add_subdirectory( tdenetworkmanager )
 
 
 ##### write configure files #####################
diff --git a/Makefile.am.in b/Makefile.am.in
deleted file mode 100644
index e46b27c..0000000
--- a/Makefile.am.in
+++ /dev/null
@@ -1,4 +0,0 @@
-AUTOMAKE_OPTIONS = foreign 1.6.1
-
-include admin/deps.am
-include admin/Doxyfile.am
diff --git a/Makefile.cvs b/Makefile.cvs
deleted file mode 100644
index be59a86..0000000
--- a/Makefile.cvs
+++ /dev/null
@@ -1,14 +0,0 @@
-all: 
-	@echo "This Makefile is only for the CVS repository"
-	@echo "This will be deleted before making the distribution"
-	@echo ""
-	@if test ! -d admin; then \
-	   echo "Please recheckout this module!" ;\
-	   echo "for cvs: use checkout once and after that update again" ;\
-	   echo "for cvsup: checkout kde-common from cvsup and" ;\
-	   echo "   link kde-common/admin to ./admin" ;\
-	   exit 1 ;\
-	fi
-	$(MAKE) -f admin/Makefile.common cvs
-
-.SILENT:
diff --git a/configure.in.bot b/configure.in.bot
deleted file mode 100644
index 3b7eaa7..0000000
--- a/configure.in.bot
+++ /dev/null
@@ -1,4 +0,0 @@
-dnl Put here things to be done at the very end - telling users
-dnl about additional packages to install. Better yet is giving
-dnl each project / subdr its own configure.in.bot.
-
diff --git a/configure.in.in b/configure.in.in
deleted file mode 100644
index 66f69d1..0000000
--- a/configure.in.in
+++ /dev/null
@@ -1,13 +0,0 @@
-#MIN_CONFIG(3.2)
-CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
-
-AM_INIT_AUTOMAKE(knetworkmanager, 0.8, [email protected])
-
-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])
-
diff --git a/knetworkmanager-0.9/ChangeLog b/knetworkmanager-0.9/ChangeLog
deleted file mode 100644
index 79e992e..0000000
--- a/knetworkmanager-0.9/ChangeLog
+++ /dev/null
@@ -1,1062 +0,0 @@
-2007-06-13 12:36  Helmut Schaa <[email protected]>
-
-	* configure.in.in: Add check for LEAP related functions
-
-2007-06-13 12:34  Helmut Schaa <[email protected]>
-
-	* src/knetworkmanager-dialogfab.cpp,
-	  src/knetworkmanager-encryption.cpp: Disable LEAP support during
-	  configure if the required functions are missing
-
-2007-06-13 10:12  Helmut Schaa <[email protected]>
-
-	* src/cryptowidget.ui, src/knetworkmanager-dialogfab.cpp,
-	  src/knetworkmanager-encryption.cpp,
-	  src/knetworkmanager-encryption.h: Add LEAP support (patch by
-	  Stefan Skotte <[email protected]>)
-
-2007-06-11 15:41  scripty
-
-	* src/eventsrc, src/knetworkmanager.desktop,
-	  src/knetworkmanager_plugin.desktop,
-	  src/knetworkmanager_vpnplugin.desktop,
-	  vpn-plugins/openvpn/knetworkmanager_openvpn.desktop,
-	  vpn-plugins/pptp/knetworkmanager_pptp.desktop,
-	  vpn-plugins/vpnc/knetworkmanager_vpnc.desktop: SVN_SILENT made
-	  messages (.desktop file)
-
-2007-06-06 14:17  Helmut Schaa <[email protected]>
-
-	* vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp: Fix password order
-
-2007-06-06 12:50  Helmut Schaa <[email protected]>
-
-	* src/knetworkmanager-settings.cpp,
-	  src/knetworkmanager-vpnconnectionsdialog.cpp,
-	  src/knetworkmanager-vpnconnectionsdialog.h: Fix updating of the
-	  vpn list
-
-2007-06-06 09:36  Helmut Schaa <[email protected]>
-
-	* configure.in.in, src/cryptowidget.ui,
-	  src/knetworkmanager-dialogfab.cpp,
-	  src/knetworkmanager-dialogfab.h,
-	  src/knetworkmanager-encryption.cpp,
-	  src/knetworkmanager-encryption.h: Add phase2 authentication
-	  support (patch by Jernej Kos <[email protected]>)
-
-2007-06-04 13:49  Helmut Schaa <[email protected]>
-
-	* src/activation.ui, src/cryptowidget.ui, src/errormsg.ui,
-	  src/generalsettings.ui, src/manageconnections.ui,
-	  src/unknownservice.ui: Remove include hints from ui files
-
-2007-06-02 14:47  helio
-
-	* .: - Moving keg network app for branches...
-
-2007-06-02 06:47  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2007-05-30 09:39  Helmut Schaa <[email protected]>
-
-	* : Show VPN connections only if accepted by NetworkManager
-
-2007-05-21 12:02  Helmut Schaa <[email protected]>
-
-	* : Fix build for builddir != srcdir (patch from Michael Biebl
-	  <[email protected]>)
-
-2007-05-16 09:19  Helmut Schaa <[email protected]>
-
-	* : Remove debug output
-
-2007-05-14 13:57  Helmut Schaa <[email protected]>
-
-	* : Clean up libnl related headers
-
-2007-05-14 11:28  Helmut Schaa <[email protected]>
-
-	* : increase version to 0.2
-
-2007-05-11 11:14  Helmut Schaa <[email protected]>
-
-	* : move signal and slot handling to knetworkmanager-nminfo.cpp
-
-2007-05-11 11:12  Helmut Schaa <[email protected]>
-
-	* : Get rid of the "keyStored" flag. Use asynchronous approach for
-	  key
-	  restoration.
-
-2007-05-11 11:12  Helmut Schaa <[email protected]>
-
-	* : Restore keys using the asynchronous approach. Get rid of the
-	  "keyStored"
-	  flag.
-
-2007-05-11 11:10  Helmut Schaa <[email protected]>
-
-	* : Add new class PassphraseRequest to allow handling of multiple
-	  requests
-	  as needed for asynchronous KWallet access.
-
-2007-05-11 11:09  Helmut Schaa <[email protected]>
-
-	* : While KNM waits for a key do not show any active options in the
-	  contextMenu, only "cancel".
-
-2007-05-11 11:08  Helmut Schaa <[email protected]>
-
-	* : Added methods for setting and getting whether KNM waits for a
-	  key from
-	  KWallet. Make the State class a singelton.
-
-2007-05-11 11:06  Helmut Schaa <[email protected]>
-
-	* : Add new class CredentialsRequest which uses the asynchonous
-	  interface to
-	  KWallet.
-
-2007-05-11 11:05  Helmut Schaa <[email protected]>
-
-	* : Use the getInstance method to create a singelton "State" object
-	  instead
-	  of new.
-
-2007-05-11 11:03  Helmut Schaa <[email protected]>
-
-	* : Allow multiple key requests (as needed for asynchronous KWallet
-	  access)
-
-2007-05-11 11:02  Helmut Schaa <[email protected]>
-
-	* : Use the asynchonous interface to KWallet
-
-2007-05-07 12:57  Helmut Schaa <[email protected]>
-
-	* : Avoid crash when using "connect to a new wireless network"
-	  which is already
-	  in the list of available networks.
-
-2007-05-06 06:32  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2007-05-01 08:42  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2007-04-10 14:57  Helmut Schaa <[email protected]>
-
-	* : Set X-DCOP-ServiceType=Unique refering to the
-	  KUniqueApplication class reference
-
-2007-04-10 13:53  Helmut Schaa <[email protected]>
-
-	* : Added more vpnc options supported by NetworkManager 0.6.5
-
-2007-04-07 06:23  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2007-04-04 15:14  Helmut Schaa <[email protected]>
-
-	* : Show wpa-eap and wpa-psk according to the networks capabilities
-
-2007-04-04 12:17  Helmut Schaa <[email protected]>
-
-	* : Fix KWallet access when using wpa-eap
-
-2007-04-04 11:15  Helmut Schaa <[email protected]>
-
-	* : - Fix storing of wpa-eap keys
-	  - Fix storing of network data if connected via "connect to other
-	  ..." option
-
-2007-04-04 09:32  Helmut Schaa <[email protected]>
-
-	* : Fix whitespaces
-
-2007-04-02 14:19  Helmut Schaa <[email protected]>
-
-	* : - New dialog which centralises all configuration options
-	  - Allow to store keys unencrypted in configfile instead of
-	  KWallet
-	  - Option to change autostart behaviour (based on a patch from
-	  Michael Biebl <[email protected]>)
-
-2007-04-01 06:11  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2007-03-26 14:26  Helmut Schaa <[email protected]>
-
-	* : Disable unused fields when setting up a WPA EAP connection
-
-2007-03-26 13:28  Helmut Schaa <[email protected]>
-
-	* : Add possibility to set the OpenVPN port
-
-2007-03-09 10:46  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2007-03-09 08:14  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2007-03-08 12:12  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2007-03-08 10:10  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2007-03-07 13:41  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2007-03-05 11:33  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2007-02-21 10:25  Helmut Schaa <[email protected]>
-
-	* : Include moc files
-
-2007-02-21 10:07  Helmut Schaa <[email protected]>
-
-	* : Fix some issues causing compiler warnings
-
-2007-02-21 09:56  Helmut Schaa <[email protected]>
-
-	* : Remove unneeded includes, move includes to sourcefile where
-	  applicable.
-
-2007-02-21 09:19  Helmut Schaa <[email protected]>
-
-	* : Do not allow to import VPN connections without having an
-	  appropriate
-	  plugin. Start Gnome VPN configuration applet when connection
-	  without
-	  native plugin is being edited.
-
-2007-02-20 14:30  Helmut Schaa <[email protected]>
-
-	* : Do not calculate rx and tx rates when getting interface
-	  statistics the
-	  first time
-
-2007-02-20 11:19  Helmut Schaa <[email protected]>
-
-	* : Use KActiveLabel instead of QLabel in ConnectionInfoWidget to
-	  allow
-	  selecting and copying values.
-
-2007-02-20 10:33  Helmut Schaa <[email protected]>
-
-	* : Clean up connectioninfo dialog when no device is active
-
-2007-02-20 10:11  Helmut Schaa <[email protected]>
-
-	* : Calculate sizeHint for ConnectionInfoWidget to avoid scrolling
-	  in the
-	  tabbar
-
-2007-02-20 09:12  Helmut Schaa <[email protected]>
-
-	* : Leftclick on the tray icon opens the connectioninfo dialog
-	  instead of
-	  the context menu.
-
-2007-02-19 16:23  Helmut Schaa <[email protected]>
-
-	* : Use VPN service name from plugininfo when available
-
-2007-02-19 10:55  Helmut Schaa <[email protected]>
-
-	* : Run one check per dependent package and show a warning when knm
-	  will not be built.
-
-2007-02-17 12:35  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2007-02-15 12:24  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2007-02-13 11:30  Helmut Schaa <[email protected]>
-
-	* : Show Rx and Tx rates in connectioninfo dialog.
-
-2007-02-13 10:12  Helmut Schaa <[email protected]>
-
-	* : Preselect first available VPN service. Fix enabling and
-	  disabling of the
-	  name textbox due to the availability of the plugin.
-
-2007-02-13 09:52  Helmut Schaa <[email protected]>
-
-	* : clean up VPN widgets, fix taborder in openvpn
-
-2007-02-12 12:14  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2007-02-09 10:51  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2007-02-08 10:51  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2007-02-07 10:56  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2007-02-06 09:58  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2007-02-06 09:50  Helmut Schaa <[email protected]>
-
-	* : Fix tooltip for device
-
-2007-02-06 09:46  Helmut Schaa <[email protected]>
-
-	* : Use the object path for identification of the selected network
-	  and
-	  device. Fixes b.n.c bug #231202.
-
-2007-02-05 10:34  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2007-02-02 10:52  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2007-02-01 20:01  danimo
-
-	* : forgot this one
-
-2007-02-01 19:58  danimo
-
-	* : capitalize, looks a lot better now (patch found while browsing
-	  ubuntu diffs)
-	  CCMAIL:[email protected]
-
-2007-01-26 14:09  Helmut Schaa <[email protected]>
-
-	* : Initialization of _vpnList and _vpnServiceList in the
-	  constructor
-
-2007-01-26 10:58  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2007-01-26 09:42  Helmut Schaa <[email protected]>
-
-	* : Fix crash when closing knetworkmanager and no VPN service is
-	  available
-
-2007-01-25 10:37  Helmut Schaa <[email protected]>
-
-	* : Fix moving networks from untrusted group to trusted group
-
-2007-01-24 15:04  Helmut Schaa <[email protected]>
-
-	* : Do cancel if the appropriate button is pressed in the external
-	  gtk
-	  authentication helper
-
-2007-01-24 09:52  Helmut Schaa <[email protected]>
-
-	* : add icon for dialup menu entry
-
-2007-01-24 08:11  Helmut Schaa <[email protected]>
-
-	* : Fix a few memory leaks and initialize member variables
-
-2007-01-23 14:27  Helmut Schaa <[email protected]>
-
-	* : Fixed menu caption a second time (Timo is a nitpicker)
-
-2007-01-23 14:11  Helmut Schaa <[email protected]>
-
-	* : Fixed menu title "Show Connection Info..."
-
-2007-01-23 13:56  Helmut Schaa <[email protected]>
-
-	* : add a dialog for showing information about the current
-	  connection
-
-2007-01-20 10:43  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2007-01-17 10:56  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2007-01-11 13:58  Helmut Schaa <[email protected]>
-
-	* : fixed my e-mail address over again
-
-2007-01-11 13:56  Helmut Schaa <[email protected]>
-
-	* : Fixed my e-mail address
-
-2007-01-09 13:36  Helmut Schaa <[email protected]>
-
-	* : - show error message when connecting to a network fails
-	  - show nice icons in activation stage dialog
-
-2007-01-09 11:27  Timo Hoenig <[email protected]>
-
-	* : Use dbus_bool_t rather than bool (b.n.c #227406)
-
-2007-01-09 11:25  Timo Hoenig <[email protected]>
-
-	* : Disable session management (patch by Lubos Lunak
-	  <[email protected]>, b.n.c #206641)
-
-2007-01-03 13:54  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-12-29 13:41  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-12-22 13:47  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-12-21 14:27  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-12-20 13:38  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-12-18 13:44  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-12-17 14:01  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-12-17 12:12  bram
-
-	* : SVN_SILENT: fixuifiles
-
-2006-12-16 13:51  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-12-15 13:41  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-12-14 14:00  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-12-13 15:38  Helmut Schaa <[email protected]>
-
-	* : use KProcess instead of KShellProcess which is deprecated
-
-2006-12-13 15:24  Helmut Schaa <[email protected]>
-
-	* : build vpn plugins if the appropriate service is installed
-
-2006-12-13 15:23  Helmut Schaa <[email protected]>
-
-	* : add Makefile.am for builing the plugins
-
-2006-12-13 15:23  Helmut Schaa <[email protected]>
-
-	* : add pptp plugin
-
-2006-12-13 15:22  Helmut Schaa <[email protected]>
-
-	* : add vpnc plugin
-
-2006-12-13 15:22  Helmut Schaa <[email protected]>
-
-	* : add openvpn plugin
-
-2006-12-13 15:22  Helmut Schaa <[email protected]>
-
-	* : new subdir for the VPN plugins
-
-2006-12-13 15:20  Helmut Schaa <[email protected]>
-
-	* : Add all new files to the Makefile
-
-2006-12-13 15:20  Helmut Schaa <[email protected]>
-
-	* : make use of the new vpn connection managment
-
-2006-12-13 15:18  Helmut Schaa <[email protected]>
-
-	* : integrate the pluginmanager
-
-2006-12-13 15:16  Helmut Schaa <[email protected]>
-
-	* : -add missing headers
-	  -fix compiler warnings
-
-2006-12-13 15:15  Helmut Schaa <[email protected]>
-
-	* : use VPN service identifier instead of VPN service name
-
-2006-12-13 15:14  Helmut Schaa <[email protected]>
-
-	* : Add function for setting failed signals for VPN connections
-
-2006-12-13 15:13  Helmut Schaa <[email protected]>
-
-	* : Add function for setting failed signals for VPN connections
-
-2006-12-13 15:12  Helmut Schaa <[email protected]>
-
-	* : Dispatch signals indicating VPN connection failure
-
-2006-12-13 15:11  Helmut Schaa <[email protected]>
-
-	* : -Make use of the new dialogs for managing VPN connections
-	  -If NM does not provide the speed property for a network show the
-	  speed
-	  property of the device instead
-
-2006-12-13 15:09  Helmut Schaa <[email protected]>
-
-	* : Add storage management for vpn connections
-	  Check for the existence of keys before accessing them in KWallet
-
-2006-12-13 15:05  Helmut Schaa <[email protected]>
-
-	* : Add dialogs for managing VPN connections
-
-2006-12-13 15:02  Helmut Schaa <[email protected]>
-
-	* : Add Authentication dialog for VPN connections
-
-2006-12-13 15:01  Helmut Schaa <[email protected]>
-
-	* : Add definitions for the VPN plugin interface
-
-2006-12-13 15:00  Helmut Schaa <[email protected]>
-
-	* : Add ui files for use with the new vpn plugin management
-
-2006-12-13 14:57  Helmut Schaa <[email protected]>
-
-	* : add knetworkmanager_plugin.desktop which provides info on how
-	  plugins have to look like
-
-2006-12-13 14:51  Helmut Schaa <[email protected]>
-
-	* : Add pluginmanager and base class for plugins
-
-2006-12-13 14:02  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-12-12 13:40  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-12-11 15:39  mueller
-
-	* : move knetworkmanager to extragear
-
-2006-12-10 13:51  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-11-27 14:09  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-11-26 16:04  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-11-21 22:21  Timo Hoenig <[email protected]>
-
-	* : Add Helmut Schaa to the list of authors
-
-2006-11-21 16:21  Timo Hoenig <[email protected]>
-
-	* : add new ui file errormsg.ui
-
-2006-11-21 16:04  Timo Hoenig <[email protected]>
-
-	* : Add Helmut Schaa <[email protected]> to the list of authors
-
-2006-11-21 16:02  Timo Hoenig <[email protected]>
-
-	* : Respect UTF-8 for VPN connection properties, patch by Helmut
-	  Schaa
-
-2006-11-21 15:59  Timo Hoenig <[email protected]>
-
-	* : Show overlay image (lock) for active VPN connections in the
-	  tray, patch by Helmut Schaa
-
-2006-11-21 15:26  Timo Hoenig <[email protected]>
-
-	* : Make notifications look pretty, patch by Helmut Schaa
-
-2006-11-20 13:15  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-11-06 14:21  Timo Hoenig <[email protected]>
-
-	* : Don't call deserialize on encryption object to avoid warnings
-	  of libnm-util
-
-2006-11-01 17:40  Timo Hoenig <[email protected]>
-
-	* : feed KProcess properly
-
-2006-10-29 12:13  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-10-20 11:40  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-10-18 11:46  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-10-01 11:49  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-09-26 06:06  Timo Hoenig <[email protected]>
-
-	* : Revert r586726: We need removed network objects until we
-	  persist the data.
-
-2006-09-25 06:56  Timo Hoenig <[email protected]>
-
-	* : Ignore signal from NetworkManager if its state did not change
-	  (b.n.c #165275)
-
-2006-09-24 18:42  Timo Hoenig <[email protected]>
-
-	* : Notify NetworkManager about user interaction in order to
-	  temporarily decrease the scan interval for wireless networks.
-
-2006-09-23 07:36  Timo Hoenig <[email protected]>
-
-	* : Add some news.
-
-2006-09-22 17:50  Timo Hoenig <[email protected]>
-
-	* : Don't add a separator if dial up is not supported (Patch by
-	  Valentine Sinitsyn)
-
-2006-09-22 13:29  Timo Hoenig <[email protected]>
-
-	* : Fix version string for about dialog.
-
-2006-09-21 16:32  Timo Hoenig <[email protected]>
-
-	* : Refuse to show 'Configure Dial-Up Connections' if no
-	  configuration tool is available.
-
-2006-09-21 16:31  Timo Hoenig <[email protected]>
-
-	* : Add distribution detection to ease distribution specific code
-	  within NetworkManager, cleanups
-
-2006-09-21 13:23  Timo Hoenig <[email protected]>
-
-	* : Call restore functions with version tag. Don't tag each network
-	  with version info. Write version tag on quit.
-
-2006-09-21 13:22  Timo Hoenig <[email protected]>
-
-	* : Remove obsolete comments.
-
-2006-09-21 09:11  Timo Hoenig <[email protected]>
-
-	* : Remove networkstatus hack.
-
-2006-09-20 15:13  Timo Hoenig <[email protected]>
-
-	* : Persist networks stored with the old scheme on first start
-
-2006-09-20 13:28  Timo Hoenig <[email protected]>
-
-	* : Add Valentine Sinitsyn <[email protected]> to the list of authors
-
-2006-09-20 13:27  Timo Hoenig <[email protected]>
-
-	* : Update
-
-2006-09-20 13:27  Timo Hoenig <[email protected]>
-
-	* : Update
-
-2006-09-20 13:27  Timo Hoenig <[email protected]>
-
-	* :
-
-2006-09-20 13:26  Timo Hoenig <[email protected]>
-
-	* : Enhance acquirePassphrase (). Patch by Valentine Sinitsyn
-	  <[email protected]>
-
-2006-09-20 13:26  Timo Hoenig <[email protected]>
-
-	* : Add hint why keyStored is set to true
-
-2006-09-20 13:24  Timo Hoenig <[email protected]>
-
-	* : Make sure that updating KNetworkManager does not require the
-	  user to enter all networks and passphrases again
-
-2006-09-20 13:23  Timo Hoenig <[email protected]>
-
-	* : Make sure that updating KNetworkManager does not require the
-	  user to enter all networks and passphrases again
-
-2006-09-20 13:22  Timo Hoenig <[email protected]>
-
-	* : Remove FIXME, add TODO
-
-2006-09-20 13:21  Timo Hoenig <[email protected]>
-
-	* : Update error message, add new Device if not prestent in
-	  DeviceStore
-
-2006-09-20 13:19  Timo Hoenig <[email protected]>
-
-	* : Keep networks in sync. Patch by Valentine Sinitsyn
-	  <[email protected]>
-
-2006-09-20 13:18  Timo Hoenig <[email protected]>
-
-	* : Don't leak. Patch by Valentine Sinitsyn <[email protected]>
-
-2006-09-20 13:17  Timo Hoenig <[email protected]>
-
-	* : add TODO
-
-2006-09-20 13:13  Timo Hoenig <[email protected]>
-
-	* : The DeviceStore is not used in this function
-
-2006-09-20 13:12  Timo Hoenig <[email protected]>
-
-	* : Keep network objects synced. Patch by Valentine Sinitsyn
-	  <[email protected]>
-
-2006-09-20 13:09  Timo Hoenig <[email protected]>
-
-	* : Avoid flickering of the tray icon. Patch by Valentine Sinitsyn
-	  <[email protected]>
-
-2006-09-20 13:05  Timo Hoenig <[email protected]>
-
-	* : add define for KNetworkManager version to configure.in.in
-
-2006-09-20 13:02  Timo Hoenig <[email protected]>
-
-	* : write version tag to config, remove dummy strings
-
-2006-09-19 07:32  Timo Hoenig <[email protected]>
-
-	* : s/D-BUS/D-Bus
-
-2006-08-22 11:34  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-08-17 16:18  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-08-14 09:18  Timo Hoenig <[email protected]>
-
-	* : Add Valentine Sinitsyn to the list of authors
-
-2006-08-14 09:17  Timo Hoenig <[email protected]>
-
-	* : keep network objects in sync with storage \(patch by Valentine
-	  Sinitsyn\)
-
-2006-08-14 09:16  Timo Hoenig <[email protected]>
-
-	* : cleanup
-
-2006-08-14 09:16  Timo Hoenig <[email protected]>
-
-	* : improve KWallet integration and sync of network storage \(patch
-	  by Valentine Sinitsyn\)
-
-2006-08-14 09:15  Timo Hoenig <[email protected]>
-
-	* : improve storage of networks \(patch by Valentine Sinitsyn\)
-
-2006-08-14 09:13  Timo Hoenig <[email protected]>
-
-	* : improve network storage \(patch by Valentine Sinitsyn\),
-	  cleanup
-
-2006-08-14 09:12  Timo Hoenig <[email protected]>
-
-	* : improve storage of networks \(patch by Valentine Sinitsyn\)
-
-2006-08-14 09:09  Timo Hoenig <[email protected]>
-
-	* : keep network objects in sync with storage \(patch by Valentine
-	  Sinitsyn\), cleanup
-
-2006-08-14 09:08  Timo Hoenig <[email protected]>
-
-	* : cleanup
-
-2006-08-14 09:07  Timo Hoenig <[email protected]>
-
-	* : improve AcquirePasswordDialog \(patch by Valentine Sinitsyn\),
-	  cleanup
-
-2006-08-14 09:06  Timo Hoenig <[email protected]>
-
-	* : typo
-
-2006-08-14 09:06  Timo Hoenig <[email protected]>
-
-	* : cleanup
-
-2006-08-14 09:05  Timo Hoenig <[email protected]>
-
-	* : improve KWallet integration \(patch by Valentine Sinitsyn\)
-
-2006-07-11 10:12  Timo Hoenig <[email protected]>
-
-	* : persist settings (wireless enabled and offline mode) and
-	  restore those on start-up.
-
-2006-07-01 15:24  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-06-28 13:34  Timo Hoenig <[email protected]>
-
-	* : improve system tray for active dial up connections
-
-2006-06-28 12:14  Timo Hoenig <[email protected]>
-
-	* : drop obsolete and inactive code
-
-2006-06-28 12:09  Timo Hoenig <[email protected]>
-
-	* : drop debug printf
-
-2006-06-28 12:08  Timo Hoenig <[email protected]>
-
-	* : drop absolute path to binary
-
-2006-06-24 15:24  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-06-12 15:37  Timo Hoenig <[email protected]>
-
-	* : reflect status of dial-up connection in the system tray
-
-2006-05-30 09:30  Timo Hoenig <[email protected]>
-
-	* : update webpage URL
-
-2006-05-28 14:59  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-05-24 14:53  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-05-23 14:41  Will Stephenson <[email protected]>
-
-	* : Show 22x22px tray icons
-
-2006-05-22 11:35  Timo Hoenig <[email protected]>
-
-	* : Show special icon for ad-hoc networks to allow users to
-	  distinguish such from managed networks.
-
-2006-05-16 14:48  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-05-09 14:56  Will Stephenson <[email protected]>
-
-	* : The icons are now really 22 px wide
-
-2006-05-08 14:05  Will Stephenson <[email protected]>
-
-	* : Disable notifications by default
-
-2006-04-27 10:32  Timo Hoenig <[email protected]>
-
-	* : Use setter functions when restoring wireless networks from
-	  storage (b.n.c #166913)
-
-2006-04-25 12:09  Timo Hoenig <[email protected]>
-
-	* : Patch by Michael Biebl <[email protected]>: Add item "Configure
-	  Notifications" to the options menu
-
-2006-04-25 12:07  Timo Hoenig <[email protected]>
-
-	* : Patch by Michael Biebl <[email protected]>: remove
-	  $\(shelldesktop_DATA\) from EXTRA_DIST to provide compatiblity
-	  with automake < 1.9
-
-2006-04-25 11:45  Timo Hoenig <[email protected]>
-
-	* : update artwork with icons from Jimmac <[email protected]>,
-	  remove unused icon
-
-2006-04-24 12:47  Will Stephenson <[email protected]>
-
-	* : Ugly fix for Novell #165907, route the dcop information path
-	  via KNM to
-	  kded networkstatus, instead of direct, as KNM knows if NM has no
-	  devices
-	  to configure and is still saying DISCONNECTED.
-	  
-	  Revert as soon as a libknetworkmanager (SOLID) is written, so
-	  kded can
-	  make this decision locally.
-
-2006-04-20 14:44  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-04-17 14:56  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-04-15 14:27  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-04-09 14:38  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-04-03 16:49  Will Stephenson <[email protected]>
-
-	* : Follow the XDG desktop file spec, patch courtesy of Michael
-	  Biebl <[email protected]>
-	  CCMAIL: [email protected]
-
-2006-04-03 16:43  mueller
-
-	* : make it compile
-
-2006-04-03 15:34  Timo Hoenig <[email protected]>
-
-	* : fallback to the device's signal strength and don't show zero
-	  frequency if information is not provided by NM
-
-2006-04-03 14:29  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-04-03 13:28  Timo Hoenig <[email protected]>
-
-	* : only show bandwidth if available, simplyfications
-
-2006-04-03 13:27  Timo Hoenig <[email protected]>
-
-	* : shortest is best
-
-2006-04-03 13:22  Timo Hoenig <[email protected]>
-
-	* : revert parts of r524612: do not use QCString, set vendor and
-	  product strings to "unknown" if HAL can not provide information
-
-2006-04-03 13:19  Timo Hoenig <[email protected]>
-
-	* : revert parts of r524612: do not use QCString, proper replies if
-	  no networks are VPN connections are stored
-
-2006-03-31 14:31  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-03-31 13:36  danimo
-
-	* : there is no just reason to hardcode a path that is in $PATH
-	  anyway
-
-2006-03-30 19:32  Will Stephenson <[email protected]>
-
-	* : Fix build with -DQT_NO_ASCII_CAST, replace a few char *'s with
-	  QCString
-
-2006-03-30 14:55  scripty
-
-	* : SVN_SILENT made messages (.desktop file)
-
-2006-03-30 13:49  hasso
-
-	* : Better layout.
-
-2006-03-30 11:26  coolo
-
-	* : streamline configure run of kdereview
-
-2006-03-30 11:06  coolo
-
-	* : create_svnignore -r
-
-2006-03-30 11:04  coolo
-
-	* : some more makefile fixes
-
-2006-03-30 10:58  coolo
-
-	* : - removing documentation that only says it doesn't say anything
-	  - fixing place in kdereview
-
-2006-03-30 09:29  Timo Hoenig <[email protected]>
-
-	* : return QStringList for Network::getEncryptionProtocol as
-	  multiple encryption protocols for one and the same network might
-	  be applicable
-
-2006-03-29 15:21  Timo Hoenig <[email protected]>
-
-	* : update bugzilla URL
-
-2006-03-29 14:56  Will Stephenson <[email protected]>
-
-	* : initial import of KNetworkManager to KDE SVN. You need
-	  NetworkManager 0.6.2 to use this.
-
-2006-03-29 13:29  Will Stephenson <[email protected]>
-
-	* : Make dir for knetworkmanager, using import in-place technique.
-
diff --git a/knetworkmanager-0.9/INSTALL b/knetworkmanager-0.9/INSTALL
deleted file mode 100644
index 02a4a07..0000000
--- a/knetworkmanager-0.9/INSTALL
+++ /dev/null
@@ -1,167 +0,0 @@
-Basic Installation
-==================
-
-   These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
-
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes a while.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Type `make install' to install the programs and any data files and
-     documentation.
-
-  4. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
-
-Installation Names
-==================
-
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
-     CPU-COMPANY-SYSTEM
-
-See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
-
-   If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Operation Controls
-==================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
-
-`--help'
-     Print a summary of the options to `configure', and exit.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`configure' also accepts some other, not widely useful, options.
-
diff --git a/knetworkmanager-0.9/Makefile.am b/knetworkmanager-0.9/Makefile.am
deleted file mode 100644
index 1ef46ff..0000000
--- a/knetworkmanager-0.9/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-SUBDIRS = pics src vpn-plugins po
-
-dbusservicedir = $(DBUS_SYS_DIR)
-dbusservice_DATA = knetworkmanager.conf
-
-EXTRA_DIST = COPYING configure.in.in $(dbusservice_DATA)
-
diff --git a/knetworkmanager-0.9/Makefile.am.in b/knetworkmanager-0.9/Makefile.am.in
deleted file mode 100644
index bc332c0..0000000
--- a/knetworkmanager-0.9/Makefile.am.in
+++ /dev/null
@@ -1,10 +0,0 @@
-AUTOMAKE_OPTIONS = foreign 1.6.1
-
-include admin/deps.am
-include admin/Doxyfile.am
-
-dbusservicedir = $(DBUS_SYS_DIR)
-dbusservice_DATA = knetworkmanager.conf
-
-EXTRA_DIST = COPYING configure.in.in admin $(dbusservice_DATA)
-
diff --git a/knetworkmanager-0.9/NEWS b/knetworkmanager-0.9/NEWS
deleted file mode 100644
index 6f762dc..0000000
--- a/knetworkmanager-0.9/NEWS
+++ /dev/null
@@ -1,3 +0,0 @@
-22 June      2007 - KNetworkManager 0.2
-23 September 2006 - KNetworkManager 0.1
-28 March     2006 - KNetworkManager moves to KDE SVN
diff --git a/knetworkmanager-0.9/README b/knetworkmanager-0.9/README
deleted file mode 100644
index 534a24a..0000000
--- a/knetworkmanager-0.9/README
+++ /dev/null
@@ -1,25 +0,0 @@
-KNetworkManager is a system tray application for controlling network connections on systems that use the NetworkManager daemon.
-
-Currently the following things work:
-
-  * Show all network interfaces known to HAL and therefore to NetworkManager
-  * Connect to wired and wireless networks
-  * User interaction for encrypted (WEP, WPA Personal and WPA Enterprise) wireless networks
-  * User interaction to join hidden wireless networks
-  * Show signal strength for wireless networks in context menu
-  * Show tool tip with connection status on tray icon
-  * Show verbose tool tip with interface and network information on context
-    menu entries
-  * Store passwords of encrypted networks
-  * Store hidden wireless networks (per-user) 
-  * Show connection status in system tray
-  * VPN support
-  * Notifications (new networks, new devices, NM status changes)
-
-NetworkManager 0.6.2 is required to build this version of KNetworkManager.
-
-If you encounter bugs, please report them using
-
-  * http://bugs.kde.org
-
-Last update:  20-Sep-2006 - Timoe Hoenig <[email protected]>, <[email protected]>
diff --git a/knetworkmanager-0.9/configure.in.bot b/knetworkmanager-0.9/configure.in.bot
deleted file mode 100644
index 5239ed2..0000000
--- a/knetworkmanager-0.9/configure.in.bot
+++ /dev/null
@@ -1,10 +0,0 @@
-if test -n "$MISSING_DEPS"; then
-
-	echo "**************************************************"
-	echo "*"
-	echo "* KNetworkManager will not be built due to missing dependencies!"
-	echo "* Missing: $MISSING_DEPS"
-	echo "*"
-	echo "**************************************************"
-
-fi
diff --git a/knetworkmanager-0.9/configure.in.in b/knetworkmanager-0.9/configure.in.in
deleted file mode 100644
index e80ad6e..0000000
--- a/knetworkmanager-0.9/configure.in.in
+++ /dev/null
@@ -1,147 +0,0 @@
-#MIN_CONFIG(3.2)
-CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
-
-AM_INIT_AUTOMAKE(knetworkmanager, 0.8, [email protected])
-
-AC_C_BIGENDIAN
-AC_CHECK_KDEMAXPATHLEN
-
-KNETWORKMANAGER_VERSION="0.8"
-AC_DEFINE_UNQUOTED(KNETWORKMANAGER_VERSION, $KNETWORKMANAGER_VERSION, [KNetworkManager Version])
-AC_DEFINE_UNQUOTED(KNETWORKMANAGER_VERSION_STRING, "$KNETWORKMANAGER_VERSION", [KNetworkManager Version String])
-
-# check for dbus, hal, libnm-util and libnl
-PKG_CHECK_MODULES(HAL, [hal], [], [ 
-	AC_MSG_RESULT([no])
-	AC_MSG_WARN([You need Hal, knetworkmanager will not be compiled])
-	DO_NOT_COMPILE="$DO_NOT_COMPILE knetworkmanager" 
-	MISSING_DEPS="$MISSING_DEPS hal"
-])
-
-PKG_CHECK_MODULES(LIBNMUTIL, [libnm-util >= 0.7], [], [ 
-	AC_MSG_RESULT([no])
-	AC_MSG_WARN([You need libnm-util >= 0.7, knetworkmanager will not be compiled])
-	DO_NOT_COMPILE="$DO_NOT_COMPILE knetworkmanager" 
-	MISSING_DEPS="$MISSING_DEPS libnm-util"
-])
-
-PKG_CHECK_MODULES(LIBNMGLIB, [libnm_glib >= 0.7], [], [ 
-	AC_MSG_RESULT([no])
-	AC_MSG_WARN([You need libnm-util, knetworkmanager will not be compiled])
-	DO_NOT_COMPILE="$DO_NOT_COMPILE knetworkmanager" 
-	MISSING_DEPS="$MISSING_DEPS libnm-glib"
-])
-
-PKG_CHECK_MODULES(LIBNL, [libnl-1], [], [
-	AC_MSG_RESULT([no])
-	AC_MSG_WARN([You need libnl, knetworkmanager will not be compiled])
-	DO_NOT_COMPILE="$DO_NOT_COMPILE knetworkmanager" 
-	MISSING_DEPS="$MISSING_DEPS libnl-1"
-])
-
-PKG_CHECK_MODULES(DBUS_TQT, [dbus-1-tqt >= 0.8.1], [], [ 
-	AC_MSG_RESULT([no])
-	AC_MSG_ERROR([TQT dbus bindings missing])
-])
-
-AC_CHECK_PROG(DBUSXML2QT3, [dbusxml2qt3], [dbusxml2qt3], [no])
-if test "$DBUSXML2QT3" = no ; then
-	AC_MSG_WARN([You need dbusxml2qt3, knetworkmanager will not be compiled])
-	DO_NOT_COMPILE="$DO_NOT_COMPILE knetworkmanager" 
-	MISSING_DEPS="$MISSING_DEPS dbusxml2qt3"
-fi
-
-PACKAGE_CFLAGS="$HAL_CFLAGS $LIBNL_CFLAGS $DBUS_TQT_CFLAGS $LIBNMGLIB_CFLAGS"
-PACKAGE_LIBS="$HAL_LIBS $LIBNL_LIBS $DBUS_TQT_LIBS"
-
-AC_ARG_WITH(dbus-sys, AC_HELP_STRING([--with-dbus-sys=DIR], [D-BUS system.d directory]))
-if ! test -z "$with_dbus_sys" ; then
-	DBUS_SYS_DIR="$with_dbus_sys"
-else
-	DBUS_SYS_DIR="${sysconfdir}/dbus-1/system.d"
-fi
-AC_SUBST(DBUS_SYS_DIR)
-AC_DEFINE_UNQUOTED(DBUS_SYSTEMD_DIR, "$DBUS_SYS_DIR", [D-BUS system.d directory])
-
-AC_SUBST(PACKAGE_CFLAGS)
-AC_SUBST(PACKAGE_LIBS)
-AC_SUBST(LIB_DL)
-
-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")
-	AC_CHECK_FILE(/etc/gentoo-release,with_distro="gentoo")
-	AC_CHECK_FILE(/etc/redhat-release,with_distro="fedora")
-	if test "x$with_distro" = "x"; then
-		with_distro=`lsb_release -is`
-	fi
-fi
-
-with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' `
-
-# Compile dialup support
-
-AC_ARG_WITH(dialup, AC_HELP_STRING([--with-dialup], [Build KNetworkManager with Dialup support (default)]))
-if test "x$with_dialup" != "xno"; then
-	if test "x$with_distro" = "x"; then
-		echo "Linux distribution autodetection failed, you must specify the distribution to target using --with-distro=DISTRO"
-	else
-		case $with_distro in
-			suse)
-				AC_DEFINE_UNQUOTED(KNETWORKMANAGER_DIALUP_CONFIG,
-					"tdesu --nonewdcop /sbin/yast2 modem",
-					[Command to launch dial up configuration tool])
-				;;
-			gentoo)
-				AC_DEFINE_UNQUOTED(KNETWORKMANAGER_DIALUP_CONFIG,
-					"tdesu --nonewdcop ${TDEDIR}/bin/kppp",
-					[Command to launch dial up configuration tool])
-				;;
-			fedora)
-				AC_DEFINE_UNQUOTED(KNETWORKMANAGER_DIALUP_CONFIG,
-					"tdesu --nonewdcop /usr/bin/kppp",
-					[Command to launch dial up configuration tool])
-				;; 
-			*)
-				echo "Your distribution (${with_distro}) is not yet supported (e.g. you will not be able to launch a tool to configure dial-up connections.)"
-				;;
-		esac
-	fi
-fi
-
-# openvpn support
-
-AC_ARG_WITH(openvpn, AC_HELP_STRING([--with-openvpn], [Build KNetworkManager with openvpn plugin]))
-if test "x$with_openvpn" = "x"; then
-	AC_CHECK_FILE(/etc/NetworkManager/VPN/nm-openvpn-service.name,with_openvpn="yes" )
-fi
-AM_CONDITIONAL(WITH_OPENVPN, test x"$with_openvpn" = "xyes")
-
-# vpnc support
-
-AC_ARG_WITH(vpnc, AC_HELP_STRING([--with-vpnc], [Build KNetworkManager with vpnc plugin]))
-if test "x$with_vpnc" = "x"; then
-	AC_CHECK_FILE(/etc/NetworkManager/VPN/nm-vpnc-service.name,with_vpnc="yes" )
-fi
-AM_CONDITIONAL(WITH_VPNC, test x"$with_vpnc" = "xyes")
-
-# pptp support
-
-AC_ARG_WITH(pptp, AC_HELP_STRING([--with-pptp], [Build KNetworkManager with pptp plugin]))
-if test "x$with_pptp" = "x"; then
-	AC_CHECK_FILE(/etc/NetworkManager/VPN/nm-pptp-service.name,with_pptp="yes" )
-fi
-AM_CONDITIONAL(WITH_PPTP, test x"$with_pptp" = "xyes")
-
-# strongswan support
-
-AC_ARG_WITH(strongswan, AC_HELP_STRING([--with-strongswan], [Build KNetworkManager with strongswan plugin]))
-if test "x$with_strongswan" = "x"; then
-	AC_CHECK_FILE(/etc/NetworkManager/VPN/nm-strongswan-service.name,with_strongswan="yes" )
-fi
-AM_CONDITIONAL(WITH_STRONGSWAN, test x"$with_strongswan" = "xyes")
-
-# 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-0.8/src"
-AC_SUBST(KNETWORKMANAGER_CFLAGS)
diff --git a/knetworkmanager-0.9/introspection/Makefile.am b/knetworkmanager-0.9/introspection/Makefile.am
deleted file mode 100644
index b16f0ae..0000000
--- a/knetworkmanager-0.9/introspection/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-EXTRA_DIST =						\
-	nm-access-point.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-vpn-manager.xml				\
-	nm-vpn-plugin.xml				\
-	nm-vpn-connection.xml
-
diff --git a/knetworkmanager-0.9/introspection/nm-access-point.xml b/knetworkmanager-0.9/introspection/nm-access-point.xml
deleted file mode 100644
index 5a42f95..0000000
--- a/knetworkmanager-0.9/introspection/nm-access-point.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.NetworkManager.AccessPoint">
-    <property name="Flags" type="u" access="read" tp:type="NM_802_11_AP_FLAGS">
-      <tp:docstring>Flags describing the capabilities of the access point.</tp:docstring>
-    </property>
-    <property name="WpaFlags" type="u" access="read" tp:type="NM_802_11_AP_SEC">
-      <tp:docstring>Flags describing the access point's capabilities according to WPA (Wifi Protected Access).</tp:docstring>
-    </property>
-    <property name="RsnFlags" type="u" access="read" tp:type="NM_802_11_AP_SEC">
-      <tp:docstring>Flags describing the access point's capabilities according to the RSN (Robust Secure Network) protocol.</tp:docstring>
-    </property>
-    <property name="Ssid" type="ay" access="read">
-      <tp:docstring>The Service Set Identifier identifying the access point.</tp:docstring>
-    </property>
-    <property name="Frequency" type="u" access="read">
-      <tp:docstring>The radio channel frequency in use by the access point, in MHz.</tp:docstring>
-    </property>
-    <property name="HwAddress" type="s" access="read">
-      <tp:docstring>The hardware address of the access point.</tp:docstring>
-    </property>
-
-    <property name="Mode" type="u" access="read" tp:type="NM_802_11_MODE">
-      <tp:docstring>Describes the operating mode of the access point.</tp:docstring>
-    </property>
-    <property name="MaxBitrate" type="u" access="read">
-      <tp:docstring>The maximum bitrate this access point is capable of, in kilobits/second (Kb/s).</tp:docstring>
-    </property>
-    <property name="Strength" type="y" access="read">
-      <tp:docstring>The current signal strength received from this access point.</tp:docstring>
-    </property>
-
-    <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
-                A dictionary mapping property names to variant boxed values
-            </tp:docstring>
-        </arg>
-    </signal>
-    <tp:flags name="NM_802_11_AP_FLAGS" value-prefix="NM_802_11_AP_FLAGS" type="u">
-      <tp:docstring>
-        Flags describing the general capabilities of the access point.
-      </tp:docstring>
-      <tp:flag suffix="NONE" value="0x0">
-        <tp:docstring>Null capability - says nothing about the access point.</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="PRIVACY" value="0x1">
-        <tp:docstring>Access point supports privacy measures.</tp:docstring>
-      </tp:flag>
-    </tp:flags>
-    <tp:flags name="NM_802_11_AP_SEC" value-prefix="NM_802_11_AP_SEC" type="u">
-      <tp:docstring>
-        Flags describing the security capabilities of the access point.
-      </tp:docstring>
-      <tp:flag suffix="NONE" value="0x0">
-        <tp:docstring>Null flag.</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="PAIR_WEP40" value="0x1">
-        <tp:docstring>Access point supports pairwise 40-bit WEP encryption.</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="PAIR_WEP104" value="0x2">
-        <tp:docstring>Access point supports pairwise 104-bit WEP encryption.</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="PAIR_TKIP" value="0x4">
-        <tp:docstring>Access point supports pairwise TKIP encryption.</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="PAIR_CCMP" value="0x8">
-        <tp:docstring>Access point supports pairwise CCMP encryption.</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="GROUP_WEP40" value="0x10">
-        <tp:docstring>Access point supports a group 40-bit WEP cypher.</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="GROUP_WEP104" value="0x20">
-        <tp:docstring>Access point supports a group 104-bit WEP cypher.</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="GROUP_TKIP" value="0x40">
-        <tp:docstring>Access point supports a group TKIP cypher.</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="GROUP_CCMP" value="0x80">
-        <tp:docstring>Access point supports a group CCMP cypher.</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="KEY_MGMT_PSK" value="0x100">
-        <tp:docstring>Access point supports PSK key management.</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="KEY_MGMT_802_1X" value="0x200">
-        <tp:docstring>Access point supports 802.1x key management.</tp:docstring>
-      </tp:flag>
-    </tp:flags>
-  </interface>
-</node>
-
diff --git a/knetworkmanager-0.9/introspection/nm-active-connection.xml b/knetworkmanager-0.9/introspection/nm-active-connection.xml
deleted file mode 100644
index f69d2f6..0000000
--- a/knetworkmanager-0.9/introspection/nm-active-connection.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.NetworkManager.Connection.Active">
-    <property name="ServiceName" type="s" access="read">
-      <tp:docstring>The D-Bus service name providing this connection.</tp:docstring>
-    </property>
-    <property name="Connection" type="o" access="read">
-      <tp:docstring>The path of the connection.</tp:docstring>
-    </property>
-    <property name="SpecificObject" type="o" access="read">
-      <tp:docstring>A specific object associated with the active connection.</tp:docstring>
-    </property>
-    <property name="SharedServiceName" type="s" access="read">
-      <tp:docstring>The D-Bus service name that provides a connection with which this active connection is shared.</tp:docstring>
-    </property>
-    <property name="SharedConnection" type="o" access="read">
-      <tp:docstring>The path of a connection provided by the D-Bus service SharedServiceName which which this connection is shared.</tp:docstring>
-    </property>
-    <property name="Devices" type="ao" access="read">
-      <tp:docstring>Array of object paths representing devices which are part of this active connection.</tp:docstring>
-    </property>
-    <property name="State" type="u" access="read" tp:type="NM_ACTIVE_DEVICE_STATE">
-      <tp:docstring>The state of this active connection.</tp:docstring>
-    </property>
-    <property name="Default" type="b" access="read">
-      <tp:docstring>Whether this active connection is the default connection, i.e. whether it currently owns the default route.</tp:docstring>
-    </property>
-
-    <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
-                A dictionary mapping property names to variant boxed values
-            </tp:docstring>
-        </arg>
-    </signal>
-
-    <tp:enum name="NM_ACTIVE_CONNECTION_STATE" type="u">
-      <tp:enumvalue suffix="UNKNOWN" value="0">
-        <tp:docstring>
-          The active connection is in an unknown state.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="ACTIVATING" value="1">
-        <tp:docstring>
-          The connection is activating.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="ACTIVATED" value="2">
-        <tp:docstring>
-          The connection is activated.
-        </tp:docstring>
-      </tp:enumvalue>
-    </tp:enum>
-  </interface>
-</node>
-
diff --git a/knetworkmanager-0.9/introspection/nm-device-802-11-wireless.xml b/knetworkmanager-0.9/introspection/nm-device-802-11-wireless.xml
deleted file mode 100644
index 6b31b3a..0000000
--- a/knetworkmanager-0.9/introspection/nm-device-802-11-wireless.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.NetworkManager.Device.Wireless">
-    <method name="GetAccessPoints">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_get_access_points"/>
-      <arg name="access_points" type="ao" direction="out">
-        <tp:docstring>
-          List of access point object paths
-        </tp:docstring>
-      </arg>
-      <tp:docstring>
-        Get the list of access points visible to this device.
-      </tp:docstring>
-    </method>
-
-    <property name="HwAddress" type="s" access="read">
-      <tp:docstring>
-        The hardware address of the device.
-      </tp:docstring>
-    </property>
-    <property name="Mode" type="u" access="read" tp:type="NM_802_11_MODE">
-      <tp:docstring>
-        The operating mode of the wireless device.
-      </tp:docstring>
-    </property>
-
-    <property name="Bitrate" type="u" access="read">
-      <tp:docstring>
-        The bit rate currently used by the wireless device, in kilobits/second (Kb/s).
-      </tp:docstring>
-    </property>
-    <property name="ActiveAccessPoint" type="o" access="read">
-      <tp:docstring>
-        Object path of the access point currently used by the wireless device.
-      </tp:docstring>
-    </property>
-    <property name="WirelessCapabilities" type="u" access="read" tp:type="NM_802_11_DEVICE_CAP">
-      <tp:docstring>
-        The capabilities of the wireless device.
-      </tp:docstring>
-    </property>
-
-    <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
-                A dictionary containing the FIXME: check changed parameters.
-            </tp:docstring>
-        </arg>
-        <tp:docstring>
-            Emitted when the wireless device's properties changed.
-        </tp:docstring>
-    </signal>
-
-    <signal name="AccessPointAdded">
-        <arg name="access_point" type="o">
-            <tp:docstring>
-                The object path of the newly found access point.
-            </tp:docstring>
-        </arg>
-        <tp:docstring>
-            Emitted when a new access point is found by the device.
-        </tp:docstring>
-    </signal>
-
-    <signal name="AccessPointRemoved">
-      <arg name="access_point" type="o">
-            <tp:docstring>
-                The object path of the access point that has disappeared.
-            </tp:docstring>
-        </arg>
-        <tp:docstring>
-            Emitted when an access point disappears from view of the device.
-        </tp:docstring>
-    </signal>
-
-    <tp:flags name="NM_802_11_DEVICE_CAP" type="u">
-      <tp:docstring>
-        Flags describing the capabilities of a wireless device.
-      </tp:docstring>
-      <tp:flag suffix="NONE" value="0x0">
-        <tp:docstring>Null capability - syntactic sugar for no capabilities supported.  Do not AND this with other capabilities!</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="CIPHER_WEP40" value="0x1">
-        <tp:docstring>The device supports the 40-bit WEP cypher.</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="CIPHER_WEP104" value="0x2">
-        <tp:docstring>The device supports the 104-bit WEP cypher.</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="CIPHER_TKIP" value="0x4">
-        <tp:docstring>The device supports the TKIP cypher.</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="CIPHER_CCMP" value="0x8">
-        <tp:docstring>The device supports the CCMP cypher.</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="WPA" value="0x10">
-        <tp:docstring>The device supports the WPA encryption/authentication protocol.</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="RSN" value="0x20">
-        <tp:docstring>The device supports the RSN encryption/authentication protocol.</tp:docstring>
-      </tp:flag>
-    </tp:flags>
-  </interface>
-</node>
diff --git a/knetworkmanager-0.9/introspection/nm-device-802-3-ethernet.xml b/knetworkmanager-0.9/introspection/nm-device-802-3-ethernet.xml
deleted file mode 100644
index cccae99..0000000
--- a/knetworkmanager-0.9/introspection/nm-device-802-3-ethernet.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.NetworkManager.Device.Wired">
-
-    <property name="HwAddress" type="s" access="read">
-      <tp:docstring>
-        Hardware address of the device.
-      </tp:docstring>
-    </property>
-
-    <property name="Speed" type="u" access="read">
-      <tp:docstring>
-        Design speed of the device.
-      </tp:docstring>
-    </property>
-
-    <property name="Carrier" type="b" access="read">
-      <tp:docstring>
-        Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
-      </tp:docstring>
-    </property>
-
-    <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
-                A dictionary mapping property names to variant boxed values
-            </tp:docstring>
-        </arg>
-    </signal>
-
-  </interface>
-</node>
diff --git a/knetworkmanager-0.9/introspection/nm-device-cdma.xml b/knetworkmanager-0.9/introspection/nm-device-cdma.xml
deleted file mode 100644
index 2b43f8f..0000000
--- a/knetworkmanager-0.9/introspection/nm-device-cdma.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.NetworkManager.Device.Cdma">
-
-    <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
-                A dictionary mapping property names to variant boxed values
-            </tp:docstring>
-        </arg>
-    </signal>
-
-  </interface>
-</node>
diff --git a/knetworkmanager-0.9/introspection/nm-device-gsm.xml b/knetworkmanager-0.9/introspection/nm-device-gsm.xml
deleted file mode 100644
index 650d656..0000000
--- a/knetworkmanager-0.9/introspection/nm-device-gsm.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.NetworkManager.Device.Gsm">
-
-    <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
-                A dictionary mapping property names to variant boxed values
-            </tp:docstring>
-        </arg>
-    </signal>
-
-  </interface>
-</node>
diff --git a/knetworkmanager-0.9/introspection/nm-device.xml b/knetworkmanager-0.9/introspection/nm-device.xml
deleted file mode 100644
index 848942a..0000000
--- a/knetworkmanager-0.9/introspection/nm-device.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.NetworkManager.Device">
-    <property name="Udi" type="s" access="read">
-      <tp:docstring>
-        HAL UDI for the device.
-      </tp:docstring>
-    </property>
-    <property name="Interface" type="s" access="read">
-      <tp:docstring>
-        The network interface offered by the device.
-      </tp:docstring>
-    </property>
-    <property name="Driver" type="s" access="read">
-      <tp:docstring>
-        The driver handling the device.
-      </tp:docstring>
-    </property>
-    <property name="Capabilities" type="u" access="read" tp:type="NM_DEVICE_CAP">
-      <tp:docstring>
-        Flags describing the capabilities of the device.
-      </tp:docstring>
-    </property>
-    <property name="Ip4Address" type="i" access="read">
-      <tp:docstring>
-        The IPv4 address bound to the device. FIXME: what about devices with >1 IP address?
-      </tp:docstring>
-    </property>
-    <property name="State" type="u" access="read" tp:type="NM_DEVICE_STATE">
-      <tp:docstring>
-        The current state of the device.
-      </tp:docstring>
-    </property>
-    <property name="Ip4Config" type="o" access="read">
-      <tp:docstring>
-        Object path of the Ip4Config object describing the configuration of the device.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.
-      </tp:docstring>
-    </property>
-    <property name="Managed" type="b" access="read">
-      <tp:docstring>
-        Whether or not this device is managed by NetworkManager.
-      </tp:docstring>
-    </property>
-
-    <!-- Ugh, but I see no other way of getting the type on the caller
-    based on dbus object path only -->
-    <property name="DeviceType" type="u" access="read">
-      <tp:docstring>
-      </tp:docstring>
-    </property>
-
-
-    <signal name="StateChanged">
-      <arg name="state" type="u" tp:type="NM_DEVICE_STATE">
-        <tp:docstring>
-          The new state of the device.
-        </tp:docstring>
-      </arg>
-    </signal>
-
-    <tp:enum name="NM_DEVICE_STATE" type="u">
-      <tp:enumvalue suffix="UNKNOWN" value="0">
-        <tp:docstring>
-          The device is in an unknown state.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="DOWN" value="1">
-        <tp:docstring>
-          The device is down.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="DISCONNECTED" value="2">
-        <tp:docstring>
-          The device is not connected.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="PREPARE" value="3">
-        <tp:docstring>
-          The device is preparing to connect.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="CONFIG" value="4">
-        <tp:docstring>
-          The device is being configured.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="NEED_AUTH" value="5">
-        <tp:docstring>
-          The device is awaiting authorization credentials.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="IP_CONFIG" value="6">
-        <tp:docstring>
-          The IP address of the device is being configured.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="ACTIVATED" value="7">
-        <tp:docstring>
-          The device is active.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="FAILED" value="8">
-        <tp:docstring>
-          The device is in a failure state following an attempt to activate it.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="CANCELLED" value="9">
-        <tp:docstring>
-          The previous activation attempt on this device was cancelled.
-        </tp:docstring>
-      </tp:enumvalue>
-    </tp:enum>
-    <tp:flags name="NM_DEVICE_CAP" value-prefix="NM_DEVICE_CAP" type="u">
-      <tp:flag suffix="NONE" value="0x0">
-        <tp:docstring>Null capability.</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="NM_SUPPORTED" value="0x1">
-        <tp:docstring>The device is supported by NetworkManager.</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="CARRIER_DETECT" value="0x2">
-        <tp:docstring>The device supports carrier detection.</tp:docstring>
-      </tp:flag>
-    </tp:flags>
-  </interface>
-</node>
diff --git a/knetworkmanager-0.9/introspection/nm-exported-connection.xml b/knetworkmanager-0.9/introspection/nm-exported-connection.xml
deleted file mode 100644
index 251ccaf..0000000
--- a/knetworkmanager-0.9/introspection/nm-exported-connection.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-
-    <interface name="org.freedesktop.NetworkManagerSettings.Connection">
-        <tp:docstring>
-            Represents a single network connection configuration.
-        </tp:docstring>
-        <method name="GetID">
-            <tp:docstring>
-                Obtain the ID of this connection.
-            </tp:docstring>
-            <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_exported_connection_get_id"/>
-            <arg name="id" type="s" direction="out">
-                <tp:docstring>
-                    The ID of this connection.
-                </tp:docstring>
-            </arg>
-        </method>
-
-	<method name="Update">
-	  <tp:docstring>
-	    Update the connection.
-	  </tp:docstring>
-	  <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_exported_connection_update"/>
-	  <arg name="properties" type="a{sa{sv}}" direction="in">
-	    <tp:docstring>
-	      New connection properties.
-	    </tp:docstring>
-	  </arg>
-	</method>
-
-	<method name="Delete">
-	  <tp:docstring>
-	    Delete the connection.
-	  </tp:docstring>
-	  <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_exported_connection_delete"/>
-	</method>
-
-        <method name="GetSettings">
-            <tp:docstring>
-                Get the settings maps describing this object.
-            </tp:docstring>
-            <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_exported_connection_get_settings"/>
-            <arg name="settings" type="a{sa{sv}}" direction="out" tp:type="String_String_Variant_Map_Map">
-                <tp:docstring>
-                    The nested settings maps describing this object.
-                </tp:docstring>
-            </arg>
-        </method>
-
-        <signal name="Updated">
-            <tp:docstring>
-                Emitted when some settings changed.
-            </tp:docstring>
-            <arg name="settings" type="a{sa{sv}}" tp:type="String_String_Variant_Map_Map">
-                <tp:docstring>
-                    Contains the changed settings.
-                </tp:docstring>
-            </arg>
-        </signal>
-
-        <signal name="Removed">
-            <tp:docstring>
-                Emitted when this settings object was removed. FIXME: Is this emitted after it was removed or when it is about to be removed?  If after removed, then different semantics to Device removed.  if prior to removal, should be called AboutToBeRemoved.
-            </tp:docstring>
-        </signal>
-
-    </interface>
-
-    <interface name="org.freedesktop.NetworkManagerSettings.Connection.Secrets">
-        <tp:docstring>
-            Secrets have a separate interface so that they can be locked down.
-        </tp:docstring>
-
-        <method name="GetSecrets">
-            <tp:docstring>
-                Get the secrets encapsulated in this object.
-            </tp:docstring>
-            <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_exported_connection_get_secrets"/>
-            <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-            <arg name="setting_name" type="s" direction="in">
-                <tp:docstring>
-                    Name of the setting to return.
-                </tp:docstring>
-            </arg>
-            <arg name="hints" type="as" direction="in">
-                <tp:docstring>
-                    Array of strings of key names in the Setting for which NM thinks
-                    a secrets may be required.
-                </tp:docstring>
-            </arg>
-            <arg name="request_new" type="b" direction="in">
-                <tp:docstring>
-                    Indicates whether new secrets should be requested or if the request can be fulfilled from storage.
-                </tp:docstring>
-            </arg>
-
-            <arg name="secrets" type="a{sa{sv}}" direction="out" tp:type="String_String_Variant_Map_Map">
-                <tp:docstring>
-                    Nested settings maps containing secrets.  Each setting MUST contain at least the 'name' field, containing the name of the setting, and one or more secrets.
-                </tp:docstring>
-            </arg>
-        </method>
-
-    </interface>
-
-</node>
diff --git a/knetworkmanager-0.9/introspection/nm-ip4-config.xml b/knetworkmanager-0.9/introspection/nm-ip4-config.xml
deleted file mode 100644
index 8e3bf57..0000000
--- a/knetworkmanager-0.9/introspection/nm-ip4-config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.NetworkManager.IP4Config">
-    <property name="Addresses" type="aau" access="read">
-      <tp:docstring>Tuples of IPv4 address/netmask/gateway.  The gateway is optional, if not given should be 0.</tp:docstring>
-    </property>
-    <property name="Hostname" type="s" access="read">
-      <tp:docstring>The hostname associated with this IPv4 address. FIXME: what about multiple hostnames?</tp:docstring>
-    </property>
-    <property name="Nameservers" type="au" access="read">
-      <tp:docstring>The nameservers in use.</tp:docstring>
-    </property>
-    <property name="Domains" type="as" access="read">
-      <tp:docstring>A list of domains this address belongs to.</tp:docstring>
-    </property>
-    <property name="NisDomain" type="s" access="read">
-      <tp:docstring>The NIS domain this address belongs to.</tp:docstring>
-    </property>
-    <property name="NisServers" type="au" access="read">
-      <tp:docstring>The NIS servers associated with this address.</tp:docstring>
-    </property>
-  </interface>
-</node>
-
diff --git a/knetworkmanager-0.9/introspection/nm-manager-client.xml b/knetworkmanager-0.9/introspection/nm-manager-client.xml
deleted file mode 100644
index cf89611..0000000
--- a/knetworkmanager-0.9/introspection/nm-manager-client.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!-- 
-READ ME! READ ME! READ ME! READ ME! READ ME!
-
-This file needs to be kept in sync with nm-manager.xml with the exception of
-the legacy methods at the end of nm-manager.xml.
-
-This file is only used to ensure that a few legacy 0.6 D-DBus methods that
-NM supports don't leak into libnm-glib, but are only exposed by the NMManager
-object.  dbus-glib generates the same bound function names for D-Bus the methods
-"sleep" and "Sleep", unfortunately.
--->
-
-<node name="/">
-  <interface name="org.freedesktop.NetworkManager">
-    <method name="GetDevices">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_devices"/>
-      <arg name="devices" type="ao" direction="out"/>
-    </method>
-
-    <method name="ActivateConnection">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_activate_connection"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg name="service_name" type="s" direction="in"/>
-      <arg name="connection" type="o" direction="in"/>
-      <arg name="device" type="o" direction="in"/>
-      <arg name="specific_object" type="o" direction="in"/>
-      <arg name="active_connection" type="o" direction="out"/>
-    </method>
-
-    <method name="DeactivateConnection">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_deactivate_connection"/>
-      <arg name="active_connection" type="o" direction="in"/>
-    </method>
-
-    <method name="Sleep">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_sleep"/>
-      <arg name="sleep" type="b" direction="in"/>
-    </method>
-
-    <property name="WirelessEnabled" type="b" access="readwrite"/>
-    <property name="WirelessHardwareEnabled" type="b" access="read"/>
-    <property name="ActiveConnections" type="ao" access="read"/>
-    <property name="State" type="u" access="read"/>
-
-    <signal name="StateChanged">
-      <arg name="state" type="u"/>
-    </signal>
-
-    <signal name="PropertiesChanged">
-      <arg name="properties" type="a{sv}"/>
-    </signal>
-
-    <signal name="DeviceAdded">
-      <arg name="state" type="o"/>
-    </signal>
-
-    <signal name="DeviceRemoved">
-      <arg name="state" type="o"/>
-    </signal>
-  </interface>
-</node>
diff --git a/knetworkmanager-0.9/introspection/nm-manager.xml b/knetworkmanager-0.9/introspection/nm-manager.xml
deleted file mode 100644
index a93ee58..0000000
--- a/knetworkmanager-0.9/introspection/nm-manager.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!-- 
-  READ ME! READ ME! READ ME! READ ME! READ ME!
-
-  This file needs to be kept in sync with nm-manager-client.xml with the exception of
-  the legacy methods at the end of this file.
--->
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.NetworkManager">
-    <method name="GetDevices">
-      <tp:docstring>
-        Get the list of network devices.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_devices"/>
-      <arg name="devices" type="ao" direction="out">
-        <tp:docstring>
-          List of object paths of network devices known to the system.
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <method name="ActivateConnection">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_activate_connection"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <tp:docstring>
-        Activate a connection using the supplied device.
-      </tp:docstring>
-      <arg name="service_name" type="s" direction="in">
-        <tp:docstring>
-          The D-Bus service name of the settings service that provides this connection.
-        </tp:docstring>
-      </arg>
-      <arg name="connection" type="o" direction="in">
-        <tp:docstring>
-          The connection to activate the devices with.
-        </tp:docstring>
-      </arg>
-      <arg name="device" type="o" direction="in">
-        <tp:docstring>
-          The device to be activated.
-        </tp:docstring>
-      </arg>
-      <arg name="specific_object" type="o" direction="in">
-        <tp:docstring>
-          The path of a device-type-specific object this activation should use, for example a WiFi access point.
-        </tp:docstring>
-      </arg>
-      <arg name="active_connection" type="o" direction="out">
-        <tp:docstring>
-          The path of the active connection object representing this active connection.
-        </tp:docstring>
-      </arg>
-      <tp:possible-errors>
-        <tp:error name="org.freedesktop.NetworkManager.Error.UnknownConnection"/>
-        <tp:error name="org.freedesktop.NetworkManager.Error.UnknownDevice"/>
-        <tp:error name="org.freedesktop.NetworkManager.Error.InvalidService"/>
-        <tp:error name="org.freedesktop.NetworkManager.Error.ConnectionActivating">
-          <tp:docstring>Another connection is already activating or the same connection is already active.  FIXME: check if the error name is correct.  FIXME: split into 2 errors?</tp:docstring>
-        </tp:error>
-        <tp:error name="org.freedesktop.NetworkManager.Error.ConnectionInvalid">
-          <tp:docstring>The connection is invalid for this device.</tp:docstring>
-        </tp:error>
-      </tp:possible-errors>
-    </method>
-
-    <method name="DeactivateConnection">
-      <tp:docstring>
-        Deactivate an active connection.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_deactivate_connection"/>
-      <arg name="active_connection" type="o" direction="in">
-        <tp:docstring>
-          The currently active connection to deactivate.
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <method name="Sleep">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_sleep"/>
-      <tp:docstring>
-        Control the NetworkManager daemon's sleep state.  When asleep, all interfaces that it manages are deactivated.  When awake, devices are available to be activated.
-      </tp:docstring>
-      <arg name="sleep" type="b" direction="in">
-        <tp:docstring>
-          Indicates whether the NetworkManager daemon should sleep or wake.
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <property name="WirelessEnabled" type="b" access="readwrite">
-      <tp:docstring>
-        Indicates if wireless is currently enabled or not.
-      </tp:docstring>
-    </property>
-
-    <property name="WirelessHardwareEnabled" type="b" access="read">
-      <tp:docstring>
-        Indicates if the wireless hardware is currently enabled, i.e. the state of the RF kill switch.
-      </tp:docstring>
-    </property>
-
-    <property name="ActiveConnections" type="ao" access="read">
-      <tp:docstring>
-        List of active connection object paths.
-      </tp:docstring>
-    </property>
-
-    <property name="State" type="u" access="read" tp:type="NM_STATE">
-      <tp:docstring>
-        The overall state of the NetworkManager daemon.
-      </tp:docstring>
-    </property>
-
-    <signal name="StateChanged">
-      <tp:docstring>
-        NetworkManager's state changed.
-      </tp:docstring>
-      <arg name="state" type="u" tp:type="NM_STATE">
-        <tp:docstring>
-          The new state of NetworkManager.
-        </tp:docstring>
-      </arg>
-    </signal>
-
-    <signal name="PropertiesChanged">
-      <tp:docstring>
-        NetworkManager's properties changed.
-      </tp:docstring>
-      <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-        <tp:docstring>
-          The changed properties.
-        </tp:docstring>
-      </arg>
-    </signal>
-
-    <signal name="DeviceAdded">
-      <tp:docstring>
-        A device was added to the system
-      </tp:docstring>
-      <arg name="device_path" type="o">
-        <tp:docstring>
-          The object path of the newly added device.
-        </tp:docstring>
-      </arg>
-    </signal>
-
-    <signal name="DeviceRemoved">
-      <tp:docstring>
-        A device was removed from the system, and is no longer available.
-      </tp:docstring>
-      <arg name="device_path" type="o">
-        <tp:docstring>
-          The object path of the device that was just removed.
-        </tp:docstring>
-      </arg>
-    </signal>
-
-    <tp:enum name="NM_STATE" type="u">
-      <tp:docstring>
-        Describes the overall state of the daemon.
-      </tp:docstring>
-      <tp:enumvalue suffix="UNKNOWN" value="0">
-        <tp:docstring>
-          The NetworkManager daemon is in an unknown state.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="ASLEEP" value="1">
-        <tp:docstring>
-          The NetworkManager daemon is asleep and all interfaces managed by it are inactive.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="CONNECTING" value="2">
-        <tp:docstring>
-          The NetworkManager daemon is connecting a device.  FIXME: What does this mean when one device is active and another is connecting?
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="CONNECTED" value="3">
-        <tp:docstring>
-          The NetworkManager daemon is connected.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="DISCONNECTED" value="4">
-        <tp:docstring>
-          The NetworkManager daemon is disconnected.
-        </tp:docstring>
-      </tp:enumvalue>
-    </tp:enum>
-
-    <!-- Legacy methods to maintain backwards compatibility for 0.6 branch. -->
-
-    <signal name="StateChange">
-      <tp:docstring>
-        DEPRECATED.  NetworkManager's state changed.  Use the 'StateChanged' signal instead.
-      </tp:docstring>
-      <arg name="state" type="u" tp:type="NM_STATE">
-        <tp:docstring>
-          The new state of NetworkManager.
-        </tp:docstring>
-      </arg>
-    </signal>
-
-    <method name="sleep">
-      <tp:docstring>
-        DEPRECATED.  Control the NetworkManager daemon's sleep state.  When asleep, all interfaces that it manages are deactivated.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_legacy_sleep"/>
-    </method>
-
-    <method name="wake">
-      <tp:docstring>
-        DEPRECATED.  Control the NetworkManager daemon's sleep state.  When awake, all known interfaces are available to be activated.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_legacy_wake"/>
-    </method>
-
-    <method name="state">
-      <tp:docstring>
-        DEPRECATED.  The overall state of the NetworkManager daemon.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_legacy_state"/>
-      <arg name="state" type="u" direction="out" tp:type="NM_STATE"/>
-    </method>
-
-  </interface>
-</node>
diff --git a/knetworkmanager-0.9/introspection/nm-ppp-manager.xml b/knetworkmanager-0.9/introspection/nm-ppp-manager.xml
deleted file mode 100644
index 9e2dfdb..0000000
--- a/knetworkmanager-0.9/introspection/nm-ppp-manager.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/">
-  <interface name="org.freedesktop.NetworkManager.PPP">
-    <method name="NeedSecrets">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_ppp_manager_need_secrets"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg name="username" type="s" direction="out"/>
-      <arg name="password" type="s" direction="out"/>
-    </method>
-
-    <method name="SetIp4Config">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_ppp_manager_set_ip4_config"/>
-      <arg name="config" type="a{sv}" direction="in"/>
-    </method>
-
-    <method name="SetState">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_ppp_manager_set_state"/>
-      <arg name="state" type="u" direction="in"/>
-    </method>
-  </interface>
-</node>
diff --git a/knetworkmanager-0.9/introspection/nm-settings.xml b/knetworkmanager-0.9/introspection/nm-settings.xml
deleted file mode 100644
index 5e072f2..0000000
--- a/knetworkmanager-0.9/introspection/nm-settings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.NetworkManagerSettings">
-    <tp:docstring>
-      The NetworkManagerSettings interface is provided by the service which provides connections to NetworkManager.
-    </tp:docstring>
-
-    <method name="ListConnections">
-      <tp:docstring>
-        List the connections stored by this Settings object.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_list_connections"/>
-      <arg name="connections" type="ao" direction="out">
-        <tp:docstring>
-          List of connections.
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <signal name="NewConnection">
-      <tp:docstring>
-        Emitted when a new connection has been configured.
-      </tp:docstring>
-      <arg name="connection" type="o">
-        <tp:docstring>
-          Object path of the new connection.
-        </tp:docstring>
-      </arg>
-    </signal>
-  </interface>
-</node>
diff --git a/knetworkmanager-0.9/introspection/nm-vpn-connection-only.xml b/knetworkmanager-0.9/introspection/nm-vpn-connection-only.xml
deleted file mode 100644
index 8feee03..0000000
--- a/knetworkmanager-0.9/introspection/nm-vpn-connection-only.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.NetworkManager.VPN.Connection">
-    <tp:docstring>
-      Represents an active connection to a Virtual Private Network.
-    </tp:docstring>
-
-    <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
-                A dictionary mapping property names to variant boxed values
-            </tp:docstring>
-        </arg>
-    </signal>
-
-    <property name="VpnState" type="u" access="read" tp:type="NM_VPN_CONNECTION_STATE">
-      <tp:docstring>The VPN-specific state of the connection.</tp:docstring>
-    </property>
-    <property name="Banner" type="s" access="read">
-      <tp:docstring>The banner string of the VPN connection.</tp:docstring>
-    </property>
-
-    <signal name="VpnStateChanged">
-      <tp:docstring>
-        Emitted when the state of the VPN connection has changed.
-      </tp:docstring>
-      <arg name="state" type="u" tp:type="NM_VPN_CONNECTION_STATE">
-        <tp:docstring>
-          The new state of the VPN connection.
-        </tp:docstring>
-      </arg>
-      <arg name="reason" type="u" tp:type="NM_VPN_CONNECTION_STATE_REASON">
-        <tp:docstring>
-          Reason code describing the change to the new state.
-        </tp:docstring>
-      </arg>
-    </signal>
-
-    <tp:enum name="NM_VPN_CONNECTION_STATE" type="u">
-      <tp:enumvalue suffix="UNKNOWN" value="0">
-        <tp:docstring>
-          The state of the VPN connection is unknown.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="PREPARE" value="1">
-        <tp:docstring>
-          The VPN connection is preparing to connect.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="NEED_AUTH" value="2">
-        <tp:docstring>
-          The VPN connection needs authorization credentials.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="CONNECT" value="3">
-        <tp:docstring>
-          The VPN connection is being established.  FIXME: Should be CONNECTING or CONNECTED.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="IP_CONFIG_GET" value="4">
-        <tp:docstring>
-          The VPN connection is getting an IP address.  FIXME: Should be an -ING 
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="ACTIVATED" value="5">
-        <tp:docstring>
-          The VPN connection is active.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="FAILED" value="6">
-        <tp:docstring>
-          The VPN connection failed.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="DISCONNECTED" value="7">
-        <tp:docstring>
-          The VPN connection is disconnected.
-        </tp:docstring>
-      </tp:enumvalue>
-    </tp:enum>
-    <tp:enum name="NM_VPN_CONNECTION_STATE_REASON" type="u">
-      <tp:enumvalue suffix="UNKNOWN" value="0">
-        <tp:docstring>
-          The reason for the VPN connection state change is unknown.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="NONE" value="1">
-        <tp:docstring>
-          No reason was given for the VPN connection state change.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="USER_DISCONNECTED" value="2">
-        <tp:docstring>
-          The VPN connection changed state because the user disconnected it.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="DEVICE_DISCONNECTED" value="3">
-        <tp:docstring>
-          The VPN connection changed state because the device it was using was disconnected.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="SERVICE_STOPPED" value="4">
-        <tp:docstring>
-          The service providing the VPN connection was stopped.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="IP_CONFIG_INVALID" value="5">
-        <tp:docstring>
-          The IP config of the VPN connection was invalid.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="CONNECT_TIMEOUT" value="6">
-        <tp:docstring>
-          The connection attempt to the VPN service timed out.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="SERVICE_START_TIMEOUT" value="7">
-        <tp:docstring>
-          A timeout occurred while starting the service providing the VPN connection.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="SERVICE_START_FAILED" value="8">
-        <tp:docstring>
-          Starting the service starting the service providing the VPN connection failed.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="NO_SECRETS" value="9">
-        <tp:docstring>
-          Necessary secrets for the VPN connection were not provided.
-        </tp:docstring>
-      </tp:enumvalue>
-    </tp:enum>
-  </interface>
-</node>
-
diff --git a/knetworkmanager-0.9/introspection/nm-vpn-connection.xml b/knetworkmanager-0.9/introspection/nm-vpn-connection.xml
deleted file mode 100644
index e5f74e1..0000000
--- a/knetworkmanager-0.9/introspection/nm-vpn-connection.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.NetworkManager.Connection.Active">
-    <property name="ServiceName" type="s" access="read">
-      <tp:docstring>The D-Bus service name providing this connection.</tp:docstring>
-    </property>
-    <property name="Connection" type="o" access="read">
-      <tp:docstring>The path of the connection.</tp:docstring>
-    </property>
-    <property name="SpecificObject" type="o" access="read">
-      <tp:docstring>A specific object associated with the active connection.</tp:docstring>
-    </property>
-    <property name="SharedServiceName" type="s" access="read">
-      <tp:docstring>The D-Bus service name that provides a connection with which this active connection is shared.</tp:docstring>
-    </property>
-    <property name="SharedConnection" type="o" access="read">
-      <tp:docstring>The path of a connection provided by the D-Bus service SharedServiceName which which this connection is shared.</tp:docstring>
-    </property>
-    <property name="Devices" type="ao" access="read">
-      <tp:docstring>Array of object paths representing devices which are part of this active connection.</tp:docstring>
-    </property>
-    <property name="State" type="u" access="read" tp:type="NM_ACTIVE_DEVICE_STATE">
-      <tp:docstring>The state of this active connection.</tp:docstring>
-    </property>
-    <property name="Default" type="b" access="read">
-      <tp:docstring>Whether this active connection is the default connection, i.e. whether it currently owns the default route.</tp:docstring>
-    </property>
-  </interface>
-
-  <interface name="org.freedesktop.NetworkManager.VPN.Connection">
-    <tp:docstring>
-      Represents an active connection to a Virtual Private Network.
-    </tp:docstring>
-
-    <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
-                A dictionary mapping property names to variant boxed values
-            </tp:docstring>
-        </arg>
-    </signal>
-
-    <property name="VpnState" type="u" access="read" tp:type="NM_VPN_CONNECTION_STATE">
-      <tp:docstring>The VPN-specific state of the connection.</tp:docstring>
-    </property>
-    <property name="Banner" type="s" access="read">
-      <tp:docstring>The banner string of the VPN connection.</tp:docstring>
-    </property>
-
-    <signal name="VpnStateChanged">
-      <tp:docstring>
-        Emitted when the state of the VPN connection has changed.
-      </tp:docstring>
-      <arg name="state" type="u" tp:type="NM_VPN_CONNECTION_STATE">
-        <tp:docstring>
-          The new state of the VPN connection.
-        </tp:docstring>
-      </arg>
-      <arg name="reason" type="u" tp:type="NM_VPN_CONNECTION_STATE_REASON">
-        <tp:docstring>
-          Reason code describing the change to the new state.
-        </tp:docstring>
-      </arg>
-    </signal>
-
-    <tp:enum name="NM_VPN_CONNECTION_STATE" type="u">
-      <tp:enumvalue suffix="UNKNOWN" value="0">
-        <tp:docstring>
-          The state of the VPN connection is unknown.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="PREPARE" value="1">
-        <tp:docstring>
-          The VPN connection is preparing to connect.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="NEED_AUTH" value="2">
-        <tp:docstring>
-          The VPN connection needs authorization credentials.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="CONNECT" value="3">
-        <tp:docstring>
-          The VPN connection is being established.  FIXME: Should be CONNECTING or CONNECTED.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="IP_CONFIG_GET" value="4">
-        <tp:docstring>
-          The VPN connection is getting an IP address.  FIXME: Should be an -ING 
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="ACTIVATED" value="5">
-        <tp:docstring>
-          The VPN connection is active.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="FAILED" value="6">
-        <tp:docstring>
-          The VPN connection failed.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="DISCONNECTED" value="7">
-        <tp:docstring>
-          The VPN connection is disconnected.
-        </tp:docstring>
-      </tp:enumvalue>
-    </tp:enum>
-    <tp:enum name="NM_VPN_CONNECTION_STATE_REASON" type="u">
-      <tp:enumvalue suffix="UNKNOWN" value="0">
-        <tp:docstring>
-          The reason for the VPN connection state change is unknown.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="NONE" value="1">
-        <tp:docstring>
-          No reason was given for the VPN connection state change.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="USER_DISCONNECTED" value="2">
-        <tp:docstring>
-          The VPN connection changed state because the user disconnected it.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="DEVICE_DISCONNECTED" value="3">
-        <tp:docstring>
-          The VPN connection changed state because the device it was using was disconnected.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="SERVICE_STOPPED" value="4">
-        <tp:docstring>
-          The service providing the VPN connection was stopped.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="IP_CONFIG_INVALID" value="5">
-        <tp:docstring>
-          The IP config of the VPN connection was invalid.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="CONNECT_TIMEOUT" value="6">
-        <tp:docstring>
-          The connection attempt to the VPN service timed out.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="SERVICE_START_TIMEOUT" value="7">
-        <tp:docstring>
-          A timeout occurred while starting the service providing the VPN connection.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="SERVICE_START_FAILED" value="8">
-        <tp:docstring>
-          Starting the service starting the service providing the VPN connection failed.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="NO_SECRETS" value="9">
-        <tp:docstring>
-          Necessary secrets for the VPN connection were not provided.
-        </tp:docstring>
-      </tp:enumvalue>
-    </tp:enum>
-  </interface>
-</node>
-
diff --git a/knetworkmanager-0.9/introspection/nm-vpn-manager.xml b/knetworkmanager-0.9/introspection/nm-vpn-manager.xml
deleted file mode 100644
index 57665f6..0000000
--- a/knetworkmanager-0.9/introspection/nm-vpn-manager.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.NetworkManager.VPN.Manager">
-    <method name="Connect">
-      <tp:docstring>
-        Establish a VPN connection.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_vpn_manager_connect"/>
-      <arg name="connection_type" type="s" direction="in">
-        <tp:docstring>
-          String describing the connection type.
-        </tp:docstring>
-      </arg>
-      <arg name="connection" type="o" direction="in">
-        <tp:docstring>
-          Object path of the network connection to establish the VPN connection on.
-        </tp:docstring>
-      </arg>
-      <arg name="device" type="o" direction="in">
-        <tp:docstring>
-          Object path of the device to establish the VPN connection on.
-        </tp:docstring>
-      </arg>
-      <arg name="vpn_connection" type="o" direction="out">
-        <tp:docstring>
-          Object path of the newly created VPN connection.
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <method name="ListConnections">
-      <tp:docstring>
-        Get the list of active VPN connections.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_vpn_manager_get_connections"/>
-      <arg name="connections" type="ao" direction="out">
-        <tp:docstring>
-          List of object paths of active VPN connections.
-        </tp:docstring>
-      </arg>
-    </method>
-
-  </interface>
-</node>
-
diff --git a/knetworkmanager-0.9/introspection/nm-vpn-plugin.xml b/knetworkmanager-0.9/introspection/nm-vpn-plugin.xml
deleted file mode 100644
index e7647e1..0000000
--- a/knetworkmanager-0.9/introspection/nm-vpn-plugin.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.NetworkManager.VPN.Plugin">
-    <tp:docstring>
-      This interface is provided by plugins providing VPN services to the NetworkManager daemon.
-    </tp:docstring>
-    <method name="Connect">
-      <tp:docstring>
-        Tells the plugin to connect.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_vpn_plugin_connect"/>
-      <arg name="connection" type="a{sa{sv}}" direction="in" tp:type="String_String_Variant_Map_Map">
-        <tp:docstring>
-          Describes the connection to be established.
-        </tp:docstring>
-      </arg>
-      <tp:possible-errors>
-        <tp:error name="org.freedesktop.NetworkManager.VPN.Error.StartingInProgress"/>
-        <tp:error name="org.freedesktop.NetworkManager.VPN.Error.AlreadyStarted"/>
-        <tp:error name="org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress"/>
-        <tp:error name="org.freedesktop.NetworkManager.VPN.Error.BadArguments"/>
-        <tp:error name="org.freedesktop.NetworkManager.VPN.Error.LaunchFailed"/>
-      </tp:possible-errors>
-    </method>
-
-    <method name="NeedSecrets">
-      <tp:docstring>
-        Asks the plugin whether the provided connection will require secrets to connect successfully.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_vpn_plugin_need_secrets"/>
-      <arg name="settings" type="a{sa{sv}}" direction="in" tp:type="String_String_Variant_Map_Map">
-        <tp:docstring>
-          Describes the connection that may need secrets.
-        </tp:docstring>
-      </arg>
-      <arg name="setting_name" type="s" direction="out">
-        <tp:docstring>
-          The setting name within the provided connection that requires secrets, if any.
-        </tp:docstring>
-      </arg>
-      <tp:possible-errors>
-        <tp:error name="org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid"/>
-      </tp:possible-errors>
-    </method>
-
-    <method name="Disconnect">
-      <tp:docstring>
-        Disconnect the plugin.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_vpn_plugin_disconnect"/>
-      <tp:possible-errors>
-        <tp:error name="org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress"/>
-        <tp:error name="org.freedesktop.NetworkManager.VPN.Error.AlreadyStopped"/>
-      </tp:possible-errors>
-    </method>
-
-    <method name="SetIp4Config">
-      <tp:docstring>
-        Set IPv4 details on the connection.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_vpn_plugin_set_ip4_config"/>
-      <arg name="config" type="a{sv}" direction="in" tp:type="String_Variant_Map">
-        <tp:docstring>
-          Ip4Config details for the conneciton.
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <method name="SetFailure">
-      <tp:docstring>
-        Indicate a failure to the plugin.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_vpn_plugin_set_failure"/>
-      <arg name="reason" type="s" direction="in">
-        <tp:docstring>
-          The reason for the failure.
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <property name="State" type="u" access="read" tp:type="NM_VPN_CONNECTION_STATE">
-      <tp:docstring>
-        The state of the plugin.
-      </tp:docstring>
-    </property>
-
-    <signal name="StateChanged">
-      <tp:docstring>
-        Emitted when the plugin state changes.
-      </tp:docstring>
-      <arg name="state" type="u" tp:type="NM_VPN_CONNECTION_STATE">
-        <tp:docstring>
-          The new state of the plugin.
-        </tp:docstring>
-      </arg>
-    </signal>
-
-    <signal name="Ip4Config">
-      <tp:docstring>
-        The plugin obtained an IPv4 configuration.
-      </tp:docstring>
-      <arg name="ip4config" type="a{sv}" tp:type="String_Variant_Map">
-        <tp:docstring>
-          The IPv4 configuration.
-        </tp:docstring>
-      </arg>
-    </signal>
-
-    <signal name="LoginBanner">
-      <tp:docstring>
-        Emitted when the plugin receives a login banner from the VPN service.
-      </tp:docstring>
-      <arg name="banner" type="s">
-        <tp:docstring>
-          The login banner string.
-        </tp:docstring>
-      </arg>
-    </signal>
-
-    <signal name="Failure">
-      <tp:docstring>
-        Emitted when a failure in the VPN plugin occurs.
-      </tp:docstring>
-      <arg name="reason" type="u" tp:type="NM_VPN_CONNECTION_STATE_REASON">
-        <tp:docstring>
-          Reason code for the failure.
-        </tp:docstring>
-      </arg>
-    </signal>
-  </interface>
-</node>
diff --git a/knetworkmanager-0.9/pics/Makefile.am b/knetworkmanager-0.9/pics/Makefile.am
deleted file mode 100644
index 464c17d..0000000
--- a/knetworkmanager-0.9/pics/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-knmicondir = $(kde_datadir)/knetworkmanager/icons
-knmicon_ICON = AUTO
-
-KDE_ICON = knetworkmanager knetworkmanager_disabled
-
diff --git a/knetworkmanager-0.9/po/Makefile.am b/knetworkmanager-0.9/po/Makefile.am
deleted file mode 100644
index 02dd0c1..0000000
--- a/knetworkmanager-0.9/po/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-POFILES = AUTO
-
diff --git a/knetworkmanager-0.9/src/Makefile.am b/knetworkmanager-0.9/src/Makefile.am
deleted file mode 100644
index 311bd8f..0000000
--- a/knetworkmanager-0.9/src/Makefile.am
+++ /dev/null
@@ -1,220 +0,0 @@
-SUBDIRS = dbus
-
-# set the include path for X, qt and KDE
-INCLUDES = $(PACKAGE_CFLAGS) $(all_includes)
-
-# headers to install
-include_HEADERS = knetworkmanager-plugin.h \
-                  knetworkmanager-vpnplugin.h
-
-# these are the headers for your project
-noinst_HEADERS = knetworkmanager.h \
-                 knetworkmanager-tray.h \
-                 knetworkmanager-hal_device_proxy.h \
-                 knetworkmanager-nm_proxy.h \
-                 knetworkmanager-device.h \
-                 knetworkmanager-wired_device.h \
-                 knetworkmanager-vpn_device.h \
-                 knetworkmanager-vpn_plugin.h \
-                 knetworkmanager-gsm_device.h \
-                 knetworkmanager-cdma_device.h \
-                 knetworkmanager-cellular_device.h \
-                 knetworkmanager-wireless_device.h \
-                 knetworkmanager-devicestore.h \
-                 knetworkmanager-cellular_device_tray.h \
-                 knetworkmanager-device_tray.h \
-                 knetworkmanager-wired_device_tray.h \
-                 knetworkmanager-wireless_device_tray.h \
-                 knetworkmanager-accesspoint.h \
-                 knetworkmanager-wireless_menuitem.h \
-                 knetworkmanager-menuitem.h \
-                 knetworkmanager-menu_subhead.h \
-                 knetworkmanager-connection_setting.h \
-                 knetworkmanager-connection_setting_info.h \
-                 knetworkmanager-connection_setting_ipv4.h \
-                 knetworkmanager-connection_setting_wired.h \
-                 knetworkmanager-connection_setting_wireless.h \
-                 knetworkmanager-connection_setting_wireless_security.h \
-                 knetworkmanager-connection_setting_8021x.h \
-                 knetworkmanager-connection_setting_vpn.h \
-                 knetworkmanager-connection_setting_serial.h \
-                 knetworkmanager-connection_setting_cdma.h \
-                 knetworkmanager-connection_setting_gsm.h \
-                 knetworkmanager-connection_setting_ppp.h \
-                 knetworkmanager-ppp_connection.h \
-                 knetworkmanager-cdma_connection.h \
-                 knetworkmanager-gsm_connection.h \
-                 knetworkmanager-wired_connection.h \
-                 knetworkmanager-vpn_connection.h \
-                 knetworkmanager-wireless_connection.h \
-                 knetworkmanager-generic_connection.h \
-                 knetworkmanager-connection.h \
-                 knetworkmanager-connection_dbus.h \
-                 knetworkmanager-connection_secrets_dbus.h \
-                 knetworkmanager-connection_store.h \
-                 knetworkmanager-connection_setting_gsm_widget.h \
-                 knetworkmanager-connection_setting_cdma_widget.h \
-                 knetworkmanager-connection_setting_info_widget.h \
-                 knetworkmanager-connection_setting_ipv4_widget.h \
-                 knetworkmanager-connection_setting_ppp_widget.h \
-                 knetworkmanager-connection_setting_serial_widget.h \
-                 knetworkmanager-connection_setting_widget_interface.h \
-                 knetworkmanager-connection_setting_wireless_security_widget.h \
-                 knetworkmanager-connection_setting_wireless_widget.h \
-                 knetworkmanager-connection_setting_vpn_widget.h \
-                 knetworkmanager-connection_setting_widget_interface.h \
-                 knetworkmanager-nmsettings.h \
-                 sha1.h \
-                 md5.h \
-                 xmlmarshaller.h \
-                 knetworkmanager-storage.h \
-                 knetworkmanager-wireless_network.h \
-                 knetworkmanager-wireless_manager.h \
-                 knetworkmanager-connection_editor.h \
-                 knetworkmanager-plugin.h \
-                 knetworkmanager-vpnplugin.h \
-                 knetworkmanager-pluginmanager.h \
-                 knetworkmanager-vpnservice.h \
-                 knetworkmanager-vpnmanager.h \
-                 knetworkmanager-vpnauthenticationdialog.h \
-                 devicetraycomponent.h \
-                 traycomponent.h \
-                 vpn_tray_component.h \
-                 secret_storage_plugin.h
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/knetworkmanager.pot
-
-#########################################################################
-# APPLICATION SECTION
-#########################################################################
-# this is the program that gets installed.  it's name is used for all
-# of the other Makefile.am variables
-bin_PROGRAMS =
-lib_LTLIBRARIES =
-tdeinit_LTLIBRARIES = knetworkmanager.la
-
-KDE_CXXFLAGS = -UQT_NO_ASCII_CAST ${LIBNMUTIL_CFLAGS}
-
-# the application source, library search path, and link libraries
-knetworkmanager_la_SOURCES = connection_setting_info.ui \
-                             connection_setting_wireless_security_wep.ui \
-                             connection_setting_gsm.ui \
-                             connection_setting_cdma.ui \
-                             connection_setting_ipv4.ui \
-                             connection_setting_ppp.ui \
-                             connection_setting_serial.ui \
-                             connection_setting_wireless_security_wpacipher.ui \
-                             connection_setting_wireless_security_eap.ui \
-                             connection_setting_wireless_security_wpapsk.ui \
-                             connection_setting_wireless_security_phase2.ui \
-                             connection_setting_wireless_security_wpaversion.ui \
-                             connection_setting_wireless_security.ui \
-                             connection_setting_wireless.ui \
-                             connection_setting_wireless_security_wepencryption.ui \
-                             connection_settings.ui \
-                             connection_setting_wireless_security_auth.ui \
-                             connection_setting_vpn.ui \
-                             connection_editor.ui \
-                             vpnauthentication.ui \
-                             main.cpp \
-                             knetworkmanager.cpp \
-                             knetworkmanager-tray.cpp \
-                             knetworkmanager-hal_device_proxy.cpp \
-                             knetworkmanager-nm_proxy.cpp \
-                             knetworkmanager-device.cpp \
-                             knetworkmanager-cdma_device.cpp \
-                             knetworkmanager-cellular_device.cpp \
-                             knetworkmanager-gsm_device.cpp \
-                             knetworkmanager-wired_device.cpp \
-                             knetworkmanager-vpn_device.cpp \
-                             knetworkmanager-vpn_plugin.cpp \
-                             knetworkmanager-wireless_device.cpp \
-                             knetworkmanager-devicestore.cpp \
-                             knetworkmanager-cellular_device_tray.cpp \
-                             knetworkmanager-device_tray.cpp \
-                             knetworkmanager-wired_device_tray.cpp \
-                             knetworkmanager-wireless_device_tray.cpp \
-                             knetworkmanager-accesspoint.cpp \
-                             knetworkmanager-wireless_menuitem.cpp \
-                             knetworkmanager-menuitem.cpp \
-                             knetworkmanager-menu_subhead.cpp \
-                             knetworkmanager-connection_setting.cpp \
-                             knetworkmanager-connection_setting_info.cpp \
-                             knetworkmanager-connection_setting_ipv4.cpp \
-                             knetworkmanager-connection_setting_wired.cpp \
-                             knetworkmanager-connection_setting_wireless.cpp \
-                             knetworkmanager-connection_setting_wireless_security.cpp \
-                             knetworkmanager-connection_setting_8021x.cpp \
-                             knetworkmanager-connection_setting_vpn.cpp \
-                             knetworkmanager-connection_setting_serial.cpp \
-                             knetworkmanager-connection_setting_cdma.cpp \
-                             knetworkmanager-connection_setting_gsm.cpp \
-                             knetworkmanager-connection_setting_ppp.cpp \
-                             knetworkmanager-connection_dbus.cpp \
-                             knetworkmanager-connection_secrets_dbus.cpp \
-                             knetworkmanager-connection.cpp \
-                             knetworkmanager-generic_connection.cpp \
-                             knetworkmanager-cdma_connection.cpp \
-                             knetworkmanager-gsm_connection.cpp \
-                             knetworkmanager-ppp_connection.cpp \
-                             knetworkmanager-wireless_connection.cpp \
-                             knetworkmanager-wired_connection.cpp \
-                             knetworkmanager-vpn_connection.cpp \
-                             knetworkmanager-connection_store.cpp \
-                             knetworkmanager-connection_setting_cdma_widget.cpp \
-                             knetworkmanager-connection_setting_gsm_widget.cpp \
-                             knetworkmanager-connection_setting_info_widget.cpp \
-                             knetworkmanager-connection_setting_ipv4_widget.cpp \
-                             knetworkmanager-connection_setting_ppp_widget.cpp \
-                             knetworkmanager-connection_setting_serial_widget.cpp \
-                             knetworkmanager-connection_setting_wireless_security_widget.cpp \
-                             knetworkmanager-connection_setting_wireless_widget.cpp \
-                             knetworkmanager-connection_setting_vpn_widget.cpp \
-                             knetworkmanager-connection_settings_dialog.cpp  \
-                             knetworkmanager-connection_setting_widget_interface.cpp  \
-                             knetworkmanager-nmsettings.cpp \
-                             sha1.cpp \
-                             md5.cpp \
-                             xmlmarshaller.cpp \
-                             knetworkmanager-storage.cpp \
-                             knetworkmanager-wireless_network.cpp \
-                             knetworkmanager-wireless_manager.cpp \
-                             knetworkmanager-connection_editor.cpp \
-                             knetworkmanager-plugin.cpp \
-                             knetworkmanager-vpnplugin.cpp \
-                             knetworkmanager-pluginmanager.cpp \
-                             knetworkmanager-vpnservice.cpp \
-                             knetworkmanager-vpnmanager.cpp \
-                             knetworkmanager-vpnauthenticationdialog.cpp \
-                             devicetraycomponent.cpp \
-                             traycomponent.cpp \
-                             vpn_tray_component.cpp \
-                             secret_storage_plugin.cpp
-
-knetworkmanager_la_LDFLAGS = -module \
-	$(KDE_RPATH) \
-	$(all_libraries) \
-	$(KDE_PLUGIN) 
-
-knetworkmanager_la_LIBADD = dbus/libknm_dbus.la \
-	$(PACKAGE_LIBS) \
-	$(LIB_TDEUI) \
-	$(LIB_KUTILS) \
-	$(LIB_KWALLETCLIENT) \
-	$(LIB_TDEUI) 
-
-# this is where the desktop file will go 
-xdg_apps_DATA = knetworkmanager.desktop
-
-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 --git a/knetworkmanager-0.9/src/dbus/CMakeLists.txt b/knetworkmanager-0.9/src/dbus/CMakeLists.txt
deleted file mode 100644
index fa8d341..0000000
--- a/knetworkmanager-0.9/src/dbus/CMakeLists.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-#################################################
-#
-#  (C) 2010 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-include_directories(
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${TQT_INCLUDE_DIRS}
-  ${DBUS_TQT_INCLUDE_DIRS}
-)
-
-
-##### knm_dbus (static) #########################
-
-set( INTROSPECTIONPATH "${CMAKE_SOURCE_DIR}/knetworkmanager-0.8/introspection" )
-
-# options:
-#  p - generate proxy files
-#  i - generate interface files
-#  n - generate node files
-
-function( add_dbus_xml option basename classname namespace xmlfile )
-  if( classname )
-    set( classname -c ${classname} )
-  endif( )
-  add_custom_command( OUTPUT ${basename}.cpp ${basename}.h
-    COMMAND ${DBUSXML2QT3_EXECUTABLE} -${option} ${basename} ${classname} -N ${namespace} ${INTROSPECTIONPATH}/${xmlfile} 2>/dev/null
-    DEPENDS ${INTROSPECTIONPATH}/${xmlfile} )
-endfunction( )
-
-add_dbus_xml( p networkmanagerproxy NetworkManagerProxy DBus nm-manager.xml )
-add_dbus_xml( p networkmanagervpnproxy NetworkManagerVPNProxy DBus nm-vpn-manager.xml )
-add_dbus_xml( p deviceproxy DeviceProxy DBus nm-device.xml )
-add_dbus_xml( p wirelessproxy WirelessDeviceProxy DBus nm-device-802-11-wireless.xml )
-add_dbus_xml( p wiredproxy WiredDeviceProxy DBus nm-device-802-3-ethernet.xml )
-add_dbus_xml( p gsmproxy GSMDeviceProxy DBus nm-device-gsm.xml )
-add_dbus_xml( p cdmaproxy CDMADeviceProxy DBus nm-device-cdma.xml )
-add_dbus_xml( p accesspointproxy AccessPointProxy DBus nm-access-point.xml )
-add_dbus_xml( p activeconnectionproxy ActiveConnectionProxy DBus nm-active-connection.xml )
-add_dbus_xml( p vpnconnectionproxy VPNConnectionProxy DBus nm-vpn-connection-only.xml )
-add_dbus_xml( p vpnpluginproxy VPNPluginProxy DBus nm-vpn-plugin.xml )
-add_dbus_xml( i networkmanagersettings SettingsInterface DBus nm-settings.xml )
-add_dbus_xml( i connection "" DBus nm-exported-connection.xml )
-
-add_custom_command( OUTPUT connectionnode.cpp connectionnode.h introspectableinterface.cpp introspectableinterface.h
-    COMMAND ${DBUSXML2QT3_EXECUTABLE} -n connectionnode -c ConnectionNode -N DBus ${INTROSPECTIONPATH}/nm-exported-connection.xml 2>/dev/null
-    COMMAND sed s/\#include\\ \\"secrets.h\\"// connectionnode.cpp > connectionnode.cpp_tmp
-    COMMAND sed s/\#include\\ \\"introspectable.h\\"/\#include\\ \\"introspectableinterface.h\\"/ connectionnode.cpp_tmp > connectionnode.cpp
-    COMMAND rm -f connectionnode.cpp_tmp
-    DEPENDS ${INTROSPECTIONPATH}/nm-exported-connection.xml )
-
-
-# generate moc files
-
-set( MOCHEADERS accesspointproxy.h deviceproxy.h networkmanagerproxy.h networkmanagervpnproxy.h wiredproxy.h
-  wirelessproxy.h activeconnectionproxy.h vpnconnectionproxy.h vpnpluginproxy.h gsmproxy.h cdmaproxy.h )
-
-foreach( _header_file ${MOCHEADERS} )
-  get_filename_component( _basename "${_header_file}" NAME_WE )
-  set( _moc_file ${_basename}.moc )
-  list( APPEND _moc_files ${_moc_file} )
-  add_custom_command( OUTPUT ${_moc_file}
-    COMMAND ${TMOC_EXECUTABLE} ${_header_file} -o ${_moc_file}
-    DEPENDS ${_header_file} )
-endforeach( )
-
-add_custom_command( OUTPUT mocfiles.cpp
-  COMMAND cat ${_moc_files} > mocfiles.cpp
-  DEPENDS ${_moc_files} )
-
-
-# build the library
-
-tde_add_library( knm_dbus STATIC_PIC
-  SOURCES
-    networkmanagerproxy.cpp networkmanagervpnproxy.cpp
-    deviceproxy.cpp wiredproxy.cpp wirelessproxy.cpp
-    accesspointproxy.cpp networkmanagersettings.cpp
-    connection.cpp connectionnode.cpp introspectableinterface.cpp
-    mocfiles.cpp activeconnectionproxy.cpp vpnconnectionproxy.cpp
-    vpnpluginproxy.cpp gsmproxy.cpp cdmaproxy.cpp
-)
diff --git a/knetworkmanager-0.9/src/dbus/Makefile.am b/knetworkmanager-0.9/src/dbus/Makefile.am
deleted file mode 100644
index 6383078..0000000
--- a/knetworkmanager-0.9/src/dbus/Makefile.am
+++ /dev/null
@@ -1,129 +0,0 @@
-INCLUDES =  $(DBUS_TQT_CFLAGS) $(QT_INCLUDES)
-
-INTROSPECTIONPATH = $(srcdir)/../../introspection/
-
-MOCHEADERS = accesspointproxy.h deviceproxy.h networkmanagerproxy.h networkmanagervpnproxy.h \
-    wiredproxy.h wirelessproxy.h activeconnectionproxy.h vpnconnectionproxy.h vpnpluginproxy.h gsmproxy.h cdmaproxy.h
-#ip4configproxy.h 
-
-MOCSUBS = accesspointproxy.moc deviceproxy.moc networkmanagerproxy.moc networkmanagervpnproxy.moc \
-    wiredproxy.moc wirelessproxy.moc activeconnectionproxy.moc vpnconnectionproxy.moc vpnpluginproxy.moc gsmproxy.moc cdmaproxy.moc
-#ip4configproxy.moc 
-
-DBUSPROXY = networkmanagerproxy.cpp \
-            networkmanagervpnproxy.cpp \
-            deviceproxy.cpp \
-            wiredproxy.cpp \
-            wirelessproxy.cpp \
-            accesspointproxy.cpp \
-            networkmanagersettings.cpp \
-            connection.cpp \
-            connectionnode.cpp \
-            introspectableinterface.cpp \
-            mocfiles.cpp \
-            activeconnectionproxy.cpp \
-            vpnconnectionproxy.cpp \
-            vpnpluginproxy.cpp \
-            gsmproxy.cpp \
-            cdmaproxy.cpp
-#            ip4configproxy.cpp 
-
-DBUSPROXYHEADERS = networkmanagerproxy.h \
-                   networkmanagervpnproxy.h \
-                   deviceproxy.h \
-                   wiredproxy.h \
-                   wirelessproxy.h \
-                   accesspointproxy.h \
-                   networkmanagersettings.h \
-                   connection.h \
-                   connectionnode.h \
-                   introspectableinterface.h \
-                   activeconnectionproxy.h \
-                   vpnconnectionproxy.h \
-                   vpnpluginproxy.h \
-                   gsmproxy.h \
-                   cdmaproxy.h
-#                   ip4configproxy.h 
-
-noinst_HEADERS = accesspointproxy.h \
-connection.h \
-connectionnode.h \
-deviceproxy.h \
-introspectableinterface.h \
-networkmanagerproxy.h \
-networkmanagervpnproxy.h \
-networkmanagersettings.h \
-wiredproxy.h \
-wirelessproxy.h \
-activeconnectionproxy.h \
-vpnconnectionproxy.h \
-vpnpluginproxy.h \
-gsmproxy.h \
-cdmaproxy.h
-#ip4configproxy.h 
-
-noinst_LTLIBRARIES = libknm_dbus.la
-libknm_dbus_la_SOURCES = $(DBUSPROXY)
-
-CLEANFILES = $(DBUSPROXY) $(DBUSPROXYHEADERS) $(MOCSUBS)
-
-.h.moc:
-	$(TQTMOC) $< -o $@
-
-mocfiles.cpp: $(MOCSUBS)
-	cat $(MOCSUBS) > mocfiles.cpp
-
-networkmanagerproxy.cpp networkmanagerproxy.h:
-	$(DBUSXML2QT3) -p networkmanagerproxy -c NetworkManagerProxy -N DBus $(INTROSPECTIONPATH)nm-manager.xml
-
-networkmanagervpnproxy.cpp networkmanagervpnproxy.h:
-	$(DBUSXML2QT3) -p networkmanagervpnproxy -c NetworkManagerVPNProxy -N DBus $(INTROSPECTIONPATH)nm-vpn-manager.xml
-
-deviceproxy.cpp deviceproxy.h:
-	$(DBUSXML2QT3) -p deviceproxy -c DeviceProxy -N DBus $(INTROSPECTIONPATH)nm-device.xml
-
-wirelessproxy.cpp wirelessproxy.h:
-	$(DBUSXML2QT3) -p wirelessproxy -c WirelessDeviceProxy -N DBus $(INTROSPECTIONPATH)nm-device-802-11-wireless.xml
-
-wiredproxy.cpp wiredproxy.h:
-	$(DBUSXML2QT3) -p wiredproxy -c WiredDeviceProxy -N DBus $(INTROSPECTIONPATH)nm-device-802-3-ethernet.xml
-
-gsmproxy.cpp gsmproxy.h:
-	$(DBUSXML2QT3) -p gsmproxy -c GSMDeviceProxy -N DBus $(INTROSPECTIONPATH)nm-device-gsm.xml
-
-cdmaproxy.cpp cdmaproxy.h:
-	$(DBUSXML2QT3) -p cdmaproxy -c CDMADeviceProxy -N DBus $(INTROSPECTIONPATH)nm-device-cdma.xml
-
-#ip4configproxy.cpp ip4configproxy.h:
-#	$(DBUSXML2QT3) -p ip4configproxy -c IP4ConfigProxy -N DBus $(INTROSPECTIONPATH)nm-ip4-config.xml
-
-accesspointproxy.cpp accesspointproxy.h:
-	$(DBUSXML2QT3) -p accesspointproxy -c AccessPointProxy -N DBus $(INTROSPECTIONPATH)nm-access-point.xml
-
-activeconnectionproxy.cpp activeconnectionproxy.h:
-	$(DBUSXML2QT3) -p activeconnectionproxy -c ActiveConnectionProxy -N DBus $(INTROSPECTIONPATH)nm-active-connection.xml
-
-#vpnconnectionproxy.cpp vpnconnectionproxy.h:
-#	$(DBUSXML2QT3) -p vpnconnectionproxy -c VPNConnectionProxy -N DBus $(INTROSPECTIONPATH)nm-vpn-connection.xml
-
-#vpnconnectionproxy.cpp vpnconnectionproxy.h:
-#	$(DBUSXML2QT3) -p vpnconnectionproxy -N DBus $(INTROSPECTIONPATH)nm-vpn-connection.xml
-
-vpnconnectionproxy.cpp vpnconnectionproxy.h:
-	$(DBUSXML2QT3) -p vpnconnectionproxy -c VPNConnectionProxy -N DBus $(INTROSPECTIONPATH)nm-vpn-connection-only.xml
-
-vpnpluginproxy.cpp vpnpluginproxy.h:
-	$(DBUSXML2QT3) -p vpnpluginproxy -c VPNPluginProxy -N DBus $(INTROSPECTIONPATH)nm-vpn-plugin.xml
-
-networkmanagersettings.cpp networkmanagersettings.h:
-	$(DBUSXML2QT3) -i networkmanagersettings -c SettingsInterface -N DBus $(INTROSPECTIONPATH)nm-settings.xml
-
-connection.cpp connection.h:
-	$(DBUSXML2QT3) -i connection -N DBus $(INTROSPECTIONPATH)nm-exported-connection.xml
-
-connectionnode.cpp connectionnode.h introspectableinterface.cpp introspectableinterface.h:
-	$(DBUSXML2QT3) -n connectionnode -c ConnectionNode -N DBus $(INTROSPECTIONPATH)nm-exported-connection.xml
-	sed s/#include\ \"secrets.h\"// connectionnode.cpp > connectionnode.cpp_tmp
-	sed s/#include\ \"introspectable.h\"/#include\ \"introspectableinterface.h\"/ connectionnode.cpp_tmp > connectionnode.cpp
-	rm -f connectionnode.cpp_tmp
-	
diff --git a/knetworkmanager-0.9/vpn-plugins/Makefile.am b/knetworkmanager-0.9/vpn-plugins/Makefile.am
deleted file mode 100644
index 6349be1..0000000
--- a/knetworkmanager-0.9/vpn-plugins/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-SUBDIRS=
-
-if WITH_OPENVPN
-SUBDIRS += openvpn
-endif
-
-if WITH_VPNC
-SUBDIRS += vpnc
-endif
-
-if WITH_STRONGSWAN
-SUBDIRS += strongswan
-endif
-
-if WITH_PPTP
-SUBDIRS += pptp
-endif
diff --git a/knetworkmanager-0.9/vpn-plugins/openvpn/Makefile.am b/knetworkmanager-0.9/vpn-plugins/openvpn/Makefile.am
deleted file mode 100644
index 81ae93b..0000000
--- a/knetworkmanager-0.9/vpn-plugins/openvpn/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIRS = src
-
-service_DATA = knetworkmanager_openvpn.desktop
-servicedir = $(kde_servicesdir)
-
diff --git a/knetworkmanager-0.9/vpn-plugins/openvpn/configure.in.in b/knetworkmanager-0.9/vpn-plugins/openvpn/configure.in.in
deleted file mode 100644
index 00b2409..0000000
--- a/knetworkmanager-0.9/vpn-plugins/openvpn/configure.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-KNETWORKMANAGER_OPENVPN_VERSION=0.1
-AC_DEFINE_UNQUOTED(KNETWORKMANAGER_OPENVPN_VERSION, $KNETWORKMANAGER_OPENVPN_VERSION, [KNetworkManager OpenVPN Plugin  Version])
-AC_DEFINE_UNQUOTED(KNETWORKMANAGER_OPENVPN_VERSION_STRING, "$KNETWORKMANAGER_OPENVPN_VERSION", [KNetworkManager OpenVPN Plugin Version String])
-
-PKG_CHECK_MODULES(DBUS_TQT, [dbus-1-tqt >= 0.8.1], [], [
-	AC_MSG_RESULT([no])
-	AC_MSG_ERROR([TQT dbus bindings missing])
-])
-
-OPENVPN_CFLAGS="$DBUS_TQT_CFLAGS"
-OPENVPN_LIBS="$DBUS_TQT_LIBS"
-
-AC_SUBST(OPENVPN_CFLAGS)
-AC_SUBST(OPENVPN_LIBS)
diff --git a/knetworkmanager-0.9/vpn-plugins/openvpn/src/Makefile.am b/knetworkmanager-0.9/vpn-plugins/openvpn/src/Makefile.am
deleted file mode 100644
index ddd52d1..0000000
--- a/knetworkmanager-0.9/vpn-plugins/openvpn/src/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-INCLUDES = $(KNETWORKMANAGER_CFLAGS) $(OPENVPN_CFLAGS) $(all_includes)
-
-METASOURCES = AUTO
-
-kde_module_LTLIBRARIES = knetworkmanager_openvpn.la
-knetworkmanager_openvpn_la_SOURCES = knetworkmanager-openvpn.cpp \
-	openvpnprop.ui \
-	openvpnauth.ui
-noinst_HEADERS = 	knetworkmanager-openvpn.h
-knetworkmanager_openvpn_la_LDFLAGS = -module $(all_libraries)
-knetworkmanager_openvpn_la_LIBADD = $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
-
diff --git a/knetworkmanager-0.9/vpn-plugins/pptp/Makefile.am b/knetworkmanager-0.9/vpn-plugins/pptp/Makefile.am
deleted file mode 100644
index 1a0ed41..0000000
--- a/knetworkmanager-0.9/vpn-plugins/pptp/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIRS = src 
-
-service_DATA = knetworkmanager_pptp.desktop
-servicedir = $(kde_servicesdir)
-
diff --git a/knetworkmanager-0.9/vpn-plugins/pptp/configure.in.in b/knetworkmanager-0.9/vpn-plugins/pptp/configure.in.in
deleted file mode 100644
index bb2a866..0000000
--- a/knetworkmanager-0.9/vpn-plugins/pptp/configure.in.in
+++ /dev/null
@@ -1,5 +0,0 @@
-KNETWORKMANAGER_PPTP_VERSION=0.1
-AC_DEFINE_UNQUOTED(KNETWORKMANAGER_PPTP_VERSION, $KNETWORKMANAGER_PPTP_VERSION, [KNetworkManager PPTP Plugin Version])
-AC_DEFINE_UNQUOTED(KNETWORKMANAGER_PPTP_VERSION_STRING, "$KNETWORKMANAGER_PPTP_VERSION", [KNetworkManager PPTP Plugin Version String])
-
-
diff --git a/knetworkmanager-0.9/vpn-plugins/pptp/src/Makefile.am b/knetworkmanager-0.9/vpn-plugins/pptp/src/Makefile.am
deleted file mode 100644
index b22a9e9..0000000
--- a/knetworkmanager-0.9/vpn-plugins/pptp/src/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-INCLUDES = $(KNETWORKMANAGER_CFLAGS) $(PACKAGE_CFLAGS) $(all_includes) 
-
-METASOURCES = AUTO
-
-kde_module_LTLIBRARIES = knetworkmanager_pptp.la
-knetworkmanager_pptp_la_SOURCES = knetworkmanager-pptp.cpp \
-	pptpprop.ui \
-	pptpauth.ui
-noinst_HEADERS = 	knetworkmanager-pptp.h 
-knetworkmanager_pptp_la_LDFLAGS = -module $(all_libraries) 
-knetworkmanager_pptp_la_LIBADD = $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
-
diff --git a/knetworkmanager-0.9/vpn-plugins/pptp/src/Makefile.am.automake b/knetworkmanager-0.9/vpn-plugins/pptp/src/Makefile.am.automake
deleted file mode 100644
index d777841..0000000
--- a/knetworkmanager-0.9/vpn-plugins/pptp/src/Makefile.am.automake
+++ /dev/null
@@ -1,34 +0,0 @@
-INCLUDES = $(PACKAGE_CFLAGS) $(all_includes) 
-
-# rule for creating tqmoc files
-%.tqmoc.cpp: %.h
-	$(TQMOC) -o $@ $<
-
-# rules for creating .h and .cpp from .ui
-%.cpp: %.ui %.h
-	$(UIC) -tr tr2i18n -pch klocale.h -o $@ -impl $*.h $<
-
-%.h: %.ui
-	$(UIC) -o $@ $<
-
-all_TQMOC = knetworkmanager-vpnc.tqmoc.cpp \
-	vpncauth.tqmoc.cpp \
-	vpncprop.tqmoc.cpp
-
-all_METASOURCES = vpncauth.cpp \
-	vpncprop.cpp
-
-all_IMPLEMENTATIONS = knetworkmanager-vpnc.cpp
-
-kde_module_LTLIBRARIES = knetworkmanager_vpnc.la
-knetworkmanager_vpnc_la_SOURCES = $(all_METASOURCES) $(all_TQMOC) $(all_IMPLEMENTATIONS)
-noinst_HEADERS = 	knetworkmanager-vpnc.h 
-knetworkmanager_vpnc_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
-knetworkmanager_vpnc_la_LIBADD = $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
-
-service_DATA = knetworkmanager_vpnc.desktop
-servicedir = $(kde_servicesdir)
-
-CLEANFILES = $(all_TQMOC) $(all_METASOURCES)
-
-
diff --git a/knetworkmanager-0.9/vpn-plugins/strongswan/Makefile.am b/knetworkmanager-0.9/vpn-plugins/strongswan/Makefile.am
deleted file mode 100644
index b47b9cb..0000000
--- a/knetworkmanager-0.9/vpn-plugins/strongswan/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIRS = src
-
-service_DATA = knetworkmanager_strongswan.desktop
-servicedir = $(kde_servicesdir)
-
diff --git a/knetworkmanager-0.9/vpn-plugins/strongswan/configure.in.in b/knetworkmanager-0.9/vpn-plugins/strongswan/configure.in.in
deleted file mode 100644
index 3591671..0000000
--- a/knetworkmanager-0.9/vpn-plugins/strongswan/configure.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-KNETWORKMANAGER_STRONGSWAN_VERSION=0.1
-AC_DEFINE_UNQUOTED(KNETWORKMANAGER_STRONGSWAN_VERSION, $KNETWORKMANAGER_STRONGSWAN_VERSION, [KNetworkManager StrongSwan Plugin  Version])
-AC_DEFINE_UNQUOTED(KNETWORKMANAGER_STRONGSWAN_VERSION_STRING, "$KNETWORKMANAGER_STRONGSWAN_VERSION", [KNetworkManager StrongSwan Plugin Version String])
-
-PKG_CHECK_MODULES(DBUS_TQT, [dbus-1-tqt >= 0.8.1], [], [
-	AC_MSG_RESULT([no])
-	AC_MSG_ERROR([TQT dbus bindings missing])
-])
-
-STRONGSWAN_CFLAGS="$DBUS_TQT_CFLAGS"
-STRONGSWAN_LIBS="$DBUS_TQT_LIBS"
-
-AC_SUBST(STRONGSWAN_CFLAGS)
-AC_SUBST(STRONGSWAN_LIBS)
diff --git a/knetworkmanager-0.9/vpn-plugins/strongswan/src/Makefile.am b/knetworkmanager-0.9/vpn-plugins/strongswan/src/Makefile.am
deleted file mode 100644
index c263de8..0000000
--- a/knetworkmanager-0.9/vpn-plugins/strongswan/src/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-INCLUDES = $(PACKAGE_CFLAGS) $(KNETWORKMANAGER_CFLAGS) $(SSWAN_FLAGS) $(all_includes) 
-
-METASOURCES = AUTO
-
-kde_module_LTLIBRARIES = knetworkmanager_strongswan.la
-knetworkmanager_strongswan_la_SOURCES = knetworkmanager-strongswan.cpp \
-	strongswanprop.ui \
-	strongswanauth.ui
-noinst_HEADERS = 	knetworkmanager-strongswan.h 
-knetworkmanager_strongswan_la_LDFLAGS = -module $(all_libraries)
-knetworkmanager_strongswan_la_LIBADD = $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
-
diff --git a/knetworkmanager-0.9/vpn-plugins/vpnc/Makefile.am b/knetworkmanager-0.9/vpn-plugins/vpnc/Makefile.am
deleted file mode 100644
index 008e246..0000000
--- a/knetworkmanager-0.9/vpn-plugins/vpnc/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIRS = src
-
-service_DATA = knetworkmanager_vpnc.desktop
-servicedir = $(kde_servicesdir)
-
diff --git a/knetworkmanager-0.9/vpn-plugins/vpnc/configure.in.in b/knetworkmanager-0.9/vpn-plugins/vpnc/configure.in.in
deleted file mode 100644
index 7deec5d..0000000
--- a/knetworkmanager-0.9/vpn-plugins/vpnc/configure.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-KNETWORKMANAGER_VPNC_VERSION=0.1
-AC_DEFINE_UNQUOTED(KNETWORKMANAGER_VPNC_VERSION, $KNETWORKMANAGER_VPNC_VERSION, [KNetworkManager VPNC Plugin Version])
-AC_DEFINE_UNQUOTED(KNETWORKMANAGER_VPNC_VERSION_STRING, "$KNETWORKMANAGER_VPNC_VERSION", [KNetworkManager VPNC Plugin Version String])
-
-PKG_CHECK_MODULES(DBUS_TQT, [dbus-1-tqt >= 0.8.1], [], [
-	AC_MSG_RESULT([no])
-	AC_MSG_ERROR([TQT dbus bindings missing])
-])
-
-VPNC_CFLAGS="$DBUS_TQT_CFLAGS"
-VPNC_LIBS="$DBUS_TQT_LIBS"
-
-AC_SUBST(VPNC_CFLAGS)
-AC_SUBST(VPNC_LIBS)
diff --git a/knetworkmanager-0.9/vpn-plugins/vpnc/src/Makefile.am b/knetworkmanager-0.9/vpn-plugins/vpnc/src/Makefile.am
deleted file mode 100644
index 8cedd56..0000000
--- a/knetworkmanager-0.9/vpn-plugins/vpnc/src/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-INCLUDES = $(KNETWORKMANAGER_CFLAGS) $(VPNC_CFLAGS) $(all_includes) 
-
-METASOURCES = AUTO
-
-kde_module_LTLIBRARIES = knetworkmanager_vpnc.la
-knetworkmanager_vpnc_la_SOURCES = knetworkmanager-vpnc.cpp \
-	vpncprop.ui \
-	vpncauth.ui
-noinst_HEADERS = 	knetworkmanager-vpnc.h 
-knetworkmanager_vpnc_la_LDFLAGS = -module $(all_libraries)
-knetworkmanager_vpnc_la_LIBADD = $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
-
diff --git a/knetworkmanager-0.9/AUTHORS b/tdenetworkmanager/AUTHORS
index ac8bb09..f109f1c 100644
--- a/knetworkmanager-0.9/AUTHORS
+++ b/tdenetworkmanager/AUTHORS
@@ -1,3 +1,4 @@
+Timothy Pearson <[email protected]>
 Timo Hoenig <[email protected]>
 Will Stephenson <[email protected]>
 Valentine Sinitsyn <[email protected]>
diff --git a/knetworkmanager-0.9/CMakeLists.txt b/tdenetworkmanager/CMakeLists.txt
index 119a77e..119a77e 100644
--- a/knetworkmanager-0.9/CMakeLists.txt
+++ b/tdenetworkmanager/CMakeLists.txt
diff --git a/knetworkmanager-0.9/COPYING b/tdenetworkmanager/COPYING
index 80a0938..80a0938 100644
--- a/knetworkmanager-0.9/COPYING
+++ b/tdenetworkmanager/COPYING
diff --git a/knetworkmanager-0.9/TODO b/tdenetworkmanager/ChangeLog
index e69de29..e69de29 100644
--- a/knetworkmanager-0.9/TODO
+++ b/tdenetworkmanager/ChangeLog
diff --git a/tdenetworkmanager/INSTALL b/tdenetworkmanager/INSTALL
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tdenetworkmanager/INSTALL
diff --git a/tdenetworkmanager/NEWS b/tdenetworkmanager/NEWS
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tdenetworkmanager/NEWS
diff --git a/tdenetworkmanager/README b/tdenetworkmanager/README
new file mode 100644
index 0000000..e7eb541
--- /dev/null
+++ b/tdenetworkmanager/README
@@ -0,0 +1,4 @@
+KNetworkManager is a system tray application for controlling network connections on systems that use the NetworkManager daemon.
+
+Currently the following things work:
+ * Nothing!
diff --git a/tdenetworkmanager/TODO b/tdenetworkmanager/TODO
new file mode 100644
index 0000000..ea2e206
--- /dev/null
+++ b/tdenetworkmanager/TODO
@@ -0,0 +1,2 @@
+VPN support
+Translations
diff --git a/knetworkmanager-0.9/knetworkmanager.conf b/tdenetworkmanager/knetworkmanager.conf
index 82a596f..82a596f 100644
--- a/knetworkmanager-0.9/knetworkmanager.conf
+++ b/tdenetworkmanager/knetworkmanager.conf
diff --git a/knetworkmanager-0.9/pics/CMakeLists.txt b/tdenetworkmanager/pics/CMakeLists.txt
index 44de539..44de539 100644
--- a/knetworkmanager-0.9/pics/CMakeLists.txt
+++ b/tdenetworkmanager/pics/CMakeLists.txt
diff --git a/knetworkmanager-0.9/pics/hi16-app-knetworkmanager.png b/tdenetworkmanager/pics/hi16-app-knetworkmanager.png
index db29bb8..db29bb8 100644
--- a/knetworkmanager-0.9/pics/hi16-app-knetworkmanager.png
+++ b/tdenetworkmanager/pics/hi16-app-knetworkmanager.png
diff --git a/knetworkmanager-0.9/pics/hi16-app-knetworkmanager_disabled.png b/tdenetworkmanager/pics/hi16-app-knetworkmanager_disabled.png
index 971f7e3..971f7e3 100644
--- a/knetworkmanager-0.9/pics/hi16-app-knetworkmanager_disabled.png
+++ b/tdenetworkmanager/pics/hi16-app-knetworkmanager_disabled.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-modem.png b/tdenetworkmanager/pics/hi22-action-modem.png
index 77e5fd6..77e5fd6 100644
--- a/knetworkmanager-0.9/pics/hi22-action-modem.png
+++ b/tdenetworkmanager/pics/hi22-action-modem.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_adhoc.png b/tdenetworkmanager/pics/hi22-action-nm_adhoc.png
index 1883239..1883239 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_adhoc.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_adhoc.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_device_vpn.png b/tdenetworkmanager/pics/hi22-action-nm_device_vpn.png
index 708e74e..708e74e 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_device_vpn.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_device_vpn.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_device_wired.png b/tdenetworkmanager/pics/hi22-action-nm_device_wired.png
index 51c8b16..51c8b16 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_device_wired.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_device_wired.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_device_wwan.png b/tdenetworkmanager/pics/hi22-action-nm_device_wwan.png
index 386abd5..386abd5 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_device_wwan.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_device_wwan.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_no_connection.png b/tdenetworkmanager/pics/hi22-action-nm_no_connection.png
index d88cde5..d88cde5 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_no_connection.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_no_connection.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_signal_00.png b/tdenetworkmanager/pics/hi22-action-nm_signal_00.png
index 5638f89..5638f89 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_signal_00.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_signal_00.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_signal_100.png b/tdenetworkmanager/pics/hi22-action-nm_signal_100.png
index ad54098..ad54098 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_signal_100.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_signal_100.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_signal_25.png b/tdenetworkmanager/pics/hi22-action-nm_signal_25.png
index aab2623..aab2623 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_signal_25.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_signal_25.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_signal_50.png b/tdenetworkmanager/pics/hi22-action-nm_signal_50.png
index 848c088..848c088 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_signal_50.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_signal_50.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_signal_75.png b/tdenetworkmanager/pics/hi22-action-nm_signal_75.png
index 1e3b7fd..1e3b7fd 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_signal_75.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_signal_75.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage01_connecting.mng b/tdenetworkmanager/pics/hi22-action-nm_stage01_connecting.mng
index 932b5e9..932b5e9 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage01_connecting.mng
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage01_connecting.mng
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage01_connecting01.png b/tdenetworkmanager/pics/hi22-action-nm_stage01_connecting01.png
index c5fbb37..c5fbb37 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage01_connecting01.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage01_connecting01.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage01_connecting02.png b/tdenetworkmanager/pics/hi22-action-nm_stage01_connecting02.png
index 4e6486c..4e6486c 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage01_connecting02.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage01_connecting02.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage01_connecting03.png b/tdenetworkmanager/pics/hi22-action-nm_stage01_connecting03.png
index da50b13..da50b13 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage01_connecting03.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage01_connecting03.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage01_connecting04.png b/tdenetworkmanager/pics/hi22-action-nm_stage01_connecting04.png
index 9c4c5b5..9c4c5b5 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage01_connecting04.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage01_connecting04.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage01_connecting05.png b/tdenetworkmanager/pics/hi22-action-nm_stage01_connecting05.png
index 73668a2..73668a2 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage01_connecting05.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage01_connecting05.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage01_connecting06.png b/tdenetworkmanager/pics/hi22-action-nm_stage01_connecting06.png
index 1c91c24..1c91c24 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage01_connecting06.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage01_connecting06.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage01_connecting07.png b/tdenetworkmanager/pics/hi22-action-nm_stage01_connecting07.png
index 4c35857..4c35857 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage01_connecting07.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage01_connecting07.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage01_connecting08.png b/tdenetworkmanager/pics/hi22-action-nm_stage01_connecting08.png
index 37592cf..37592cf 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage01_connecting08.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage01_connecting08.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage01_connecting09.png b/tdenetworkmanager/pics/hi22-action-nm_stage01_connecting09.png
index 851bc0d..851bc0d 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage01_connecting09.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage01_connecting09.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage01_connecting10.png b/tdenetworkmanager/pics/hi22-action-nm_stage01_connecting10.png
index d6ab3b1..d6ab3b1 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage01_connecting10.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage01_connecting10.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage01_connecting11.png b/tdenetworkmanager/pics/hi22-action-nm_stage01_connecting11.png
index 7cb7821..7cb7821 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage01_connecting11.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage01_connecting11.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting.mng b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting.mng
index c4cc7f7..c4cc7f7 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting.mng
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting.mng
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting01.png b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting01.png
index 69aacd9..69aacd9 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting01.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting01.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting02.png b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting02.png
index fa2a798..fa2a798 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting02.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting02.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting03.png b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting03.png
index 2dc2cc6..2dc2cc6 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting03.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting03.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting04.png b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting04.png
index 7ec4391..7ec4391 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting04.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting04.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting05.png b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting05.png
index f0b87bb..f0b87bb 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting05.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting05.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting06.png b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting06.png
index 326ddeb..326ddeb 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting06.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting06.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting07.png b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting07.png
index 569cd65..569cd65 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting07.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting07.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting08.png b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting08.png
index f43497a..f43497a 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting08.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting08.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting09.png b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting09.png
index 555b3d5..555b3d5 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting09.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting09.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting10.png b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting10.png
index 68cd208..68cd208 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting10.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting10.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting11.png b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting11.png
index 036ffc3..036ffc3 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting11.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting11.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting_vpn.mng b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting_vpn.mng
index 90a736d..90a736d 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting_vpn.mng
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting_vpn.mng
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting_vpn01.png b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting_vpn01.png
index 17b52c8..17b52c8 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting_vpn01.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting_vpn01.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting_vpn01.xcf b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting_vpn01.xcf
index 1a17fc1..1a17fc1 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting_vpn01.xcf
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting_vpn01.xcf
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting_vpn02.png b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting_vpn02.png
index 8f70569..8f70569 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting_vpn02.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting_vpn02.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting_vpn03.png b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting_vpn03.png
index f668a01..f668a01 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting_vpn03.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting_vpn03.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting_vpn04.png b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting_vpn04.png
index c255e76..c255e76 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting_vpn04.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting_vpn04.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting_vpn05.png b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting_vpn05.png
index d90ea5b..d90ea5b 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting_vpn05.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting_vpn05.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting_vpn06.png b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting_vpn06.png
index 7597a28..7597a28 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting_vpn06.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting_vpn06.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting_vpn07.png b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting_vpn07.png
index b3b172e..b3b172e 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting_vpn07.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting_vpn07.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting_vpn08.png b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting_vpn08.png
index 8f2439a..8f2439a 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting_vpn08.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting_vpn08.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting_vpn09.png b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting_vpn09.png
index 0b672d8..0b672d8 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting_vpn09.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting_vpn09.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting_vpn10.png b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting_vpn10.png
index 89e6a21..89e6a21 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting_vpn10.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting_vpn10.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting_vpn11.png b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting_vpn11.png
index 8859a9c..8859a9c 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage02_connecting_vpn11.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage02_connecting_vpn11.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting.mng b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting.mng
index fb3e56a..fb3e56a 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting.mng
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting.mng
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting01.png b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting01.png
index 4086e28..4086e28 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting01.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting01.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting02.png b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting02.png
index cefc2ac..cefc2ac 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting02.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting02.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting03.png b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting03.png
index d39c057..d39c057 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting03.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting03.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting04.png b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting04.png
index 2c8cc4b..2c8cc4b 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting04.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting04.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting05.png b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting05.png
index 9676b03..9676b03 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting05.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting05.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting06.png b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting06.png
index e23d8d2..e23d8d2 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting06.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting06.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting07.png b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting07.png
index 9710fd6..9710fd6 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting07.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting07.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting08.png b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting08.png
index 8990ca4..8990ca4 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting08.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting08.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting09.png b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting09.png
index 75cf382..75cf382 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting09.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting09.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting10.png b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting10.png
index 0a8b535..0a8b535 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting10.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting10.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting11.png b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting11.png
index 0cc040d..0cc040d 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting11.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting11.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting_vpn.mng b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting_vpn.mng
index 499c634..499c634 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting_vpn.mng
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting_vpn.mng
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting_vpn01.png b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting_vpn01.png
index 4086e28..4086e28 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting_vpn01.png
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting_vpn01.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting_vpn01.xcf b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting_vpn01.xcf
index 123e33f..123e33f 100644
--- a/knetworkmanager-0.9/pics/hi22-action-nm_stage03_connecting_vpn01.xcf
+++ b/tdenetworkmanager/pics/hi22-action-nm_stage03_connecting_vpn01.xcf
diff --git a/knetworkmanager-0.9/pics/hi22-action-wired.png b/tdenetworkmanager/pics/hi22-action-wired.png
index 8671c5b..8671c5b 100644
--- a/knetworkmanager-0.9/pics/hi22-action-wired.png
+++ b/tdenetworkmanager/pics/hi22-action-wired.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-wireless.png b/tdenetworkmanager/pics/hi22-action-wireless.png
index 5cb24de..5cb24de 100644
--- a/knetworkmanager-0.9/pics/hi22-action-wireless.png
+++ b/tdenetworkmanager/pics/hi22-action-wireless.png
diff --git a/knetworkmanager-0.9/pics/hi22-action-wireless_off.png b/tdenetworkmanager/pics/hi22-action-wireless_off.png
index 821d9eb..821d9eb 100644
--- a/knetworkmanager-0.9/pics/hi22-action-wireless_off.png
+++ b/tdenetworkmanager/pics/hi22-action-wireless_off.png
diff --git a/knetworkmanager-0.9/pics/hi32-app-knetworkmanager.png b/tdenetworkmanager/pics/hi32-app-knetworkmanager.png
index 5e98e9c..5e98e9c 100644
--- a/knetworkmanager-0.9/pics/hi32-app-knetworkmanager.png
+++ b/tdenetworkmanager/pics/hi32-app-knetworkmanager.png
diff --git a/knetworkmanager-0.9/pics/hi32-app-knetworkmanager_disabled.png b/tdenetworkmanager/pics/hi32-app-knetworkmanager_disabled.png
index a9ed5f9..a9ed5f9 100644
--- a/knetworkmanager-0.9/pics/hi32-app-knetworkmanager_disabled.png
+++ b/tdenetworkmanager/pics/hi32-app-knetworkmanager_disabled.png
diff --git a/knetworkmanager-0.9/pics/hi48-app-knetworkmanager.png b/tdenetworkmanager/pics/hi48-app-knetworkmanager.png
index 8306829..8306829 100644
--- a/knetworkmanager-0.9/pics/hi48-app-knetworkmanager.png
+++ b/tdenetworkmanager/pics/hi48-app-knetworkmanager.png
diff --git a/knetworkmanager-0.9/pics/hi48-app-knetworkmanager_disabled.png b/tdenetworkmanager/pics/hi48-app-knetworkmanager_disabled.png
index 53eafb4..53eafb4 100644
--- a/knetworkmanager-0.9/pics/hi48-app-knetworkmanager_disabled.png
+++ b/tdenetworkmanager/pics/hi48-app-knetworkmanager_disabled.png
diff --git a/knetworkmanager-0.9/po/af.po b/tdenetworkmanager/po/af.po
index 7dc7c3c..7dc7c3c 100644
--- a/knetworkmanager-0.9/po/af.po
+++ b/tdenetworkmanager/po/af.po
diff --git a/knetworkmanager-0.9/po/ar.po b/tdenetworkmanager/po/ar.po
index dcefcb1..dcefcb1 100644
--- a/knetworkmanager-0.9/po/ar.po
+++ b/tdenetworkmanager/po/ar.po
diff --git a/knetworkmanager-0.9/po/bg.po b/tdenetworkmanager/po/bg.po
index 9a3a55e..9a3a55e 100644
--- a/knetworkmanager-0.9/po/bg.po
+++ b/tdenetworkmanager/po/bg.po
diff --git a/knetworkmanager-0.9/po/bn.po b/tdenetworkmanager/po/bn.po
index 880cbf4..880cbf4 100644
--- a/knetworkmanager-0.9/po/bn.po
+++ b/tdenetworkmanager/po/bn.po
diff --git a/knetworkmanager-0.9/po/bs.po b/tdenetworkmanager/po/bs.po
index ee0134d..ee0134d 100644
--- a/knetworkmanager-0.9/po/bs.po
+++ b/tdenetworkmanager/po/bs.po
diff --git a/knetworkmanager-0.9/po/ca.po b/tdenetworkmanager/po/ca.po
index 9f19b3e..9f19b3e 100644
--- a/knetworkmanager-0.9/po/ca.po
+++ b/tdenetworkmanager/po/ca.po
diff --git a/knetworkmanager-0.9/po/cs.po b/tdenetworkmanager/po/cs.po
index b75e2c7..b75e2c7 100644
--- a/knetworkmanager-0.9/po/cs.po
+++ b/tdenetworkmanager/po/cs.po
diff --git a/knetworkmanager-0.9/po/cy.po b/tdenetworkmanager/po/cy.po
index d440c9f..d440c9f 100644
--- a/knetworkmanager-0.9/po/cy.po
+++ b/tdenetworkmanager/po/cy.po
diff --git a/knetworkmanager-0.9/po/da.po b/tdenetworkmanager/po/da.po
index caa683f..caa683f 100644
--- a/knetworkmanager-0.9/po/da.po
+++ b/tdenetworkmanager/po/da.po
diff --git a/knetworkmanager-0.9/po/de.po b/tdenetworkmanager/po/de.po
index 10f0bb9..10f0bb9 100644
--- a/knetworkmanager-0.9/po/de.po
+++ b/tdenetworkmanager/po/de.po
diff --git a/knetworkmanager-0.9/po/el.po b/tdenetworkmanager/po/el.po
index 0f67634..0f67634 100644
--- a/knetworkmanager-0.9/po/el.po
+++ b/tdenetworkmanager/po/el.po
diff --git a/knetworkmanager-0.9/po/en_GB.po b/tdenetworkmanager/po/en_GB.po
index d29d844..d29d844 100644
--- a/knetworkmanager-0.9/po/en_GB.po
+++ b/tdenetworkmanager/po/en_GB.po
diff --git a/knetworkmanager-0.9/po/en_US.po b/tdenetworkmanager/po/en_US.po
index 13aa270..13aa270 100644
--- a/knetworkmanager-0.9/po/en_US.po
+++ b/tdenetworkmanager/po/en_US.po
diff --git a/knetworkmanager-0.9/po/es.po b/tdenetworkmanager/po/es.po
index 043a67e..043a67e 100644
--- a/knetworkmanager-0.9/po/es.po
+++ b/tdenetworkmanager/po/es.po
diff --git a/knetworkmanager-0.9/po/et.po b/tdenetworkmanager/po/et.po
index 60fde3c..60fde3c 100644
--- a/knetworkmanager-0.9/po/et.po
+++ b/tdenetworkmanager/po/et.po
diff --git a/knetworkmanager-0.9/po/fi.po b/tdenetworkmanager/po/fi.po
index df90383..df90383 100644
--- a/knetworkmanager-0.9/po/fi.po
+++ b/tdenetworkmanager/po/fi.po
diff --git a/knetworkmanager-0.9/po/fr.po b/tdenetworkmanager/po/fr.po
index 44bc4df..44bc4df 100644
--- a/knetworkmanager-0.9/po/fr.po
+++ b/tdenetworkmanager/po/fr.po
diff --git a/knetworkmanager-0.9/po/gl.po b/tdenetworkmanager/po/gl.po
index fae1e72..fae1e72 100644
--- a/knetworkmanager-0.9/po/gl.po
+++ b/tdenetworkmanager/po/gl.po
diff --git a/knetworkmanager-0.9/po/gu.po b/tdenetworkmanager/po/gu.po
index a05cefe..a05cefe 100644
--- a/knetworkmanager-0.9/po/gu.po
+++ b/tdenetworkmanager/po/gu.po
diff --git a/knetworkmanager-0.9/po/he.po b/tdenetworkmanager/po/he.po
index 9ca4dfc..9ca4dfc 100644
--- a/knetworkmanager-0.9/po/he.po
+++ b/tdenetworkmanager/po/he.po
diff --git a/knetworkmanager-0.9/po/hi.po b/tdenetworkmanager/po/hi.po
index 0527e1a..0527e1a 100644
--- a/knetworkmanager-0.9/po/hi.po
+++ b/tdenetworkmanager/po/hi.po
diff --git a/knetworkmanager-0.9/po/hr.po b/tdenetworkmanager/po/hr.po
index e3ce240..e3ce240 100644
--- a/knetworkmanager-0.9/po/hr.po
+++ b/tdenetworkmanager/po/hr.po
diff --git a/knetworkmanager-0.9/po/hu.po b/tdenetworkmanager/po/hu.po
index b219636..b219636 100644
--- a/knetworkmanager-0.9/po/hu.po
+++ b/tdenetworkmanager/po/hu.po
diff --git a/knetworkmanager-0.9/po/id.po b/tdenetworkmanager/po/id.po
index 063a624..063a624 100644
--- a/knetworkmanager-0.9/po/id.po
+++ b/tdenetworkmanager/po/id.po
diff --git a/knetworkmanager-0.9/po/it.po b/tdenetworkmanager/po/it.po
index 4234ea4..4234ea4 100644
--- a/knetworkmanager-0.9/po/it.po
+++ b/tdenetworkmanager/po/it.po
diff --git a/knetworkmanager-0.9/po/ja.po b/tdenetworkmanager/po/ja.po
index 58bcb20..58bcb20 100644
--- a/knetworkmanager-0.9/po/ja.po
+++ b/tdenetworkmanager/po/ja.po
diff --git a/knetworkmanager-0.9/po/ka.po b/tdenetworkmanager/po/ka.po
index 14f2a68..14f2a68 100644
--- a/knetworkmanager-0.9/po/ka.po
+++ b/tdenetworkmanager/po/ka.po
diff --git a/knetworkmanager-0.9/po/km.po b/tdenetworkmanager/po/km.po
index 834ebc5..834ebc5 100644
--- a/knetworkmanager-0.9/po/km.po
+++ b/tdenetworkmanager/po/km.po
diff --git a/knetworkmanager-0.9/po/ko.po b/tdenetworkmanager/po/ko.po
index 4367a9b..4367a9b 100644
--- a/knetworkmanager-0.9/po/ko.po
+++ b/tdenetworkmanager/po/ko.po
diff --git a/knetworkmanager-0.9/po/lo.po b/tdenetworkmanager/po/lo.po
index 5b3b5c3..5b3b5c3 100644
--- a/knetworkmanager-0.9/po/lo.po
+++ b/tdenetworkmanager/po/lo.po
diff --git a/knetworkmanager-0.9/po/lt.po b/tdenetworkmanager/po/lt.po
index caacc6e..caacc6e 100644
--- a/knetworkmanager-0.9/po/lt.po
+++ b/tdenetworkmanager/po/lt.po
diff --git a/knetworkmanager-0.9/po/mk.po b/tdenetworkmanager/po/mk.po
index 75566d5..75566d5 100644
--- a/knetworkmanager-0.9/po/mk.po
+++ b/tdenetworkmanager/po/mk.po
diff --git a/knetworkmanager-0.9/po/mr.po b/tdenetworkmanager/po/mr.po
index 8f5aa68..8f5aa68 100644
--- a/knetworkmanager-0.9/po/mr.po
+++ b/tdenetworkmanager/po/mr.po
diff --git a/knetworkmanager-0.9/po/nb.po b/tdenetworkmanager/po/nb.po
index ca3a397..ca3a397 100644
--- a/knetworkmanager-0.9/po/nb.po
+++ b/tdenetworkmanager/po/nb.po
diff --git a/knetworkmanager-0.9/po/nl.po b/tdenetworkmanager/po/nl.po
index a797b74..a797b74 100644
--- a/knetworkmanager-0.9/po/nl.po
+++ b/tdenetworkmanager/po/nl.po
diff --git a/knetworkmanager-0.9/po/pa.po b/tdenetworkmanager/po/pa.po
index 6cda331..6cda331 100644
--- a/knetworkmanager-0.9/po/pa.po
+++ b/tdenetworkmanager/po/pa.po
diff --git a/knetworkmanager-0.9/po/pl.po b/tdenetworkmanager/po/pl.po
index 0011667..0011667 100644
--- a/knetworkmanager-0.9/po/pl.po
+++ b/tdenetworkmanager/po/pl.po
diff --git a/knetworkmanager-0.9/po/pt.po b/tdenetworkmanager/po/pt.po
index 48e8bcc..48e8bcc 100644
--- a/knetworkmanager-0.9/po/pt.po
+++ b/tdenetworkmanager/po/pt.po
diff --git a/knetworkmanager-0.9/po/pt_BR.po b/tdenetworkmanager/po/pt_BR.po
index a20b2c9..a20b2c9 100644
--- a/knetworkmanager-0.9/po/pt_BR.po
+++ b/tdenetworkmanager/po/pt_BR.po
diff --git a/knetworkmanager-0.9/po/ro.po b/tdenetworkmanager/po/ro.po
index 997c5c6..997c5c6 100644
--- a/knetworkmanager-0.9/po/ro.po
+++ b/tdenetworkmanager/po/ro.po
diff --git a/knetworkmanager-0.9/po/ru.po b/tdenetworkmanager/po/ru.po
index e195ed0..e195ed0 100644
--- a/knetworkmanager-0.9/po/ru.po
+++ b/tdenetworkmanager/po/ru.po
diff --git a/knetworkmanager-0.9/po/si.po b/tdenetworkmanager/po/si.po
index f3bd366..f3bd366 100644
--- a/knetworkmanager-0.9/po/si.po
+++ b/tdenetworkmanager/po/si.po
diff --git a/knetworkmanager-0.9/po/sk.po b/tdenetworkmanager/po/sk.po
index e7f06e6..e7f06e6 100644
--- a/knetworkmanager-0.9/po/sk.po
+++ b/tdenetworkmanager/po/sk.po
diff --git a/knetworkmanager-0.9/po/sl.po b/tdenetworkmanager/po/sl.po
index 2dcb14f..2dcb14f 100644
--- a/knetworkmanager-0.9/po/sl.po
+++ b/tdenetworkmanager/po/sl.po
diff --git a/knetworkmanager-0.9/po/sr.po b/tdenetworkmanager/po/sr.po
index d025ffd..d025ffd 100644
--- a/knetworkmanager-0.9/po/sr.po
+++ b/tdenetworkmanager/po/sr.po
diff --git a/knetworkmanager-0.9/po/sv.po b/tdenetworkmanager/po/sv.po
index ae1b7f2..ae1b7f2 100644
--- a/knetworkmanager-0.9/po/sv.po
+++ b/tdenetworkmanager/po/sv.po
diff --git a/knetworkmanager-0.9/po/ta.po b/tdenetworkmanager/po/ta.po
index 5fe0e60..5fe0e60 100644
--- a/knetworkmanager-0.9/po/ta.po
+++ b/tdenetworkmanager/po/ta.po
diff --git a/knetworkmanager-0.9/po/th.po b/tdenetworkmanager/po/th.po
index c6cc2e5..c6cc2e5 100644
--- a/knetworkmanager-0.9/po/th.po
+++ b/tdenetworkmanager/po/th.po
diff --git a/knetworkmanager-0.9/po/tr.po b/tdenetworkmanager/po/tr.po
index ead37c3..ead37c3 100644
--- a/knetworkmanager-0.9/po/tr.po
+++ b/tdenetworkmanager/po/tr.po
diff --git a/knetworkmanager-0.9/po/uk.po b/tdenetworkmanager/po/uk.po
index 62678f9..62678f9 100644
--- a/knetworkmanager-0.9/po/uk.po
+++ b/tdenetworkmanager/po/uk.po
diff --git a/knetworkmanager-0.9/po/vi.po b/tdenetworkmanager/po/vi.po
index 006c6e0..006c6e0 100644
--- a/knetworkmanager-0.9/po/vi.po
+++ b/tdenetworkmanager/po/vi.po
diff --git a/knetworkmanager-0.9/po/wa.po b/tdenetworkmanager/po/wa.po
index a5ce8a6..a5ce8a6 100644
--- a/knetworkmanager-0.9/po/wa.po
+++ b/tdenetworkmanager/po/wa.po
diff --git a/knetworkmanager-0.9/po/xh.po b/tdenetworkmanager/po/xh.po
index dafb189..dafb189 100644
--- a/knetworkmanager-0.9/po/xh.po
+++ b/tdenetworkmanager/po/xh.po
diff --git a/knetworkmanager-0.9/po/zh_CN.po b/tdenetworkmanager/po/zh_CN.po
index fee2ec7..fee2ec7 100644
--- a/knetworkmanager-0.9/po/zh_CN.po
+++ b/tdenetworkmanager/po/zh_CN.po
diff --git a/knetworkmanager-0.9/po/zh_TW.po b/tdenetworkmanager/po/zh_TW.po
index f53bd40..f53bd40 100644
--- a/knetworkmanager-0.9/po/zh_TW.po
+++ b/tdenetworkmanager/po/zh_TW.po
diff --git a/knetworkmanager-0.9/po/zu.po b/tdenetworkmanager/po/zu.po
index a8a3999..a8a3999 100644
--- a/knetworkmanager-0.9/po/zu.po
+++ b/tdenetworkmanager/po/zu.po
diff --git a/knetworkmanager-0.9/src/CMakeLists.txt b/tdenetworkmanager/src/CMakeLists.txt
index ba1e362..320ec32 100644
--- a/knetworkmanager-0.9/src/CMakeLists.txt
+++ b/tdenetworkmanager/src/CMakeLists.txt
@@ -9,8 +9,6 @@
 #
 #################################################
 
-add_subdirectory( dbus )
-
 add_definitions( -UQT_NO_ASCII_CAST )
 
 include_directories(
@@ -89,5 +87,5 @@ tde_add_tdeinit_executable( knetworkmanager AUTOMOC
     knetworkmanager-pluginmanager.cpp knetworkmanager-vpnservice.cpp knetworkmanager-vpnmanager.cpp
     knetworkmanager-vpnauthenticationdialog.cpp devicetraycomponent.cpp traycomponent.cpp
     vpn_tray_component.cpp secret_storage_plugin.cpp
-  LINK knm_dbus-static tdeui-shared kutils-shared ${DBUS_TQT_LIBRARIES}
+  LINK tdecore-shared tdeui-shared kutils-shared ${DBUS_TQT_LIBRARIES}
 )
diff --git a/knetworkmanager-0.9/src/connection_editor.ui b/tdenetworkmanager/src/connection_editor.ui
index 27a69ba..27a69ba 100644
--- a/knetworkmanager-0.9/src/connection_editor.ui
+++ b/tdenetworkmanager/src/connection_editor.ui
diff --git a/knetworkmanager-0.9/src/connection_setting_cdma.ui b/tdenetworkmanager/src/connection_setting_cdma.ui
index 5674468..5674468 100644
--- a/knetworkmanager-0.9/src/connection_setting_cdma.ui
+++ b/tdenetworkmanager/src/connection_setting_cdma.ui
diff --git a/knetworkmanager-0.9/src/connection_setting_gsm.ui b/tdenetworkmanager/src/connection_setting_gsm.ui
index c89a749..c89a749 100644
--- a/knetworkmanager-0.9/src/connection_setting_gsm.ui
+++ b/tdenetworkmanager/src/connection_setting_gsm.ui
diff --git a/knetworkmanager-0.9/src/connection_setting_info.ui b/tdenetworkmanager/src/connection_setting_info.ui
index 72a6e87..72a6e87 100644
--- a/knetworkmanager-0.9/src/connection_setting_info.ui
+++ b/tdenetworkmanager/src/connection_setting_info.ui
diff --git a/knetworkmanager-0.9/src/connection_setting_ipv4.ui b/tdenetworkmanager/src/connection_setting_ipv4.ui
index 0f08a00..0f08a00 100644
--- a/knetworkmanager-0.9/src/connection_setting_ipv4.ui
+++ b/tdenetworkmanager/src/connection_setting_ipv4.ui
diff --git a/knetworkmanager-0.9/src/connection_setting_ppp.ui b/tdenetworkmanager/src/connection_setting_ppp.ui
index 7db6e5e..7db6e5e 100644
--- a/knetworkmanager-0.9/src/connection_setting_ppp.ui
+++ b/tdenetworkmanager/src/connection_setting_ppp.ui
diff --git a/knetworkmanager-0.9/src/connection_setting_serial.ui b/tdenetworkmanager/src/connection_setting_serial.ui
index 2a3b9ad..2a3b9ad 100644
--- a/knetworkmanager-0.9/src/connection_setting_serial.ui
+++ b/tdenetworkmanager/src/connection_setting_serial.ui
diff --git a/knetworkmanager-0.9/src/connection_setting_vpn.ui b/tdenetworkmanager/src/connection_setting_vpn.ui
index 976fc25..976fc25 100644
--- a/knetworkmanager-0.9/src/connection_setting_vpn.ui
+++ b/tdenetworkmanager/src/connection_setting_vpn.ui
diff --git a/knetworkmanager-0.9/src/connection_setting_wireless.ui b/tdenetworkmanager/src/connection_setting_wireless.ui
index 9415ce4..9415ce4 100644
--- a/knetworkmanager-0.9/src/connection_setting_wireless.ui
+++ b/tdenetworkmanager/src/connection_setting_wireless.ui
diff --git a/knetworkmanager-0.9/src/connection_setting_wireless_security.ui b/tdenetworkmanager/src/connection_setting_wireless_security.ui
index 5fce58f..5fce58f 100644
--- a/knetworkmanager-0.9/src/connection_setting_wireless_security.ui
+++ b/tdenetworkmanager/src/connection_setting_wireless_security.ui
diff --git a/knetworkmanager-0.9/src/connection_setting_wireless_security_auth.ui b/tdenetworkmanager/src/connection_setting_wireless_security_auth.ui
index ce88e51..ce88e51 100644
--- a/knetworkmanager-0.9/src/connection_setting_wireless_security_auth.ui
+++ b/tdenetworkmanager/src/connection_setting_wireless_security_auth.ui
diff --git a/knetworkmanager-0.9/src/connection_setting_wireless_security_eap.ui b/tdenetworkmanager/src/connection_setting_wireless_security_eap.ui
index a851a93..a851a93 100644
--- a/knetworkmanager-0.9/src/connection_setting_wireless_security_eap.ui
+++ b/tdenetworkmanager/src/connection_setting_wireless_security_eap.ui
diff --git a/knetworkmanager-0.9/src/connection_setting_wireless_security_phase2.ui b/tdenetworkmanager/src/connection_setting_wireless_security_phase2.ui
index b3237d4..b3237d4 100644
--- a/knetworkmanager-0.9/src/connection_setting_wireless_security_phase2.ui
+++ b/tdenetworkmanager/src/connection_setting_wireless_security_phase2.ui
diff --git a/knetworkmanager-0.9/src/connection_setting_wireless_security_wep.ui b/tdenetworkmanager/src/connection_setting_wireless_security_wep.ui
index c07033e..c07033e 100644
--- a/knetworkmanager-0.9/src/connection_setting_wireless_security_wep.ui
+++ b/tdenetworkmanager/src/connection_setting_wireless_security_wep.ui
diff --git a/knetworkmanager-0.9/src/connection_setting_wireless_security_wepencryption.ui b/tdenetworkmanager/src/connection_setting_wireless_security_wepencryption.ui
index 50c149d..50c149d 100644
--- a/knetworkmanager-0.9/src/connection_setting_wireless_security_wepencryption.ui
+++ b/tdenetworkmanager/src/connection_setting_wireless_security_wepencryption.ui
diff --git a/knetworkmanager-0.9/src/connection_setting_wireless_security_wpacipher.ui b/tdenetworkmanager/src/connection_setting_wireless_security_wpacipher.ui
index a402e66..a402e66 100644
--- a/knetworkmanager-0.9/src/connection_setting_wireless_security_wpacipher.ui
+++ b/tdenetworkmanager/src/connection_setting_wireless_security_wpacipher.ui
diff --git a/knetworkmanager-0.9/src/connection_setting_wireless_security_wpapsk.ui b/tdenetworkmanager/src/connection_setting_wireless_security_wpapsk.ui
index 4df8eea..4df8eea 100644
--- a/knetworkmanager-0.9/src/connection_setting_wireless_security_wpapsk.ui
+++ b/tdenetworkmanager/src/connection_setting_wireless_security_wpapsk.ui
diff --git a/knetworkmanager-0.9/src/connection_setting_wireless_security_wpaversion.ui b/tdenetworkmanager/src/connection_setting_wireless_security_wpaversion.ui
index 11b1655..11b1655 100644
--- a/knetworkmanager-0.9/src/connection_setting_wireless_security_wpaversion.ui
+++ b/tdenetworkmanager/src/connection_setting_wireless_security_wpaversion.ui
diff --git a/knetworkmanager-0.9/src/connection_settings.ui b/tdenetworkmanager/src/connection_settings.ui
index c7994de..c7994de 100644
--- a/knetworkmanager-0.9/src/connection_settings.ui
+++ b/tdenetworkmanager/src/connection_settings.ui
diff --git a/knetworkmanager-0.9/src/devicetraycomponent.cpp b/tdenetworkmanager/src/devicetraycomponent.cpp
index d42db60..d42db60 100644
--- a/knetworkmanager-0.9/src/devicetraycomponent.cpp
+++ b/tdenetworkmanager/src/devicetraycomponent.cpp
diff --git a/knetworkmanager-0.9/src/devicetraycomponent.h b/tdenetworkmanager/src/devicetraycomponent.h
index 729076f..729076f 100644
--- a/knetworkmanager-0.9/src/devicetraycomponent.h
+++ b/tdenetworkmanager/src/devicetraycomponent.h
diff --git a/knetworkmanager-0.9/src/eventsrc b/tdenetworkmanager/src/eventsrc
index 47723af..47723af 100644
--- a/knetworkmanager-0.9/src/eventsrc
+++ b/tdenetworkmanager/src/eventsrc
diff --git a/knetworkmanager-0.9/src/knetworkmanager-accesspoint.cpp b/tdenetworkmanager/src/knetworkmanager-accesspoint.cpp
index 0bd5528..0bd5528 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-accesspoint.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-accesspoint.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-accesspoint.h b/tdenetworkmanager/src/knetworkmanager-accesspoint.h
index d9e7a60..d9e7a60 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-accesspoint.h
+++ b/tdenetworkmanager/src/knetworkmanager-accesspoint.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-cdma_connection.cpp b/tdenetworkmanager/src/knetworkmanager-cdma_connection.cpp
index 9118c49..9118c49 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-cdma_connection.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-cdma_connection.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-cdma_connection.h b/tdenetworkmanager/src/knetworkmanager-cdma_connection.h
index 0d52d22..0d52d22 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-cdma_connection.h
+++ b/tdenetworkmanager/src/knetworkmanager-cdma_connection.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-cdma_device.cpp b/tdenetworkmanager/src/knetworkmanager-cdma_device.cpp
index 0aecade..0aecade 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-cdma_device.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-cdma_device.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-cdma_device.h b/tdenetworkmanager/src/knetworkmanager-cdma_device.h
index 2de56d7..2de56d7 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-cdma_device.h
+++ b/tdenetworkmanager/src/knetworkmanager-cdma_device.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-cellular_device.cpp b/tdenetworkmanager/src/knetworkmanager-cellular_device.cpp
index e74c590..e74c590 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-cellular_device.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-cellular_device.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-cellular_device.h b/tdenetworkmanager/src/knetworkmanager-cellular_device.h
index d680490..d680490 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-cellular_device.h
+++ b/tdenetworkmanager/src/knetworkmanager-cellular_device.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-cellular_device_tray.cpp b/tdenetworkmanager/src/knetworkmanager-cellular_device_tray.cpp
index ea88749..ea88749 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-cellular_device_tray.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-cellular_device_tray.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-cellular_device_tray.h b/tdenetworkmanager/src/knetworkmanager-cellular_device_tray.h
index 282cc3e..282cc3e 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-cellular_device_tray.h
+++ b/tdenetworkmanager/src/knetworkmanager-cellular_device_tray.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection.cpp b/tdenetworkmanager/src/knetworkmanager-connection.cpp
index f0da309..f0da309 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection.h b/tdenetworkmanager/src/knetworkmanager-connection.h
index a370700..a370700 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_dbus.cpp b/tdenetworkmanager/src/knetworkmanager-connection_dbus.cpp
index ecca0f5..ecca0f5 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_dbus.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection_dbus.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_dbus.h b/tdenetworkmanager/src/knetworkmanager-connection_dbus.h
index f7bdc00..f7bdc00 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_dbus.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection_dbus.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_editor.cpp b/tdenetworkmanager/src/knetworkmanager-connection_editor.cpp
index e787a79..e787a79 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_editor.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection_editor.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_editor.h b/tdenetworkmanager/src/knetworkmanager-connection_editor.h
index a0a7567..a0a7567 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_editor.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection_editor.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_secrets_dbus.cpp b/tdenetworkmanager/src/knetworkmanager-connection_secrets_dbus.cpp
index aa64666..aa64666 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_secrets_dbus.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection_secrets_dbus.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_secrets_dbus.h b/tdenetworkmanager/src/knetworkmanager-connection_secrets_dbus.h
index 78a6303..78a6303 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_secrets_dbus.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection_secrets_dbus.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting.cpp b/tdenetworkmanager/src/knetworkmanager-connection_setting.cpp
index 50d7423..50d7423 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting.h b/tdenetworkmanager/src/knetworkmanager-connection_setting.h
index f189117..f189117 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_8021x.cpp b/tdenetworkmanager/src/knetworkmanager-connection_setting_8021x.cpp
index 4904f01..4904f01 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_8021x.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_8021x.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_8021x.h b/tdenetworkmanager/src/knetworkmanager-connection_setting_8021x.h
index a5c593e..a5c593e 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_8021x.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_8021x.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_cdma.cpp b/tdenetworkmanager/src/knetworkmanager-connection_setting_cdma.cpp
index 854590c..854590c 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_cdma.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_cdma.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_cdma.h b/tdenetworkmanager/src/knetworkmanager-connection_setting_cdma.h
index c0825b3..c0825b3 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_cdma.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_cdma.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_cdma_widget.cpp b/tdenetworkmanager/src/knetworkmanager-connection_setting_cdma_widget.cpp
index b09fea9..b09fea9 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_cdma_widget.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_cdma_widget.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_cdma_widget.h b/tdenetworkmanager/src/knetworkmanager-connection_setting_cdma_widget.h
index 6ee8a37..6ee8a37 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_cdma_widget.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_cdma_widget.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_gsm.cpp b/tdenetworkmanager/src/knetworkmanager-connection_setting_gsm.cpp
index cd38c3f..cd38c3f 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_gsm.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_gsm.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_gsm.h b/tdenetworkmanager/src/knetworkmanager-connection_setting_gsm.h
index ac912ae..ac912ae 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_gsm.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_gsm.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_gsm_widget.cpp b/tdenetworkmanager/src/knetworkmanager-connection_setting_gsm_widget.cpp
index 88af9bb..88af9bb 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_gsm_widget.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_gsm_widget.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_gsm_widget.h b/tdenetworkmanager/src/knetworkmanager-connection_setting_gsm_widget.h
index df77606..df77606 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_gsm_widget.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_gsm_widget.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_info.cpp b/tdenetworkmanager/src/knetworkmanager-connection_setting_info.cpp
index 225d002..225d002 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_info.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_info.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_info.h b/tdenetworkmanager/src/knetworkmanager-connection_setting_info.h
index 705387b..705387b 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_info.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_info.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_info_widget.cpp b/tdenetworkmanager/src/knetworkmanager-connection_setting_info_widget.cpp
index e0982e8..e0982e8 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_info_widget.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_info_widget.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_info_widget.h b/tdenetworkmanager/src/knetworkmanager-connection_setting_info_widget.h
index 16a7ace..16a7ace 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_info_widget.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_info_widget.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_ipv4.cpp b/tdenetworkmanager/src/knetworkmanager-connection_setting_ipv4.cpp
index 15f8978..15f8978 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_ipv4.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_ipv4.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_ipv4.h b/tdenetworkmanager/src/knetworkmanager-connection_setting_ipv4.h
index 7788769..7788769 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_ipv4.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_ipv4.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_ipv4_widget.cpp b/tdenetworkmanager/src/knetworkmanager-connection_setting_ipv4_widget.cpp
index ca00a49..ca00a49 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_ipv4_widget.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_ipv4_widget.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_ipv4_widget.h b/tdenetworkmanager/src/knetworkmanager-connection_setting_ipv4_widget.h
index 4fabdce..4fabdce 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_ipv4_widget.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_ipv4_widget.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_ppp.cpp b/tdenetworkmanager/src/knetworkmanager-connection_setting_ppp.cpp
index 257a012..257a012 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_ppp.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_ppp.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_ppp.h b/tdenetworkmanager/src/knetworkmanager-connection_setting_ppp.h
index 9f72e42..9f72e42 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_ppp.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_ppp.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_ppp_widget.cpp b/tdenetworkmanager/src/knetworkmanager-connection_setting_ppp_widget.cpp
index e735969..e735969 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_ppp_widget.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_ppp_widget.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_ppp_widget.h b/tdenetworkmanager/src/knetworkmanager-connection_setting_ppp_widget.h
index acdc2a2..acdc2a2 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_ppp_widget.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_ppp_widget.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_serial.cpp b/tdenetworkmanager/src/knetworkmanager-connection_setting_serial.cpp
index 4861e7b..4861e7b 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_serial.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_serial.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_serial.h b/tdenetworkmanager/src/knetworkmanager-connection_setting_serial.h
index 40099a7..40099a7 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_serial.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_serial.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_serial_widget.cpp b/tdenetworkmanager/src/knetworkmanager-connection_setting_serial_widget.cpp
index 87b92db..87b92db 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_serial_widget.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_serial_widget.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_serial_widget.h b/tdenetworkmanager/src/knetworkmanager-connection_setting_serial_widget.h
index 5b3bf28..5b3bf28 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_serial_widget.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_serial_widget.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_vpn.cpp b/tdenetworkmanager/src/knetworkmanager-connection_setting_vpn.cpp
index 22e8b20..22e8b20 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_vpn.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_vpn.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_vpn.h b/tdenetworkmanager/src/knetworkmanager-connection_setting_vpn.h
index 6850fc2..6850fc2 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_vpn.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_vpn.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_vpn_widget.cpp b/tdenetworkmanager/src/knetworkmanager-connection_setting_vpn_widget.cpp
index 0e9ac95..0e9ac95 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_vpn_widget.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_vpn_widget.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_vpn_widget.h b/tdenetworkmanager/src/knetworkmanager-connection_setting_vpn_widget.h
index f7c16cd..f7c16cd 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_vpn_widget.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_vpn_widget.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_widget_interface.cpp b/tdenetworkmanager/src/knetworkmanager-connection_setting_widget_interface.cpp
index 2c00288..2c00288 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_widget_interface.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_widget_interface.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_widget_interface.h b/tdenetworkmanager/src/knetworkmanager-connection_setting_widget_interface.h
index 13ea65e..13ea65e 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_widget_interface.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_widget_interface.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wired.cpp b/tdenetworkmanager/src/knetworkmanager-connection_setting_wired.cpp
index 03aa61f..03aa61f 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wired.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_wired.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wired.h b/tdenetworkmanager/src/knetworkmanager-connection_setting_wired.h
index 9da930e..9da930e 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wired.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_wired.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless.cpp b/tdenetworkmanager/src/knetworkmanager-connection_setting_wireless.cpp
index 2e1db8e..2e1db8e 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_wireless.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless.h b/tdenetworkmanager/src/knetworkmanager-connection_setting_wireless.h
index acdec94..acdec94 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_wireless.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security.cpp b/tdenetworkmanager/src/knetworkmanager-connection_setting_wireless_security.cpp
index a01f8f6..a01f8f6 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_wireless_security.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security.h b/tdenetworkmanager/src/knetworkmanager-connection_setting_wireless_security.h
index 187fd37..187fd37 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_wireless_security.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.cpp b/tdenetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.cpp
index 1adea03..1adea03 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.h b/tdenetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.h
index 7e90694..7e90694 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_widget.cpp b/tdenetworkmanager/src/knetworkmanager-connection_setting_wireless_widget.cpp
index e6bd9c2..e6bd9c2 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_widget.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_wireless_widget.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_widget.h b/tdenetworkmanager/src/knetworkmanager-connection_setting_wireless_widget.h
index 0baba65..0baba65 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_widget.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection_setting_wireless_widget.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_settings_dialog.cpp b/tdenetworkmanager/src/knetworkmanager-connection_settings_dialog.cpp
index 97f8350..97f8350 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_settings_dialog.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection_settings_dialog.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_settings_dialog.h b/tdenetworkmanager/src/knetworkmanager-connection_settings_dialog.h
index 9cedc69..9cedc69 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_settings_dialog.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection_settings_dialog.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_store.cpp b/tdenetworkmanager/src/knetworkmanager-connection_store.cpp
index aeb3b60..aeb3b60 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_store.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection_store.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_store.h b/tdenetworkmanager/src/knetworkmanager-connection_store.h
index a399270..a399270 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-connection_store.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection_store.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-device.cpp b/tdenetworkmanager/src/knetworkmanager-device.cpp
index 585ce8d..585ce8d 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-device.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-device.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-device.h b/tdenetworkmanager/src/knetworkmanager-device.h
index 2a12ec8..2a12ec8 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-device.h
+++ b/tdenetworkmanager/src/knetworkmanager-device.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-device_tray.cpp b/tdenetworkmanager/src/knetworkmanager-device_tray.cpp
index e0c05a9..e0c05a9 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-device_tray.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-device_tray.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-device_tray.h b/tdenetworkmanager/src/knetworkmanager-device_tray.h
index 5b390ad..5b390ad 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-device_tray.h
+++ b/tdenetworkmanager/src/knetworkmanager-device_tray.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-devicestore.cpp b/tdenetworkmanager/src/knetworkmanager-devicestore.cpp
index 6f217c1..6f217c1 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-devicestore.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-devicestore.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-devicestore.h b/tdenetworkmanager/src/knetworkmanager-devicestore.h
index caf8428..caf8428 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-devicestore.h
+++ b/tdenetworkmanager/src/knetworkmanager-devicestore.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-generic_connection.cpp b/tdenetworkmanager/src/knetworkmanager-generic_connection.cpp
index 9f9b12d..9f9b12d 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-generic_connection.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-generic_connection.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-generic_connection.h b/tdenetworkmanager/src/knetworkmanager-generic_connection.h
index 6acbd32..6acbd32 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-generic_connection.h
+++ b/tdenetworkmanager/src/knetworkmanager-generic_connection.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-gsm_connection.cpp b/tdenetworkmanager/src/knetworkmanager-gsm_connection.cpp
index 307f40f..307f40f 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-gsm_connection.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-gsm_connection.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-gsm_connection.h b/tdenetworkmanager/src/knetworkmanager-gsm_connection.h
index 0e4dc0e..0e4dc0e 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-gsm_connection.h
+++ b/tdenetworkmanager/src/knetworkmanager-gsm_connection.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-gsm_device.cpp b/tdenetworkmanager/src/knetworkmanager-gsm_device.cpp
index e978b49..e978b49 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-gsm_device.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-gsm_device.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-gsm_device.h b/tdenetworkmanager/src/knetworkmanager-gsm_device.h
index 6149890..6149890 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-gsm_device.h
+++ b/tdenetworkmanager/src/knetworkmanager-gsm_device.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-hal_device_proxy.cpp b/tdenetworkmanager/src/knetworkmanager-hal_device_proxy.cpp
index dda50aa..dda50aa 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-hal_device_proxy.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-hal_device_proxy.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-hal_device_proxy.h b/tdenetworkmanager/src/knetworkmanager-hal_device_proxy.h
index 663301e..663301e 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-hal_device_proxy.h
+++ b/tdenetworkmanager/src/knetworkmanager-hal_device_proxy.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-menu_subhead.cpp b/tdenetworkmanager/src/knetworkmanager-menu_subhead.cpp
index 5a69cd5..5a69cd5 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-menu_subhead.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-menu_subhead.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-menu_subhead.h b/tdenetworkmanager/src/knetworkmanager-menu_subhead.h
index 8891fc4..8891fc4 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-menu_subhead.h
+++ b/tdenetworkmanager/src/knetworkmanager-menu_subhead.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-menuitem.cpp b/tdenetworkmanager/src/knetworkmanager-menuitem.cpp
index b13563e..b13563e 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-menuitem.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-menuitem.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-menuitem.h b/tdenetworkmanager/src/knetworkmanager-menuitem.h
index 5f9f6eb..5f9f6eb 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-menuitem.h
+++ b/tdenetworkmanager/src/knetworkmanager-menuitem.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-nm_proxy.cpp b/tdenetworkmanager/src/knetworkmanager-nm_proxy.cpp
index 3cfe642..3cfe642 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-nm_proxy.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-nm_proxy.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-nm_proxy.h b/tdenetworkmanager/src/knetworkmanager-nm_proxy.h
index 05ade99..05ade99 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-nm_proxy.h
+++ b/tdenetworkmanager/src/knetworkmanager-nm_proxy.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-nm_vpn_proxy.cpp b/tdenetworkmanager/src/knetworkmanager-nm_vpn_proxy.cpp
index 737f4ef..737f4ef 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-nm_vpn_proxy.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-nm_vpn_proxy.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-nm_vpn_proxy.h b/tdenetworkmanager/src/knetworkmanager-nm_vpn_proxy.h
index af5f8ec..af5f8ec 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-nm_vpn_proxy.h
+++ b/tdenetworkmanager/src/knetworkmanager-nm_vpn_proxy.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-nmsettings.cpp b/tdenetworkmanager/src/knetworkmanager-nmsettings.cpp
index e0227c7..e0227c7 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-nmsettings.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-nmsettings.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-nmsettings.h b/tdenetworkmanager/src/knetworkmanager-nmsettings.h
index c9769c1..c9769c1 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-nmsettings.h
+++ b/tdenetworkmanager/src/knetworkmanager-nmsettings.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-plugin.cpp b/tdenetworkmanager/src/knetworkmanager-plugin.cpp
index cb1d2b7..cb1d2b7 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-plugin.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-plugin.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-plugin.h b/tdenetworkmanager/src/knetworkmanager-plugin.h
index 3a500ac..3a500ac 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-plugin.h
+++ b/tdenetworkmanager/src/knetworkmanager-plugin.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-pluginmanager.cpp b/tdenetworkmanager/src/knetworkmanager-pluginmanager.cpp
index b9b22f6..b9b22f6 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-pluginmanager.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-pluginmanager.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-pluginmanager.h b/tdenetworkmanager/src/knetworkmanager-pluginmanager.h
index efe6c63..efe6c63 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-pluginmanager.h
+++ b/tdenetworkmanager/src/knetworkmanager-pluginmanager.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-ppp_connection.cpp b/tdenetworkmanager/src/knetworkmanager-ppp_connection.cpp
index 9595c31..9595c31 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-ppp_connection.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-ppp_connection.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-ppp_connection.h b/tdenetworkmanager/src/knetworkmanager-ppp_connection.h
index e58e553..e58e553 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-ppp_connection.h
+++ b/tdenetworkmanager/src/knetworkmanager-ppp_connection.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-storage.cpp b/tdenetworkmanager/src/knetworkmanager-storage.cpp
index b4ce93b..b4ce93b 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-storage.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-storage.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-storage.h b/tdenetworkmanager/src/knetworkmanager-storage.h
index 33682ea..33682ea 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-storage.h
+++ b/tdenetworkmanager/src/knetworkmanager-storage.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-tray.cpp b/tdenetworkmanager/src/knetworkmanager-tray.cpp
index 62851ff..62851ff 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-tray.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-tray.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-tray.h b/tdenetworkmanager/src/knetworkmanager-tray.h
index cbce02b..cbce02b 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-tray.h
+++ b/tdenetworkmanager/src/knetworkmanager-tray.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-vpn_connection.cpp b/tdenetworkmanager/src/knetworkmanager-vpn_connection.cpp
index e15f2a9..e15f2a9 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-vpn_connection.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-vpn_connection.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-vpn_connection.h b/tdenetworkmanager/src/knetworkmanager-vpn_connection.h
index 6d504f5..6d504f5 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-vpn_connection.h
+++ b/tdenetworkmanager/src/knetworkmanager-vpn_connection.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-vpn_device.cpp b/tdenetworkmanager/src/knetworkmanager-vpn_device.cpp
index 6093ecf..6093ecf 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-vpn_device.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-vpn_device.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-vpn_device.h b/tdenetworkmanager/src/knetworkmanager-vpn_device.h
index f3c3db7..f3c3db7 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-vpn_device.h
+++ b/tdenetworkmanager/src/knetworkmanager-vpn_device.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-vpn_plugin.cpp b/tdenetworkmanager/src/knetworkmanager-vpn_plugin.cpp
index f56b221..f56b221 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-vpn_plugin.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-vpn_plugin.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-vpn_plugin.h b/tdenetworkmanager/src/knetworkmanager-vpn_plugin.h
index 88c63e0..88c63e0 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-vpn_plugin.h
+++ b/tdenetworkmanager/src/knetworkmanager-vpn_plugin.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-vpnauthenticationdialog.cpp b/tdenetworkmanager/src/knetworkmanager-vpnauthenticationdialog.cpp
index ffeb933..ffeb933 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-vpnauthenticationdialog.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-vpnauthenticationdialog.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-vpnauthenticationdialog.h b/tdenetworkmanager/src/knetworkmanager-vpnauthenticationdialog.h
index 8c43e7d..8c43e7d 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-vpnauthenticationdialog.h
+++ b/tdenetworkmanager/src/knetworkmanager-vpnauthenticationdialog.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-vpnmanager.cpp b/tdenetworkmanager/src/knetworkmanager-vpnmanager.cpp
index 5b7e64e..5b7e64e 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-vpnmanager.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-vpnmanager.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-vpnmanager.h b/tdenetworkmanager/src/knetworkmanager-vpnmanager.h
index 769d2c3..769d2c3 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-vpnmanager.h
+++ b/tdenetworkmanager/src/knetworkmanager-vpnmanager.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-vpnplugin.cpp b/tdenetworkmanager/src/knetworkmanager-vpnplugin.cpp
index 02ef8fe..02ef8fe 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-vpnplugin.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-vpnplugin.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-vpnplugin.h b/tdenetworkmanager/src/knetworkmanager-vpnplugin.h
index 3b8b625..3b8b625 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-vpnplugin.h
+++ b/tdenetworkmanager/src/knetworkmanager-vpnplugin.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-vpnservice.cpp b/tdenetworkmanager/src/knetworkmanager-vpnservice.cpp
index 84daa0c..84daa0c 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-vpnservice.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-vpnservice.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-vpnservice.h b/tdenetworkmanager/src/knetworkmanager-vpnservice.h
index 51a03f6..51a03f6 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-vpnservice.h
+++ b/tdenetworkmanager/src/knetworkmanager-vpnservice.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-wired_connection.cpp b/tdenetworkmanager/src/knetworkmanager-wired_connection.cpp
index 6eff4ee..6eff4ee 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-wired_connection.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-wired_connection.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-wired_connection.h b/tdenetworkmanager/src/knetworkmanager-wired_connection.h
index e641bfa..e641bfa 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-wired_connection.h
+++ b/tdenetworkmanager/src/knetworkmanager-wired_connection.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-wired_device.cpp b/tdenetworkmanager/src/knetworkmanager-wired_device.cpp
index 2a59d3d..2a59d3d 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-wired_device.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-wired_device.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-wired_device.h b/tdenetworkmanager/src/knetworkmanager-wired_device.h
index 0a52a44..0a52a44 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-wired_device.h
+++ b/tdenetworkmanager/src/knetworkmanager-wired_device.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-wired_device_tray.cpp b/tdenetworkmanager/src/knetworkmanager-wired_device_tray.cpp
index 7e96886..7e96886 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-wired_device_tray.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-wired_device_tray.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-wired_device_tray.h b/tdenetworkmanager/src/knetworkmanager-wired_device_tray.h
index 7fcab3b..7fcab3b 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-wired_device_tray.h
+++ b/tdenetworkmanager/src/knetworkmanager-wired_device_tray.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-wireless_connection.cpp b/tdenetworkmanager/src/knetworkmanager-wireless_connection.cpp
index b11879f..b11879f 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-wireless_connection.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-wireless_connection.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-wireless_connection.h b/tdenetworkmanager/src/knetworkmanager-wireless_connection.h
index b559ab1..b559ab1 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-wireless_connection.h
+++ b/tdenetworkmanager/src/knetworkmanager-wireless_connection.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-wireless_device.cpp b/tdenetworkmanager/src/knetworkmanager-wireless_device.cpp
index 554f797..554f797 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-wireless_device.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-wireless_device.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-wireless_device.h b/tdenetworkmanager/src/knetworkmanager-wireless_device.h
index dd94ef7..dd94ef7 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-wireless_device.h
+++ b/tdenetworkmanager/src/knetworkmanager-wireless_device.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-wireless_device_tray.cpp b/tdenetworkmanager/src/knetworkmanager-wireless_device_tray.cpp
index 443fdec..443fdec 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-wireless_device_tray.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-wireless_device_tray.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-wireless_device_tray.h b/tdenetworkmanager/src/knetworkmanager-wireless_device_tray.h
index 46b25f1..46b25f1 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-wireless_device_tray.h
+++ b/tdenetworkmanager/src/knetworkmanager-wireless_device_tray.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-wireless_manager.cpp b/tdenetworkmanager/src/knetworkmanager-wireless_manager.cpp
index c77d2ad..c77d2ad 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-wireless_manager.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-wireless_manager.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-wireless_manager.h b/tdenetworkmanager/src/knetworkmanager-wireless_manager.h
index f90fce7..f90fce7 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-wireless_manager.h
+++ b/tdenetworkmanager/src/knetworkmanager-wireless_manager.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-wireless_menuitem.cpp b/tdenetworkmanager/src/knetworkmanager-wireless_menuitem.cpp
index f8bedae..f8bedae 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-wireless_menuitem.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-wireless_menuitem.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-wireless_menuitem.h b/tdenetworkmanager/src/knetworkmanager-wireless_menuitem.h
index 98b6321..98b6321 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-wireless_menuitem.h
+++ b/tdenetworkmanager/src/knetworkmanager-wireless_menuitem.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager-wireless_network.cpp b/tdenetworkmanager/src/knetworkmanager-wireless_network.cpp
index ba509dd..ba509dd 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-wireless_network.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-wireless_network.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager-wireless_network.h b/tdenetworkmanager/src/knetworkmanager-wireless_network.h
index addce7a..addce7a 100644
--- a/knetworkmanager-0.9/src/knetworkmanager-wireless_network.h
+++ b/tdenetworkmanager/src/knetworkmanager-wireless_network.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager.cpp b/tdenetworkmanager/src/knetworkmanager.cpp
index 81532e0..81532e0 100644
--- a/knetworkmanager-0.9/src/knetworkmanager.cpp
+++ b/tdenetworkmanager/src/knetworkmanager.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager.desktop b/tdenetworkmanager/src/knetworkmanager.desktop
index fc9b45f..fc9b45f 100644
--- a/knetworkmanager-0.9/src/knetworkmanager.desktop
+++ b/tdenetworkmanager/src/knetworkmanager.desktop
diff --git a/knetworkmanager-0.9/src/knetworkmanager.h b/tdenetworkmanager/src/knetworkmanager.h
index cb48772..cb48772 100644
--- a/knetworkmanager-0.9/src/knetworkmanager.h
+++ b/tdenetworkmanager/src/knetworkmanager.h
diff --git a/knetworkmanager-0.9/src/knetworkmanager.la.cpp b/tdenetworkmanager/src/knetworkmanager.la.cpp
index 3d480c4..3d480c4 100644
--- a/knetworkmanager-0.9/src/knetworkmanager.la.cpp
+++ b/tdenetworkmanager/src/knetworkmanager.la.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager_dummy.cpp b/tdenetworkmanager/src/knetworkmanager_dummy.cpp
index efd89d8..efd89d8 100644
--- a/knetworkmanager-0.9/src/knetworkmanager_dummy.cpp
+++ b/tdenetworkmanager/src/knetworkmanager_dummy.cpp
diff --git a/knetworkmanager-0.9/src/knetworkmanager_plugin.desktop b/tdenetworkmanager/src/knetworkmanager_plugin.desktop
index ec85a19..ec85a19 100644
--- a/knetworkmanager-0.9/src/knetworkmanager_plugin.desktop
+++ b/tdenetworkmanager/src/knetworkmanager_plugin.desktop
diff --git a/knetworkmanager-0.9/src/knetworkmanager_vpnplugin.desktop b/tdenetworkmanager/src/knetworkmanager_vpnplugin.desktop
index 4cf28dc..4cf28dc 100644
--- a/knetworkmanager-0.9/src/knetworkmanager_vpnplugin.desktop
+++ b/tdenetworkmanager/src/knetworkmanager_vpnplugin.desktop
diff --git a/knetworkmanager-0.9/src/main.cpp b/tdenetworkmanager/src/main.cpp
index 0355bad..0355bad 100644
--- a/knetworkmanager-0.9/src/main.cpp
+++ b/tdenetworkmanager/src/main.cpp
diff --git a/knetworkmanager-0.9/src/md5.cpp b/tdenetworkmanager/src/md5.cpp
index e8e1f02..e8e1f02 100644
--- a/knetworkmanager-0.9/src/md5.cpp
+++ b/tdenetworkmanager/src/md5.cpp
diff --git a/knetworkmanager-0.9/src/md5.h b/tdenetworkmanager/src/md5.h
index f3fd5be..f3fd5be 100644
--- a/knetworkmanager-0.9/src/md5.h
+++ b/tdenetworkmanager/src/md5.h
diff --git a/knetworkmanager-0.9/src/qbidirectionalmap.h b/tdenetworkmanager/src/qbidirectionalmap.h
index 530c6cc..530c6cc 100644
--- a/knetworkmanager-0.9/src/qbidirectionalmap.h
+++ b/tdenetworkmanager/src/qbidirectionalmap.h
diff --git a/knetworkmanager-0.9/src/secret_storage_plugin.cpp b/tdenetworkmanager/src/secret_storage_plugin.cpp
index db051c4..db051c4 100644
--- a/knetworkmanager-0.9/src/secret_storage_plugin.cpp
+++ b/tdenetworkmanager/src/secret_storage_plugin.cpp
diff --git a/knetworkmanager-0.9/src/secret_storage_plugin.h b/tdenetworkmanager/src/secret_storage_plugin.h
index c2713e8..c2713e8 100644
--- a/knetworkmanager-0.9/src/secret_storage_plugin.h
+++ b/tdenetworkmanager/src/secret_storage_plugin.h
diff --git a/knetworkmanager-0.9/src/settings.kcfgc b/tdenetworkmanager/src/settings.kcfgc
index 35e7882..35e7882 100644
--- a/knetworkmanager-0.9/src/settings.kcfgc
+++ b/tdenetworkmanager/src/settings.kcfgc
diff --git a/knetworkmanager-0.9/src/sha1.cpp b/tdenetworkmanager/src/sha1.cpp
index 74f4df9..74f4df9 100644
--- a/knetworkmanager-0.9/src/sha1.cpp
+++ b/tdenetworkmanager/src/sha1.cpp
diff --git a/knetworkmanager-0.9/src/sha1.h b/tdenetworkmanager/src/sha1.h
index 40863c8..40863c8 100644
--- a/knetworkmanager-0.9/src/sha1.h
+++ b/tdenetworkmanager/src/sha1.h
diff --git a/knetworkmanager-0.9/src/traycomponent.cpp b/tdenetworkmanager/src/traycomponent.cpp
index 26f31b7..26f31b7 100644
--- a/knetworkmanager-0.9/src/traycomponent.cpp
+++ b/tdenetworkmanager/src/traycomponent.cpp
diff --git a/knetworkmanager-0.9/src/traycomponent.h b/tdenetworkmanager/src/traycomponent.h
index 4128f11..4128f11 100644
--- a/knetworkmanager-0.9/src/traycomponent.h
+++ b/tdenetworkmanager/src/traycomponent.h
diff --git a/knetworkmanager-0.9/src/vpn_tray_component.cpp b/tdenetworkmanager/src/vpn_tray_component.cpp
index 68ad8a1..68ad8a1 100644
--- a/knetworkmanager-0.9/src/vpn_tray_component.cpp
+++ b/tdenetworkmanager/src/vpn_tray_component.cpp
diff --git a/knetworkmanager-0.9/src/vpn_tray_component.h b/tdenetworkmanager/src/vpn_tray_component.h
index 2af5b55..2af5b55 100644
--- a/knetworkmanager-0.9/src/vpn_tray_component.h
+++ b/tdenetworkmanager/src/vpn_tray_component.h
diff --git a/knetworkmanager-0.9/src/vpnauthentication.ui b/tdenetworkmanager/src/vpnauthentication.ui
index 124fa55..124fa55 100644
--- a/knetworkmanager-0.9/src/vpnauthentication.ui
+++ b/tdenetworkmanager/src/vpnauthentication.ui
diff --git a/knetworkmanager-0.9/src/xmlmarshaller.cpp b/tdenetworkmanager/src/xmlmarshaller.cpp
index a826e39..a826e39 100644
--- a/knetworkmanager-0.9/src/xmlmarshaller.cpp
+++ b/tdenetworkmanager/src/xmlmarshaller.cpp
diff --git a/knetworkmanager-0.9/src/xmlmarshaller.h b/tdenetworkmanager/src/xmlmarshaller.h
index f86ef92..f86ef92 100644
--- a/knetworkmanager-0.9/src/xmlmarshaller.h
+++ b/tdenetworkmanager/src/xmlmarshaller.h
diff --git a/knetworkmanager-0.9/vpn-plugins/openvpn/AUTHORS b/tdenetworkmanager/vpn-plugins/openvpn/AUTHORS
index f4340ea..f4340ea 100644
--- a/knetworkmanager-0.9/vpn-plugins/openvpn/AUTHORS
+++ b/tdenetworkmanager/vpn-plugins/openvpn/AUTHORS
diff --git a/knetworkmanager-0.9/vpn-plugins/openvpn/knetworkmanager_openvpn.desktop b/tdenetworkmanager/vpn-plugins/openvpn/knetworkmanager_openvpn.desktop
index ece3c52..ece3c52 100644
--- a/knetworkmanager-0.9/vpn-plugins/openvpn/knetworkmanager_openvpn.desktop
+++ b/tdenetworkmanager/vpn-plugins/openvpn/knetworkmanager_openvpn.desktop
diff --git a/knetworkmanager-0.9/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp b/tdenetworkmanager/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp
index 020df5a..020df5a 100644
--- a/knetworkmanager-0.9/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp
+++ b/tdenetworkmanager/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp
diff --git a/knetworkmanager-0.9/vpn-plugins/openvpn/src/knetworkmanager-openvpn.h b/tdenetworkmanager/vpn-plugins/openvpn/src/knetworkmanager-openvpn.h
index 4b43b18..4b43b18 100644
--- a/knetworkmanager-0.9/vpn-plugins/openvpn/src/knetworkmanager-openvpn.h
+++ b/tdenetworkmanager/vpn-plugins/openvpn/src/knetworkmanager-openvpn.h
diff --git a/knetworkmanager-0.9/vpn-plugins/openvpn/src/openvpnauth.ui b/tdenetworkmanager/vpn-plugins/openvpn/src/openvpnauth.ui
index 3bea9b4..3bea9b4 100644
--- a/knetworkmanager-0.9/vpn-plugins/openvpn/src/openvpnauth.ui
+++ b/tdenetworkmanager/vpn-plugins/openvpn/src/openvpnauth.ui
diff --git a/knetworkmanager-0.9/vpn-plugins/openvpn/src/openvpnprop.ui b/tdenetworkmanager/vpn-plugins/openvpn/src/openvpnprop.ui
index a6d0945..a6d0945 100644
--- a/knetworkmanager-0.9/vpn-plugins/openvpn/src/openvpnprop.ui
+++ b/tdenetworkmanager/vpn-plugins/openvpn/src/openvpnprop.ui
diff --git a/knetworkmanager-0.9/vpn-plugins/pptp/AUTHORS b/tdenetworkmanager/vpn-plugins/pptp/AUTHORS
index 17bdf96..17bdf96 100644
--- a/knetworkmanager-0.9/vpn-plugins/pptp/AUTHORS
+++ b/tdenetworkmanager/vpn-plugins/pptp/AUTHORS
diff --git a/knetworkmanager-0.9/vpn-plugins/pptp/knetworkmanager_pptp.desktop b/tdenetworkmanager/vpn-plugins/pptp/knetworkmanager_pptp.desktop
index 68a0267..68a0267 100644
--- a/knetworkmanager-0.9/vpn-plugins/pptp/knetworkmanager_pptp.desktop
+++ b/tdenetworkmanager/vpn-plugins/pptp/knetworkmanager_pptp.desktop
diff --git a/knetworkmanager-0.9/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp b/tdenetworkmanager/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp
index 452fb23..452fb23 100644
--- a/knetworkmanager-0.9/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp
+++ b/tdenetworkmanager/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp
diff --git a/knetworkmanager-0.9/vpn-plugins/pptp/src/knetworkmanager-pptp.h b/tdenetworkmanager/vpn-plugins/pptp/src/knetworkmanager-pptp.h
index ca7b3b0..ca7b3b0 100644
--- a/knetworkmanager-0.9/vpn-plugins/pptp/src/knetworkmanager-pptp.h
+++ b/tdenetworkmanager/vpn-plugins/pptp/src/knetworkmanager-pptp.h
diff --git a/knetworkmanager-0.9/vpn-plugins/pptp/src/pptpauth.ui b/tdenetworkmanager/vpn-plugins/pptp/src/pptpauth.ui
index 4078684..4078684 100644
--- a/knetworkmanager-0.9/vpn-plugins/pptp/src/pptpauth.ui
+++ b/tdenetworkmanager/vpn-plugins/pptp/src/pptpauth.ui
diff --git a/knetworkmanager-0.9/vpn-plugins/pptp/src/pptpprop.ui b/tdenetworkmanager/vpn-plugins/pptp/src/pptpprop.ui
index c966535..c966535 100644
--- a/knetworkmanager-0.9/vpn-plugins/pptp/src/pptpprop.ui
+++ b/tdenetworkmanager/vpn-plugins/pptp/src/pptpprop.ui
diff --git a/knetworkmanager-0.9/vpn-plugins/strongswan/authors b/tdenetworkmanager/vpn-plugins/strongswan/authors
index 06c50d3..06c50d3 100644
--- a/knetworkmanager-0.9/vpn-plugins/strongswan/authors
+++ b/tdenetworkmanager/vpn-plugins/strongswan/authors
diff --git a/knetworkmanager-0.9/vpn-plugins/strongswan/knetworkmanager_strongswan.desktop b/tdenetworkmanager/vpn-plugins/strongswan/knetworkmanager_strongswan.desktop
index f4c8f2f..f4c8f2f 100644
--- a/knetworkmanager-0.9/vpn-plugins/strongswan/knetworkmanager_strongswan.desktop
+++ b/tdenetworkmanager/vpn-plugins/strongswan/knetworkmanager_strongswan.desktop
diff --git a/knetworkmanager-0.9/vpn-plugins/strongswan/src/knetworkmanager-strongswan.cpp b/tdenetworkmanager/vpn-plugins/strongswan/src/knetworkmanager-strongswan.cpp
index 39a512c..39a512c 100644
--- a/knetworkmanager-0.9/vpn-plugins/strongswan/src/knetworkmanager-strongswan.cpp
+++ b/tdenetworkmanager/vpn-plugins/strongswan/src/knetworkmanager-strongswan.cpp
diff --git a/knetworkmanager-0.9/vpn-plugins/strongswan/src/knetworkmanager-strongswan.h b/tdenetworkmanager/vpn-plugins/strongswan/src/knetworkmanager-strongswan.h
index ce2f739..ce2f739 100644
--- a/knetworkmanager-0.9/vpn-plugins/strongswan/src/knetworkmanager-strongswan.h
+++ b/tdenetworkmanager/vpn-plugins/strongswan/src/knetworkmanager-strongswan.h
diff --git a/knetworkmanager-0.9/vpn-plugins/strongswan/src/strongswanauth.ui b/tdenetworkmanager/vpn-plugins/strongswan/src/strongswanauth.ui
index 244a6ac..244a6ac 100644
--- a/knetworkmanager-0.9/vpn-plugins/strongswan/src/strongswanauth.ui
+++ b/tdenetworkmanager/vpn-plugins/strongswan/src/strongswanauth.ui
diff --git a/knetworkmanager-0.9/vpn-plugins/strongswan/src/strongswanprop.ui b/tdenetworkmanager/vpn-plugins/strongswan/src/strongswanprop.ui
index a728a1d..a728a1d 100644
--- a/knetworkmanager-0.9/vpn-plugins/strongswan/src/strongswanprop.ui
+++ b/tdenetworkmanager/vpn-plugins/strongswan/src/strongswanprop.ui
diff --git a/knetworkmanager-0.9/vpn-plugins/vpnc/AUTHORS b/tdenetworkmanager/vpn-plugins/vpnc/AUTHORS
index e0ecfce..e0ecfce 100644
--- a/knetworkmanager-0.9/vpn-plugins/vpnc/AUTHORS
+++ b/tdenetworkmanager/vpn-plugins/vpnc/AUTHORS
diff --git a/knetworkmanager-0.9/vpn-plugins/vpnc/knetworkmanager_vpnc.desktop b/tdenetworkmanager/vpn-plugins/vpnc/knetworkmanager_vpnc.desktop
index e37900f..e37900f 100644
--- a/knetworkmanager-0.9/vpn-plugins/vpnc/knetworkmanager_vpnc.desktop
+++ b/tdenetworkmanager/vpn-plugins/vpnc/knetworkmanager_vpnc.desktop
diff --git a/knetworkmanager-0.9/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp b/tdenetworkmanager/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp
index 5bab84c..5bab84c 100644
--- a/knetworkmanager-0.9/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp
+++ b/tdenetworkmanager/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp
diff --git a/knetworkmanager-0.9/vpn-plugins/vpnc/src/knetworkmanager-vpnc.h b/tdenetworkmanager/vpn-plugins/vpnc/src/knetworkmanager-vpnc.h
index 35e2ee6..35e2ee6 100644
--- a/knetworkmanager-0.9/vpn-plugins/vpnc/src/knetworkmanager-vpnc.h
+++ b/tdenetworkmanager/vpn-plugins/vpnc/src/knetworkmanager-vpnc.h
diff --git a/knetworkmanager-0.9/vpn-plugins/vpnc/src/vpncauth.ui b/tdenetworkmanager/vpn-plugins/vpnc/src/vpncauth.ui
index 4fdf2f1..4fdf2f1 100644
--- a/knetworkmanager-0.9/vpn-plugins/vpnc/src/vpncauth.ui
+++ b/tdenetworkmanager/vpn-plugins/vpnc/src/vpncauth.ui
diff --git a/knetworkmanager-0.9/vpn-plugins/vpnc/src/vpncprop.ui b/tdenetworkmanager/vpn-plugins/vpnc/src/vpncprop.ui
index c9fbd43..c9fbd43 100644
--- a/knetworkmanager-0.9/vpn-plugins/vpnc/src/vpncprop.ui
+++ b/tdenetworkmanager/vpn-plugins/vpnc/src/vpncprop.ui