diff --git a/0001-Caches-deviceUni-and-activatableType-for-RemoteActiv.patch b/0001-Caches-deviceUni-and-activatableType-for-RemoteActiv.patch new file mode 100644 index 0000000..04f631e --- /dev/null +++ b/0001-Caches-deviceUni-and-activatableType-for-RemoteActiv.patch @@ -0,0 +1,144 @@ +From 263d6444bb1dbf58d6797a3307e5cde91d11b8df Mon Sep 17 00:00:00 2001 +From: "Lamarque V. Souza" +Date: Sun, 27 Nov 2011 12:54:08 -0200 +Subject: [PATCH 01/10] Caches deviceUni and activatableType for + RemoteActivatable class to prevent dbus calls from + stalling the entire desktop. + +CCBUG: 287002 +--- + libs/client/remoteactivatable.cpp | 50 +++++++++++++++++++++++-------------- + libs/client/remoteactivatable.h | 2 + + libs/client/remoteactivatable_p.h | 2 + + plasma_nm_version.h | 2 +- + 4 files changed, 36 insertions(+), 20 deletions(-) + +diff --git a/libs/client/remoteactivatable.cpp b/libs/client/remoteactivatable.cpp +index 75450a4..f23ac9d 100644 +--- a/libs/client/remoteactivatable.cpp ++++ b/libs/client/remoteactivatable.cpp +@@ -18,6 +18,8 @@ You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . + */ + ++#include ++ + #include "remoteactivatable.h" + #include "remoteactivatable_p.h" + +@@ -31,11 +33,7 @@ RemoteActivatable::RemoteActivatable(RemoteActivatablePrivate & dd, const QStrin + { + Q_D(RemoteActivatable); + d->activatableIface = new ActivatableInterface("org.kde.networkmanagement", dbusPath, QDBusConnection::sessionBus(), this); +- //kDebug() << "ActivatableInterface is (" << d->activatableIface << ") on" << d_ptr; +- connect(d->activatableIface, SIGNAL(activated()), +- this, SIGNAL(activated())); +- connect(d->activatableIface, SIGNAL(changed()), +- this, SIGNAL(changed())); ++ init(); + } + + RemoteActivatable::RemoteActivatable(const QString &dbusPath, QObject * parent) +@@ -43,10 +41,7 @@ RemoteActivatable::RemoteActivatable(const QString &dbusPath, QObject * parent) + { + Q_D(RemoteActivatable); + d->activatableIface = new ActivatableInterface("org.kde.networkmanagement", dbusPath, QDBusConnection::sessionBus(), this); +- connect(d->activatableIface, SIGNAL(activated()), +- this, SIGNAL(activated())); +- connect(d->activatableIface, SIGNAL(changed()), +- this, SIGNAL(changed())); ++ init(); + } + + RemoteActivatable::~RemoteActivatable() +@@ -54,24 +49,41 @@ RemoteActivatable::~RemoteActivatable() + delete d_ptr; + } + +-Knm::Activatable::ActivatableType RemoteActivatable::activatableType() const ++void RemoteActivatable::init() + { +- Q_D(const RemoteActivatable); +- QDBusReply reply = d->activatableIface->activatableType(); ++ Q_D(RemoteActivatable); ++ //kDebug() << "ActivatableInterface is (" << d->activatableIface << ") on" << d_ptr; ++ connect(d->activatableIface, SIGNAL(activated()), ++ this, SIGNAL(activated())); ++ connect(d->activatableIface, SIGNAL(changed()), ++ this, SIGNAL(changed())); ++ ++ QDBusReply reply = d->activatableIface->deviceUni(); + if (reply.isValid()) { +- return (Knm::Activatable::ActivatableType)reply.value(); ++ d->deviceUni = reply.value(); ++ } else { ++ kDebug() << "deviceUni reply is invalid"; ++ } ++ ++ QDBusReply reply2 = d->activatableIface->activatableType(); ++ if (reply2.isValid()) { ++ d->activatableType = (Knm::Activatable::ActivatableType)reply2.value(); ++ } else { ++ d->activatableType = Knm::Activatable::InterfaceConnection; ++ kDebug() << "activatableType reply is invalid"; + } +- return Knm::Activatable::InterfaceConnection; ++} ++ ++Knm::Activatable::ActivatableType RemoteActivatable::activatableType() const ++{ ++ Q_D(const RemoteActivatable); ++ return d->activatableType; + } + + QString RemoteActivatable::deviceUni() const + { + Q_D(const RemoteActivatable); +- QDBusReply reply = d->activatableIface->deviceUni(); +- if (reply.isValid()) { +- return reply.value(); +- } +- return QString(); ++ return d->deviceUni; + } + + void RemoteActivatable::activate() +diff --git a/libs/client/remoteactivatable.h b/libs/client/remoteactivatable.h +index 089a1c7..37b83ea 100644 +--- a/libs/client/remoteactivatable.h ++++ b/libs/client/remoteactivatable.h +@@ -54,6 +54,8 @@ protected: + RemoteActivatable(const QString &dbusPath, QObject * parent); + RemoteActivatable(RemoteActivatablePrivate & dd, const QString &dbusPath, QObject * parent); + RemoteActivatablePrivate * d_ptr; ++private: ++ void init(); + }; + + #endif // REMOTEACTIVATABLE_H +diff --git a/libs/client/remoteactivatable_p.h b/libs/client/remoteactivatable_p.h +index 51e183b..5fb573b 100644 +--- a/libs/client/remoteactivatable_p.h ++++ b/libs/client/remoteactivatable_p.h +@@ -28,6 +28,8 @@ class RemoteActivatablePrivate + public: + virtual ~RemoteActivatablePrivate(); + ActivatableInterface * activatableIface; ++ QString deviceUni; ++ Knm::Activatable::ActivatableType activatableType; + }; + + #endif // REMOTEACTIVATABLE_P_H +diff --git a/plasma_nm_version.h b/plasma_nm_version.h +index abb8a67..396e12c 100644 +--- a/plasma_nm_version.h ++++ b/plasma_nm_version.h +@@ -1,4 +1,4 @@ + #ifndef PLASMA_NM_VERSION_H + #define PLASMA_NM_VERSION_H +-static const char * plasmaNmVersion = "0.9.0_rc3 (nm09 20111126)"; ++static const char * plasmaNmVersion = "0.9.0_rc3 (nm09 20111127)"; + #endif +-- +1.7.7.4 + diff --git a/0002-Disabling-connected-notification-by-default-since-no.patch b/0002-Disabling-connected-notification-by-default-since-no.patch new file mode 100644 index 0000000..5413049 --- /dev/null +++ b/0002-Disabling-connected-notification-by-default-since-no.patch @@ -0,0 +1,28 @@ +From d08b9aebcdc445dcd2272466fb54c3a70d4a098f Mon Sep 17 00:00:00 2001 +From: "Lamarque V. Souza" +Date: Sat, 5 Nov 2011 17:06:00 -0200 +Subject: [PATCH 02/10] Disabling connected notification by default since now + VPN connections can use system tray icon to indicate + the connection activation succeeded. + +CCBUG: 268021 +--- + networkmanagement.notifyrc | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/networkmanagement.notifyrc b/networkmanagement.notifyrc +index a7af951..14ea80b 100644 +--- a/networkmanagement.notifyrc ++++ b/networkmanagement.notifyrc +@@ -347,7 +347,7 @@ Comment[sv]=En nätverksanslutning har upprättats + Comment[uk]=Було встановлено з’єднання з мережею + Comment[x-test]=xxA network connection was establishedxx + Comment[zh_TW]=網路連線已建立。 +-Action=Popup ++Action= + + [Event/connfailed] + Name=Network Connection Failed +-- +1.7.7.4 + diff --git a/0003-Do-not-use-null-backend-pointer-in-warning-message.patch b/0003-Do-not-use-null-backend-pointer-in-warning-message.patch new file mode 100644 index 0000000..d4b07fd --- /dev/null +++ b/0003-Do-not-use-null-backend-pointer-in-warning-message.patch @@ -0,0 +1,37 @@ +From 7ecd47e754790eda5a8f0a8fab15f1518dea193f Mon Sep 17 00:00:00 2001 +From: "Lamarque V. Souza" +Date: Mon, 28 Nov 2011 21:41:33 -0200 +Subject: [PATCH 03/10] Do not use null backend pointer in warning message. + +CCBUG: 287757 +--- + plasma_nm_version.h | 2 +- + .../libs/solid/control/networkmanager.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/plasma_nm_version.h b/plasma_nm_version.h +index 396e12c..6b76247 100644 +--- a/plasma_nm_version.h ++++ b/plasma_nm_version.h +@@ -1,4 +1,4 @@ + #ifndef PLASMA_NM_VERSION_H + #define PLASMA_NM_VERSION_H +-static const char * plasmaNmVersion = "0.9.0_rc3 (nm09 20111127)"; ++static const char * plasmaNmVersion = "0.9.0_rc3 (nm09 20111128)"; + #endif +diff --git a/solidcontrolfuture/libs/solid/control/networkmanager.cpp b/solidcontrolfuture/libs/solid/control/networkmanager.cpp +index 07d8603..e0ac8e4 100644 +--- a/solidcontrolfuture/libs/solid/control/networkmanager.cpp ++++ b/solidcontrolfuture/libs/solid/control/networkmanager.cpp +@@ -110,7 +110,7 @@ Solid::Control::NetworkInterfaceNm09List Solid::Control::NetworkManagerNm09Priva + } + else + { +- kWarning() << "NetworkManager backend not found" << managerBackend() << managerBackend()->inherits("Solid::Control::Ifaces::NetworkManagerNm09") << managerBackend()->metaObject()->className(); ++ kWarning() << "NetworkManager backend not found"; + return NetworkInterfaceNm09List(); + } + } +-- +1.7.7.4 + diff --git a/0004-SVN_SILENT-made-messages-.desktop-file.patch b/0004-SVN_SILENT-made-messages-.desktop-file.patch new file mode 100644 index 0000000..6962538 --- /dev/null +++ b/0004-SVN_SILENT-made-messages-.desktop-file.patch @@ -0,0 +1,655 @@ +From 2c1ab202675b1bfbeaaf9a798fd383c1bc88b628 Mon Sep 17 00:00:00 2001 +From: Script Kiddy +Date: Tue, 29 Nov 2011 21:32:56 +0100 +Subject: [PATCH 04/10] SVN_SILENT made messages (.desktop file) + +--- + applet/plasma-applet-networkmanagement.desktop | 2 + + dataengine/plasma-engine-networkmanagement.desktop | 2 + + kded/networkmanagement.desktop | 2 + + libs/ui/networkmanagement_vpnuiplugin.desktop | 2 + + monolithic/kde4-knetworkmanager-autostart.desktop | 3 ++ + monolithic/knetworkmanager.desktop | 3 ++ + networkmanagement.notifyrc | 29 ++++++++++++++++++++ + qml/package/metadata.desktop | 2 + + qml/plasma-applet-networkconnections.desktop | 2 + + settings/config/kcm_networkmanagement.desktop | 2 + + settings/config/kcm_networkmanagement_tray.desktop | 2 + + .../control/backends/fakenet/solid_fakenet.desktop | 2 + + .../solid/control/solidnetworkmanagernm09.desktop | 1 + + .../solid_networkmanager09.desktop | 2 + + .../networkmanagement_novellvpnui.desktop | 2 + + .../networkmanagement_openconnectui.desktop | 2 + + .../openvpn/networkmanagement_openvpnui.desktop | 2 + + vpnplugins/pptp/networkmanagement_pptpui.desktop | 2 + + .../networkmanagement_strongswanui.desktop | 2 + + vpnplugins/vpnc/networkmanagement_vpncui.desktop | 2 + + 20 files changed, 68 insertions(+), 0 deletions(-) + +diff --git a/applet/plasma-applet-networkmanagement.desktop b/applet/plasma-applet-networkmanagement.desktop +index 989ed8d..1854b21 100644 +--- a/applet/plasma-applet-networkmanagement.desktop ++++ b/applet/plasma-applet-networkmanagement.desktop +@@ -5,6 +5,7 @@ Name[cs]=Správa sítě + Name[da]=Netværkshåndtering + Name[de]=Netzwerkverwaltung + Name[es]=Gestión de red ++Name[et]=Võrguhaldus + Name[fi]=Verkonhallinta + Name[hu]=Hálózatkezelő + Name[it]=Gestione di rete +@@ -26,6 +27,7 @@ Comment[cs]=Nástroj stavu a ovládání sítě + Comment[da]=Værktøj til netværksstatus og -kontrol + Comment[de]=Dienstprogramm für Netzwerkstatus und -kontrolle + Comment[es]=Estado de la red y utilidad de control ++Comment[et]=Võrgu oleku ja juhtimise tööriist + Comment[hu]=Hálózatkezelő segédprogram + Comment[it]=Stato della rete e strumento di controllo + Comment[lt]=Tinklo būsenos ir kontrolės pagalbininkas +diff --git a/dataengine/plasma-engine-networkmanagement.desktop b/dataengine/plasma-engine-networkmanagement.desktop +index 6a71282..055e21c 100644 +--- a/dataengine/plasma-engine-networkmanagement.desktop ++++ b/dataengine/plasma-engine-networkmanagement.desktop +@@ -5,6 +5,7 @@ Name[cs]=Správce sítě + Name[da]=Network Manager + Name[de]=Netzwerkverwaltung + Name[es]=Gestor de redes ++Name[et]=Võrguhaldur + Name[hu]=Hálózatkezelő + Name[it]=Gestore di rete + Name[lt]=Tinklo tvarkyklė +@@ -25,6 +26,7 @@ Comment[cs]=Datový nástroj Správce sítě + Comment[da]=Datamotor til Network Manager + Comment[de]=Datenmodul der Netzwerkverwaltung + Comment[es]=Motor de datos del gestor de redes ++Comment[et]=Võrguhalduri andmemootor + Comment[hu]=Hálózatkezelő adatmodul + Comment[it]=Motore dati del gestore di rete + Comment[lt]=Tinklo tvarkyklės duomenų variklis +diff --git a/kded/networkmanagement.desktop b/kded/networkmanagement.desktop +index 5edb7f3..ffdd55a 100644 +--- a/kded/networkmanagement.desktop ++++ b/kded/networkmanagement.desktop +@@ -5,6 +5,7 @@ Name[cs]=Služba uživatelského nastavení NetworkManageru + Name[da]=Tjeneste til brugerindstillinger for NetworkManager + Name[de]=Benutzereinstellungsdienst für NetworkManager + Name[es]=Servicio de ajustes de usuario de NetworkManager ++Name[et]=NetworkManageri kasutaja seadistuste teenus + Name[hu]=Hálózatkezelő felhasználói beállítások szolgáltatás + Name[it]=Servizio impostazioni utente di NetworkManager + Name[lt]=Tinklo tvarkyklės naudotojo nustatymų tarnyba +@@ -24,6 +25,7 @@ Comment[cs]=Poskytuje síťovou konfiguraci démona NetworkManageru + Comment[da]=Leverer netværkskonfiguration af NetworkManager-dæmonen + Comment[de]=Stellt dem NetworkManager-Dienst eine Netzwerkeinrichtung zur Verfügung + Comment[es]=Proporciona configuración de redes al demonio NetworkManager ++Comment[et]=Võrguseadistuse edastamine NetworkManageri deemonile + Comment[hu]=Hálózati beállítások a NetworkManager démonhoz + Comment[it]=Fornisce la configurazione di rete al demone NetworkManager + Comment[lt]=Teikia tinklo konfigūraciją Tinklo tvarkyklės demonas +diff --git a/libs/ui/networkmanagement_vpnuiplugin.desktop b/libs/ui/networkmanagement_vpnuiplugin.desktop +index ed338bf..102c0bb 100644 +--- a/libs/ui/networkmanagement_vpnuiplugin.desktop ++++ b/libs/ui/networkmanagement_vpnuiplugin.desktop +@@ -7,6 +7,7 @@ Name[cs]=VPN UI modul pro správu sítě + Name[da]=UI-plugin til VPN-netværkshåndtering + Name[de]=Netzwerkverwaltung VPN-Modul + Name[es]=Complemento de interfaz de usuario VPN para gestión de redes ++Name[et]=Võrguhalduri VPN-i UI plugin + Name[hu]=Hálózatkezelő VPN UI bővítmény + Name[it]=Estensione interfaccia VPN di gestione della rete + Name[lt]=Tinklo valdymo VPN UI priedas +@@ -25,6 +26,7 @@ Comment[ca]=Defineix els connector de la IU del Gestor de xarxa del KDE + Comment[cs]=Definuje grafické moduly správy sítě KDE + Comment[da]=Definerer UI-plugins til KDE's netværkshåndtering + Comment[de]=Legt die Module der KDE-Netzwerkverwaltung fest ++Comment[et]=Võrguhalduri UI pluginate määratlus + Comment[hu]=Bővítmények a KDE Hálózatkezelőhöz + Comment[it]=Specifica le estensioni dell'interfaccia di gestione della rete di KDE + Comment[lt]=Apibrėžia KDE Tinklo valdymo UI priedus +diff --git a/monolithic/kde4-knetworkmanager-autostart.desktop b/monolithic/kde4-knetworkmanager-autostart.desktop +index cfdf3bc..53eb629 100644 +--- a/monolithic/kde4-knetworkmanager-autostart.desktop ++++ b/monolithic/kde4-knetworkmanager-autostart.desktop +@@ -5,6 +5,7 @@ Name[cs]=KNetworkManager + Name[da]=KNetworkManager + Name[de]=KNetworkManager + Name[es]=KNetworkManager ++Name[et]=KNetworkManager + Name[fi]=KNetworkManager + Name[hu]=KNetworkManager + Name[it]=KNetworkManager +@@ -26,6 +27,7 @@ GenericName[cs]=Network Manager + GenericName[da]=Netværkshåndtering + GenericName[de]=Netzwerkverwaltung + GenericName[es]=Gestor de redes ++GenericName[et]=Võrguhaldur + GenericName[hu]=Hálózatkezelő + GenericName[it]=Gestore di rete + GenericName[lt]=Tinklo tvarkytojas +@@ -49,6 +51,7 @@ Comment[cs]=KDE rozhraní pro NetworkManager + Comment[da]=En KDE-brugerflade til Networkmanager + Comment[de]=Eine KDE-Oberfläche für NetworkManager + Comment[es]=Una interfaz de KDE para NetworkManager ++Comment[et]=KDE NetworkManageri kasutajaliides + Comment[hu]=KDE előtétprogram a NetWorkManagerhez + Comment[it]=Un'interfaccia di KDE a NetworkManager + Comment[lt]=KDE išorinė Tinklo tvarkytuvės pusė +diff --git a/monolithic/knetworkmanager.desktop b/monolithic/knetworkmanager.desktop +index b7e39dd..d0062c4 100644 +--- a/monolithic/knetworkmanager.desktop ++++ b/monolithic/knetworkmanager.desktop +@@ -5,6 +5,7 @@ Name[cs]=KNetworkManager + Name[da]=KNetworkManager + Name[de]=KNetworkManager + Name[es]=KNetworkManager ++Name[et]=KNetworkManager + Name[fi]=KNetworkManager + Name[hu]=KNetworkManager + Name[it]=KNetworkManager +@@ -26,6 +27,7 @@ GenericName[cs]=Network Manager + GenericName[da]=Netværkshåndtering + GenericName[de]=Netzwerkverwaltung + GenericName[es]=Gestor de redes ++GenericName[et]=Võrguhaldur + GenericName[hu]=Hálózatkezelő + GenericName[it]=Gestore di rete + GenericName[lt]=Tinklo tvarkytojas +@@ -49,6 +51,7 @@ Comment[cs]=KDE rozhraní pro NetworkManager + Comment[da]=En KDE-brugerflade til Networkmanager + Comment[de]=Eine KDE-Oberfläche für NetworkManager + Comment[es]=Una interfaz de KDE para NetworkManager ++Comment[et]=KDE NetworkManageri kasutajaliides + Comment[hu]=KDE előtétprogram a NetWorkManagerhez + Comment[it]=Un'interfaccia di KDE a NetworkManager + Comment[lt]=KDE išorinė Tinklo tvarkytuvės pusė +diff --git a/networkmanagement.notifyrc b/networkmanagement.notifyrc +index 14ea80b..9f48dc7 100644 +--- a/networkmanagement.notifyrc ++++ b/networkmanagement.notifyrc +@@ -5,6 +5,7 @@ Name[cs]=Správa sítě + Name[da]=Netværkshåndtering + Name[de]=Netzwerkverwaltung + Name[es]=Gestión de red ++Name[et]=Võrguhaldus + Name[fi]=Verkonhallinta + Name[hu]=Hálózatkezelő + Name[it]=Gestione di rete +@@ -27,6 +28,7 @@ Comment[cs]=Správa sítě + Comment[da]=Netværkshåndtering + Comment[de]=Netzwerkverwaltung + Comment[es]=Gestión de red ++Comment[et]=Võrguhaldus + Comment[fi]=Verkonhallinta + Comment[hu]=Hálózatkezelés + Comment[it]=Gestione di rete +@@ -51,6 +53,7 @@ Name[cs]=Typ síťového připojení + Name[da]=Type af netværksforbindelse + Name[de]=Art der Netzwerkverbindung + Name[es]=Tipo de conexión de red ++Name[et]=Võrguühenduse tüüp + Name[hu]=Hálózati kapcsolat típusa + Name[it]=Tipo connessione di rete + Name[lt]=Tinklo ryšio tipas +@@ -73,6 +76,7 @@ Name[cs]=Síťové rozhraní připojeno + Name[da]=Netkort tilsluttet + Name[de]=Netzwerkschnittstelle angeschlossen + Name[es]=Interfaz de red añadida ++Name[et]=Võrguliides on ühendatud + Name[hu]=Hálózati csatoló csatolva + Name[it]=Interfaccia di rete collegata + Name[lt]=Prijungta tinklo sąsaja +@@ -92,6 +96,7 @@ Comment[cs]=Síťové rozhraní bylo připojeno + Comment[da]=Et netkort blev tilsluttet + Comment[de]=Eine Netzwerkschnittstelle ist angeschlossen worden + Comment[es]=Se ha añadido una interfaz de red ++Comment[et]=Võrguliides on ühendatud + Comment[hu]=Egy hálózati csatoló csatlakoztatva + Comment[it]=Un'interfaccia di rete è stata collegata + Comment[lt]=Tinklo sąsaja buvo prijungta +@@ -113,6 +118,7 @@ Name[cs]=Síťové zařízení odstraněno + Name[da]=Netkort fjernet + Name[de]=Netzwerkschnittstelle entfernt + Name[es]=Interfaz de red eliminada ++Name[et]=Võrguliides on eemaldatud + Name[fi]=Verkkoliitäntä poistettu + Name[hu]=Hálózati csatoló eltávolítva + Name[it]=Interfaccia di rete rimossa +@@ -133,6 +139,7 @@ Comment[cs]=Síťové zařízení odstraněno + Comment[da]=Et netkort blev fjernet + Comment[de]=Eine Netzwerkschnittstelle ist entfernt worden + Comment[es]=Se ha eliminado una interfaz de red ++Comment[et]=Võrguliides on eemaldatud + Comment[hu]=Egy hálózati csatoló eltávolítva + Comment[it]=Un'interfaccia di rete è stata rimossa + Comment[lt]=Tinko sąsaja buvo pašalinta +@@ -154,6 +161,7 @@ Name[cs]=Nalezena bezdrátová síť + Name[da]=Fandt trådløst netværk + Name[de]=Drahtloses Netzwerk gefunden + Name[es]=Red inalámbrica encontrada ++Name[et]=Leiti juhtmeta võrk + Name[hu]=Észlelt vezeték nélküli hálózat + Name[it]=Rete senza fili trovata + Name[lt]=Rastas bevielis tinklas +@@ -173,6 +181,7 @@ Comment[cs]=Objevila se bezdrátová síť + Comment[da]=Et trådløst netværk er dukket op + Comment[de]=Ein drahtloses Netzwerk ist entdeckt worden + Comment[es]=Ha aparecido una red inalámbrica ++Comment[et]=Saadavale ilmus juhtmeta võrk + Comment[hu]=Új vezetéknélküli hálózat érhető el + Comment[it]=Una rete senza file è apparsa + Comment[lt]=Atsirado bevielis tinklas +@@ -194,6 +203,7 @@ Name[cs]=Bezdrátová síť ztracena + Name[da]=Mistede trådløst netværk + Name[de]=Drahtloses Netzwerk verloren + Name[es]=Red inalámbrica perdida ++Name[et]=Juhtmeta võrk kaotati + Name[hu]=A vezetéknélküli hálózat eltűnt + Name[it]=Rete senza file scomparsa + Name[lt]=Prarastas bevielis tinklas +@@ -213,6 +223,7 @@ Comment[cs]=Bezdrátová síť zmizela + Comment[da]=Et trådløst netværk forsvandt + Comment[de]=Ein drahtloses Netzwerk ist nicht mehr vorhanden + Comment[es]=Ha desaparecido una red inalámbrica ++Comment[et]=Juhtmeta võrk kadus + Comment[hu]=Megszakadt a kapcsolat a vezetéknélküli hálózattal + Comment[it]=Una rete senza fili è scomparsa + Comment[lt]=Dingo bevielis tinklas +@@ -234,6 +245,7 @@ Name[cs]=Navazuje se síťové spojení + Name[da]=Opretter netværksforbindelse + Name[de]=Netzwerkverbindung wird hergestellt + Name[es]=Estableciendo conexión de red ++Name[et]=Võrguühenduse loomine + Name[hu]=Hálózati kapcsolat létrehozása + Name[it]=Connessione alla rete in corso + Name[lt]=Kuriamas tinklo ryšys +@@ -253,6 +265,7 @@ Comment[cs]=Zahájen pokus o síťové spojení + Comment[da]=Et netværksforbindelsesforsøg er påbegyndt + Comment[de]=Ein Verbindungsversuch ist begonnen worden + Comment[es]=Ha comenzado un intento de conexión a una red ++Comment[et]=Alustati võrguühenduse loomist + Comment[hu]=A kapcsolódási kísérlet elkezdődött + Comment[it]=È stato iniziato un tentativo di connessione alla rete + Comment[lt]=Buvo pradėtas tinklo ryšio mėginimas +@@ -275,6 +288,7 @@ Name[cs]=Síťové spojení odpojeno + Name[da]=Netværksforbindelse afbrudt + Name[de]=Netzwerkverbindung getrennt + Name[es]=Conexión de red desconectada ++Name[et]=Võrguühendus on katkestatud + Name[hu]=A hálózati kapcsolat megszakadt + Name[it]=Connessione di rete disconnessa + Name[lt]=Tinklo ryšys yra atjungtas +@@ -294,6 +308,7 @@ Comment[cs]=Síťové spojení bylo odpojeno + Comment[da]=En netværksforbindelse blev afbrudt + Comment[de]=Eine Netzwerkverbindung ist getrennt worden + Comment[es]=Se ha desconectado una conexión de red ++Comment[et]=Võrguühendus on katkestatud + Comment[hu]=A hálózati kapcsolat megszakadt + Comment[it]=Una connessione di rete è stata disconnessa + Comment[lt]=Tinklo ryšys buvo atjungtas +@@ -315,6 +330,7 @@ Name[cs]=Připojení k síti bylo úspěšné + Name[da]=Netværksforbindelse gennemført + Name[de]=Netzwerkverbindung erfolgreich hergestellt + Name[es]=Conexión de red exitosa ++Name[et]=Võrguühenduse loomine õnnestus + Name[hu]=A hálózati kapcsolat létrejött + Name[it]=Connessione alla rete avvenuta + Name[lt]=Tinklo prisijungimas pavyko +@@ -334,6 +350,7 @@ Comment[cs]=Síťové spojení bylo navázáno + Comment[da]=En netværksforbindelse blev oprettet + Comment[de]=Eine Netzwerkverbindung ist erfolgreich hergestellt worden + Comment[es]=Se ha establecido una conexión de red ++Comment[et]=Loodi võrguühendus + Comment[hu]=A hálózati kapcsolat sikeresen létrejött + Comment[it]=Una connessione di rete è stata stabilita + Comment[lt]=Tinklo ryšys buvo sukurtas +@@ -356,6 +373,7 @@ Name[cs]=Připojení k síti selhalo + Name[da]=Netværksforbindelse mislykkedes + Name[de]=Netzwerkverbindung fehlgeschlagen + Name[es]=Conexión de red fallida ++Name[et]=Võrguühenduse loomine nurjus + Name[hu]=A hálózati kapcsolat nem jött létre + Name[it]=Connessione di rete non riuscita + Name[lt]=Tinklo prisijungimas nepavyko +@@ -375,6 +393,7 @@ Comment[cs]=Pokus o připojení k síti selhal + Comment[da]=Et netværksforbindelsesforsøg mislykkedes + Comment[de]=Ein Verbindungsversuch ist fehlgeschlagen + Comment[es]=Ha fallado un intento de conexión de red ++Comment[et]=Katse luua võrguühendust nurjus + Comment[hu]=A hálózati kapcsolódás sikertelen + Comment[it]=Un tentativo di connessione alla rete non è riuscito + Comment[lt]=Nepavyko tinklo ryšio mėginimas +@@ -397,6 +416,7 @@ Name[cs]=Hardware rádia vypnut + Name[da]=Radio-hardware slået fra + Name[de]=Hardware für drahtlose Verbindungen ausgeschaltet + Name[es]=Hardware de radio apagado ++Name[et]=Raadioriistvara lülitati välja + Name[hu]=Vezetéknélküli eszköz kikapcsolva + Name[it]=Hardware radio spento + Name[lt]=Radijo aparatinė įranga yra išjungta +@@ -415,6 +435,7 @@ Comment[ca]=Els transceptors de la sense fils han estat deshabilitats per l'inte + Comment[cs]=Bezdrátové příjímače vypnuty hardwarovým přepínačem + Comment[da]=Trådløs-transceivere deaktiveret af hardware-kontakt + Comment[de]=Die Hardware für drahtlose Verbindungen ist am Gerät ausgeschaltet worden ++Comment[et]=Riistvaralüliti keelas juhtmeta ühenduse vastuvõtjad + Comment[hu]=A vezetéknélküli eszköz hardveres úton kikapcsolásra került + Comment[it]=Ricetrasmettitore senza fili disabilitato + Comment[lt]=Bevieliai imtuvai išjungti fiziniu jungikliu +@@ -437,6 +458,7 @@ Name[cs]=Hardware rádia zapnut + Name[da]=Radio-hardware slået til + Name[de]=Hardware für drahtlose Verbindungen eingeschaltet + Name[es]=Hardware de radio encendido ++Name[et]=Raadioriistvara lülitati sisse + Name[hu]=A vezetéknélküli eszköz ki lett kapcsolva + Name[it]=Hardware radio acceso + Name[lt]=Radijo aparatinė įranga yra įjungta +@@ -455,6 +477,7 @@ Comment[ca]=Transceptors sense fils habilitats + Comment[cs]=Bezdrátové příjímače zapnuty + Comment[da]=Trådløs-transceivere aktiveret + Comment[de]=Hardware für drahtlose Verbindungen aktiviert ++Comment[et]=Juhtmeta ühenduse vastuvõtjad on lubatud + Comment[hu]=Vezetéknélküli eszköz engedélyezve + Comment[it]=Ricetrasmettitore senza fili abilitato + Comment[lt]=Bevieliai imtuvai įjungti +@@ -477,6 +500,7 @@ Name[cs]=Slabý bezdrátový signál + Name[da]=Lav signalstyrke på trådløst + Name[de]=Niedrige Signalstärke + Name[es]=Intensidad de señal inalámbrica débil ++Name[et]=Juhtmeta ühenduse nõrk signaal + Name[hu]=Alacsony vezetéknélküli jelszint + Name[it]=Potenza segnale wireless bassa + Name[lt]=Silpnas bevielio signalo stiprumas +@@ -496,6 +520,7 @@ Comment[cs]=Síla bezdrátového signálu je slabá + Comment[da]=Den trådløse signalstyrke er lav + Comment[de]=Die Signalstärke der drahtlosen Verbindung ist niedrig + Comment[es]=La intensidad de la señal inalámbrica es débil ++Comment[et]=Juhtmeta ühenduse signaal on nõrk + Comment[hu]=A vezetéknélküli jel erőssége gyenge + Comment[it]=La potenza del segnale wireless è bassa + Comment[lt]=Bevielio signalo stiprumas yra žemas +@@ -518,6 +543,7 @@ Name[cs]=Rozhraní změnilo stav + Name[da]=Netkort ændrede tilstand + Name[de]=Schnittstellenstatus geändert + Name[es]=La interfaz ha cambiado de estado ++Name[et]=Liides muutis olekut + Name[hu]=Egy csatoló állapota megváltozott + Name[it]=L'interfaccia ha cambiato stato + Name[lt]=Sąsaja pakeitė būseną +@@ -537,6 +563,7 @@ Comment[cs]=Stav rozhraní se změnil + Comment[da]=Et netkort ændrede tilstand + Comment[de]=Der Status einer Schnittstelle hat sich geändert + Comment[es]=Una interfaz ha cambiado de estado ++Comment[et]=Liides muutis olekut + Comment[hu]=Egy csatoló állapota megváltozott + Comment[it]=Un'interfaccia ha cambiato stato + Comment[lt]=Sąsaja pakeitė būseną +@@ -558,6 +585,7 @@ Name[cs]=Správa sítě zakázána + Name[da]=Netværkshåndtering deaktiveret + Name[de]=Netzwerkverwaltung deaktiviert + Name[es]=Gestión de red desactivada ++Name[et]=Võrguhaldus on keelatud + Name[fi]=Verkonhallinta ei käytössä + Name[hu]=Hálózatkezelés letiltva + Name[it]=Gestione di rete disabilitata +@@ -578,6 +606,7 @@ Comment[cs]=Podsystém správy sítě byl zastaven nebo restartován + Comment[da]=Undersystemet til netværkshåndtering blev stoppet eller genstartet + Comment[de]=Die Netzwerkverwaltung ist angehalten oder neu gestartet worden + Comment[es]=El subsistema de gestión de red ha sido detenido o reiniciado ++Comment[et]=Võrguhalduse allsüsteem peatati või taaskäivitati + Comment[hu]=A hálózatkezelő alrendszer leállításra vagy újraindításra került + Comment[it]=Il sottosistema di gestione della rete è stato fermato o riavviato + Comment[lt]=Tinklo valdymo subsistema buvo sustabdyta arba paleista iš naujo +diff --git a/qml/package/metadata.desktop b/qml/package/metadata.desktop +index cb3eacc..66e99a9 100644 +--- a/qml/package/metadata.desktop ++++ b/qml/package/metadata.desktop +@@ -5,6 +5,7 @@ Comment[cs]=Připojit se na Internet + Comment[da]=Forbind til internettet + Comment[de]=Mit dem Internet verbinden + Comment[es]=Conectar a Internet ++Comment[et]=Ühendumine internetti + Comment[hu]=Kapcsolódás az Internethez + Comment[it]=Connetti a Internet + Comment[lt]=Prisijungti prie interneto +@@ -27,6 +28,7 @@ Name[cs]=Síťová spojení + Name[da]=Netværksforbindelser + Name[de]=Netzwerkverbindungen + Name[es]=Conexiones de red ++Name[et]=Võrguühendused + Name[hu]=Hálózati kapcsolatok + Name[it]=Connessioni di rete + Name[lt]=Tinklo ryšiai +diff --git a/qml/plasma-applet-networkconnections.desktop b/qml/plasma-applet-networkconnections.desktop +index cb3eacc..66e99a9 100644 +--- a/qml/plasma-applet-networkconnections.desktop ++++ b/qml/plasma-applet-networkconnections.desktop +@@ -5,6 +5,7 @@ Comment[cs]=Připojit se na Internet + Comment[da]=Forbind til internettet + Comment[de]=Mit dem Internet verbinden + Comment[es]=Conectar a Internet ++Comment[et]=Ühendumine internetti + Comment[hu]=Kapcsolódás az Internethez + Comment[it]=Connetti a Internet + Comment[lt]=Prisijungti prie interneto +@@ -27,6 +28,7 @@ Name[cs]=Síťová spojení + Name[da]=Netværksforbindelser + Name[de]=Netzwerkverbindungen + Name[es]=Conexiones de red ++Name[et]=Võrguühendused + Name[hu]=Hálózati kapcsolatok + Name[it]=Connessioni di rete + Name[lt]=Tinklo ryšiai +diff --git a/settings/config/kcm_networkmanagement.desktop b/settings/config/kcm_networkmanagement.desktop +index 4b48fae..2d9a918 100644 +--- a/settings/config/kcm_networkmanagement.desktop ++++ b/settings/config/kcm_networkmanagement.desktop +@@ -5,6 +5,7 @@ Name[cs]=Síťová spojení + Name[da]=Netværksforbindelser + Name[de]=Netzwerkverbindungen + Name[es]=Conexiones de red ++Name[et]=Võrguühendused + Name[hu]=Hálózati kapcsolatok + Name[it]=Connessioni di rete + Name[lt]=Tinklo ryšiai +@@ -25,6 +26,7 @@ Comment[cs]=Přidejte, upravte nebo odstraňte síťová spojení + Comment[da]=Tilføj, redigér og fjern netværksforbindelser + Comment[de]=Netzwerkverbindungen hinzufügen, bearbeiten und entfernen + Comment[es]=Añadir, editar y eliminar conexiones de red ++Comment[et]=Võrguühenduste lisamine, muutmine ja eemaldamine + Comment[hu]=Kapcsolatok hozzáadása, szerkesztése és eltávolítása + Comment[it]=Aggiungi, modifica o rimuovi connessioni di rete + Comment[lt]=Pridėti, keisti ir šalinti tinklo ryšius +diff --git a/settings/config/kcm_networkmanagement_tray.desktop b/settings/config/kcm_networkmanagement_tray.desktop +index 57c6b17..2df8e03 100644 +--- a/settings/config/kcm_networkmanagement_tray.desktop ++++ b/settings/config/kcm_networkmanagement_tray.desktop +@@ -5,6 +5,7 @@ Name[cs]=Jiné + Name[da]=Andet + Name[de]=Sonstiges + Name[es]=Otro ++Name[et]=Muu + Name[hu]=Egyéb + Name[it]=Altro + Name[lt]=Kiti +@@ -25,6 +26,7 @@ Comment[cs]=Nastavit nástroj pro správu sítě + Comment[da]=Indstil værktøjet til netværkshåndtering + Comment[de]=Die Netzwerkverwaltung einrichten + Comment[es]=Configurar la herramienta de gestión de red ++Comment[et]=Võrguhalduri seadistamine + Comment[hu]=A Hálózatkezelő beállítása + Comment[it]=Configura lo strumento Gestione di rete + Comment[lt]=Konfigūruoti Tinklo valdymo įrankį +diff --git a/solidcontrolfuture/libs/solid/control/backends/fakenet/solid_fakenet.desktop b/solidcontrolfuture/libs/solid/control/backends/fakenet/solid_fakenet.desktop +index 7b6b22f..68868ca 100644 +--- a/solidcontrolfuture/libs/solid/control/backends/fakenet/solid_fakenet.desktop ++++ b/solidcontrolfuture/libs/solid/control/backends/fakenet/solid_fakenet.desktop +@@ -10,6 +10,7 @@ Name[cs]=Falešná síť + Name[da]=Falsk net + Name[de]=Netzwerk (Dummy) + Name[es]=Red simulada ++Name[et]=Liba-võrk + Name[hu]=Hálózat (imitáció) + Name[it]=Rete finta + Name[nb]=Attrappnett +@@ -28,6 +29,7 @@ Comment[cs]=Správa falešné sítě + Comment[da]=Falsk netværkshåndtering + Comment[de]=Netzwerkverwaltung (Dummy) + Comment[es]=Gestión de red simulada ++Comment[et]=Liba-võrgu haldur + Comment[hu]=Hálózatkezelés (imitáció) + Comment[it]=Gestione di una rete finta + Comment[nb]=Attrappnett-styring +diff --git a/solidcontrolfuture/libs/solid/control/solidnetworkmanagernm09.desktop b/solidcontrolfuture/libs/solid/control/solidnetworkmanagernm09.desktop +index 43be578..78d2c01 100644 +--- a/solidcontrolfuture/libs/solid/control/solidnetworkmanagernm09.desktop ++++ b/solidcontrolfuture/libs/solid/control/solidnetworkmanagernm09.desktop +@@ -8,6 +8,7 @@ Comment[cs]=Podpůrná vrstva pro správu sítě + Comment[da]=Backend til netværkshåndtering + Comment[de]=Backend zur Netzwerkverwaltung + Comment[es]=Motor de gestión de red ++Comment[et]=Võrgu haldamise taustaprogramm + Comment[hu]=Hálózatkezelő modul + Comment[it]=Motore di gestione di rete + Comment[nb]=Bakgrunnsmotor for nettverksstyring +diff --git a/solidcontrolfuture/solid/networkmanager-0.9/solid_networkmanager09.desktop b/solidcontrolfuture/solid/networkmanager-0.9/solid_networkmanager09.desktop +index 04c2700..32f3c67 100644 +--- a/solidcontrolfuture/solid/networkmanager-0.9/solid_networkmanager09.desktop ++++ b/solidcontrolfuture/solid/networkmanager-0.9/solid_networkmanager09.desktop +@@ -9,6 +9,7 @@ Name[cs]=NetworkManager 0.9 + Name[da]=NetworkManager 0.9 + Name[de]=NetworkManager 0.9 + Name[es]=NetworkManager 0.9 ++Name[et]=NetworkManager 0.9 + Name[hu]=NetworkManager 0.9 + Name[it]=NetworkManager 0.9 + Name[nb]=NetworkManager 0.9 +@@ -27,6 +28,7 @@ Comment[ca]=Gestor de xarxes que usa el dimoni NetworkManager, versió 0.9 + Comment[cs]=Správa sítě pomocí démona Networkmanageru, verze 0.9 + Comment[da]=Netværkshåndtering med brug af NetworkManager-dæmonen, version 0.9 + Comment[de]=Netzwerkverwaltung mit dem NetworkManager Version 0.9 ++Comment[et]=Võrgu haldamine NetworkManageri deemoni versiooni 0.9 abil + Comment[hu]=Hálózatkezelés a NetworkManager 0.9 szolgáltatás segítségével + Comment[it]=Gestione di rete utilizzando il demone NetworkManager, versione 0.9 + Comment[nb]=Nettverksstyring ved bruk av NetworkManager-nissen, versjon 0.9 +diff --git a/vpnplugins/novellvpn/networkmanagement_novellvpnui.desktop b/vpnplugins/novellvpn/networkmanagement_novellvpnui.desktop +index a8ef1af..1978277 100644 +--- a/vpnplugins/novellvpn/networkmanagement_novellvpnui.desktop ++++ b/vpnplugins/novellvpn/networkmanagement_novellvpnui.desktop +@@ -18,6 +18,7 @@ Name[ca]=VPN de Novell (turnpike) + Name[cs]=Novell VPN (turnpike) + Name[da]=Novell VPN (turnpike) + Name[de]=Novell VPN (Turnpike) ++Name[et]=Novell VPN (turnpike) + Name[hu]=Novell VPN (turnpike) + Name[it]=Novell VPN (turnpike) + Name[lt]=Novell VPN (greitkelis) +@@ -37,6 +38,7 @@ Comment[ca]=Permet al KNetworkManager connectar-se a la VPN de Novell (turnpike) + Comment[cs]=Umožní KNetworkManager připojit se k Novell VPN (turnpike). + Comment[da]=Lader KNetworkManager forbinde VPN med Novell VPN (turnpike). + Comment[de]=Ermöglicht KNetworkManager Verbindungen zu Novell VPNs (Turnpike) herzustellen. ++Comment[et]=Võimaldab KNetworkManageril ühenduda Novell VPN (turnpike) VPN-idega. + Comment[hu]=Novell VPN (turnpike) kapcsolatok engedélyezése. + Comment[it]=Consente a KNetworkManager di collegarsi a VPN Novell (turnpike). + Comment[lt]=Leidžia KNetworkManager prisijungti prie Novell VPN (greitkelis) VPNs. +diff --git a/vpnplugins/openconnect/networkmanagement_openconnectui.desktop b/vpnplugins/openconnect/networkmanagement_openconnectui.desktop +index 38136a0..e77684c 100644 +--- a/vpnplugins/openconnect/networkmanagement_openconnectui.desktop ++++ b/vpnplugins/openconnect/networkmanagement_openconnectui.desktop +@@ -19,6 +19,7 @@ Name[cs]=OpenConnect + Name[da]=OpenConnect + Name[de]=OpenConnect + Name[es]=OpenConnect ++Name[et]=OpenConnect + Name[hu]=OpenConnect + Name[it]=OpenConnect + Name[lt]=OpenConnect +@@ -39,6 +40,7 @@ Comment[cs]=Modul OpenConnect + Comment[da]=Plugin til OpenConnect + Comment[de]=OpenConnect-Modul + Comment[es]=Complemento de OpenConnect ++Comment[et]=OpenConnecti plugin + Comment[hu]=OpenConnect modul + Comment[it]=Estensione OpenConnect + Comment[lt]=OpenConnect papildinys +diff --git a/vpnplugins/openvpn/networkmanagement_openvpnui.desktop b/vpnplugins/openvpn/networkmanagement_openvpnui.desktop +index 3ee0c94..e37ed98 100644 +--- a/vpnplugins/openvpn/networkmanagement_openvpnui.desktop ++++ b/vpnplugins/openvpn/networkmanagement_openvpnui.desktop +@@ -19,6 +19,7 @@ Name[cs]=OpenVPN + Name[da]=OpenVPN + Name[de]=OpenVPN + Name[es]=OpenVPN ++Name[et]=OpenVPN + Name[fi]=OpenVPN + Name[hu]=OpenVPN + Name[it]=OpenVPN +@@ -40,6 +41,7 @@ Comment[cs]=Modul OpenVPN + Comment[da]=OpenVPN-plugin + Comment[de]=OpenVPN-Modul + Comment[es]=Complemento de OpenVPN ++Comment[et]=OpenVPN-i plugin + Comment[hu]=OpenVPN-modul + Comment[it]=Estensione OpenVPN + Comment[lt]=OpenVPN papildinys +diff --git a/vpnplugins/pptp/networkmanagement_pptpui.desktop b/vpnplugins/pptp/networkmanagement_pptpui.desktop +index 34f7527..5108af3 100644 +--- a/vpnplugins/pptp/networkmanagement_pptpui.desktop ++++ b/vpnplugins/pptp/networkmanagement_pptpui.desktop +@@ -19,6 +19,7 @@ Name[cs]=PPTP + Name[da]=PPTP + Name[de]=PPTP + Name[es]=PPTP ++Name[et]=PPTP + Name[hu]=PPTP + Name[it]=PPTP + Name[lt]=PPTP +@@ -39,6 +40,7 @@ Comment[cs]=Modul PPTP + Comment[da]=PPTP-plugin + Comment[de]=PPTP-Modul + Comment[es]=Complemento de PPTP ++Comment[et]=PPTP plugin + Comment[hu]=PPTP-modul + Comment[it]=Estensione PPTP + Comment[lt]=PPTP papildinys +diff --git a/vpnplugins/strongswan/networkmanagement_strongswanui.desktop b/vpnplugins/strongswan/networkmanagement_strongswanui.desktop +index 7a84ccd..ffd747d 100644 +--- a/vpnplugins/strongswan/networkmanagement_strongswanui.desktop ++++ b/vpnplugins/strongswan/networkmanagement_strongswanui.desktop +@@ -19,6 +19,7 @@ Name[cs]=StrongSwan + Name[da]=StrongSwan + Name[de]=StrongSwan + Name[es]=StrongSwan ++Name[et]=StrongSwan + Name[hu]=StrongSwan + Name[it]=StrongSwan + Name[lt]=StrongSwan +@@ -39,6 +40,7 @@ Comment[cs]=Modul StrongSwan + Comment[da]=StrongSwan-plugin + Comment[de]=StrongSwan-Modul + Comment[es]=Complemento de StrongSwan ++Comment[et]=StrongSwani plugin + Comment[hu]=StrongSwan-modul + Comment[it]=Estensione StrongSwan + Comment[lt]=StrongSwan papildinys +diff --git a/vpnplugins/vpnc/networkmanagement_vpncui.desktop b/vpnplugins/vpnc/networkmanagement_vpncui.desktop +index e58b885..4533214 100644 +--- a/vpnplugins/vpnc/networkmanagement_vpncui.desktop ++++ b/vpnplugins/vpnc/networkmanagement_vpncui.desktop +@@ -19,6 +19,7 @@ Name[cs]=VPNC + Name[da]=VPNC + Name[de]=VPNC + Name[es]=VPNC ++Name[et]=VPNC + Name[hu]=VPNC + Name[it]=VPNC + Name[lt]=VPNC +@@ -39,6 +40,7 @@ Comment[cs]=Modul VPNC + Comment[da]=VPNC-plugin + Comment[de]=VPNC-Modul + Comment[es]=Complemento de VPNC ++Comment[et]=VPNC plugin + Comment[hu]=VPNC-modul + Comment[it]=Estensione VPNC + Comment[lt]=VPNC papildinys +-- +1.7.7.4 + diff --git a/0005-fix-setting-focus-on-the-first-empty-input-field-in-.patch b/0005-fix-setting-focus-on-the-first-empty-input-field-in-.patch new file mode 100644 index 0000000..80b9213 --- /dev/null +++ b/0005-fix-setting-focus-on-the-first-empty-input-field-in-.patch @@ -0,0 +1,56 @@ +From bbec5b5ced0d23bf4c4c1ab922824e8f4a673620 Mon Sep 17 00:00:00 2001 +From: Ilia Kats +Date: Wed, 30 Nov 2011 16:58:35 +0100 +Subject: [PATCH 05/10] fix setting focus on the first empty input field in + vpnc auth dialog + +KDialog::show() is called in connectionsecretsjob.cpp only after readSecrets() +has been called, so d->ui.userPasswordLabel->isVisible() returns false +when called in readSecrets() +--- + plasma_nm_version.h | 2 +- + vpnplugins/vpnc/vpncauth.cpp | 4 +++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/plasma_nm_version.h b/plasma_nm_version.h +index 6b76247..e0342cb 100644 +--- a/plasma_nm_version.h ++++ b/plasma_nm_version.h +@@ -1,4 +1,4 @@ + #ifndef PLASMA_NM_VERSION_H + #define PLASMA_NM_VERSION_H +-static const char * plasmaNmVersion = "0.9.0_rc3 (nm09 20111128)"; ++static const char * plasmaNmVersion = "nm09-20111130"; + #endif +diff --git a/vpnplugins/vpnc/vpncauth.cpp b/vpnplugins/vpnc/vpncauth.cpp +index c4a7154..6d07940 100644 +--- a/vpnplugins/vpnc/vpncauth.cpp ++++ b/vpnplugins/vpnc/vpncauth.cpp +@@ -71,6 +71,7 @@ void VpncAuthWidget::readSecrets() + d->ui.leGroupName->setText(group); + } + ++ bool haveUserPassword = true; + if (!((Knm::Setting::secretsTypes)data.value(NM_VPNC_KEY_XAUTH_PASSWORD"-flags").toInt()).testFlag(Knm::Setting::NotRequired)) { + d->ui.leUserPassword->setText(secrets.value(QLatin1String(NM_VPNC_KEY_XAUTH_PASSWORD))); + } else { +@@ -78,6 +79,7 @@ void VpncAuthWidget::readSecrets() + d->ui.leUserName->setVisible(false); + d->ui.userPasswordLabel->setVisible(false); + d->ui.leUserPassword->setVisible(false); ++ haveUserPassword = false; + } + + if (!((Knm::Setting::secretsTypes)data.value(NM_VPNC_KEY_SECRET"-flags").toInt()).testFlag(Knm::Setting::NotRequired)) { +@@ -89,7 +91,7 @@ void VpncAuthWidget::readSecrets() + d->ui.leGroupPassword->setVisible(false); + } + +- if (d->ui.userPasswordLabel->isVisible() && d->ui.leUserPassword->text().isEmpty()) ++ if (haveUserPassword && d->ui.leUserPassword->text().isEmpty()) + d->ui.leUserPassword->setFocus(Qt::OtherFocusReason); + else if (d->ui.leGroupPassword->text().isEmpty()) + d->ui.leGroupPassword->setFocus(Qt::OtherFocusReason); +-- +1.7.7.4 + diff --git a/0006-fix-version-forgot-to-change-the-script.patch b/0006-fix-version-forgot-to-change-the-script.patch new file mode 100644 index 0000000..044f183 --- /dev/null +++ b/0006-fix-version-forgot-to-change-the-script.patch @@ -0,0 +1,22 @@ +From 7faed28758e1dfee3dbd214f3abeb11198ed603d Mon Sep 17 00:00:00 2001 +From: Ilia Kats +Date: Wed, 30 Nov 2011 17:06:21 +0100 +Subject: [PATCH 06/10] fix version (forgot to change the script) + +--- + plasma_nm_version.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/plasma_nm_version.h b/plasma_nm_version.h +index e0342cb..c85bf2d 100644 +--- a/plasma_nm_version.h ++++ b/plasma_nm_version.h +@@ -1,4 +1,4 @@ + #ifndef PLASMA_NM_VERSION_H + #define PLASMA_NM_VERSION_H +-static const char * plasmaNmVersion = "nm09-20111130"; ++static const char * plasmaNmVersion = "0.9.0_rc3 (nm09 20111130)"; + #endif +-- +1.7.7.4 + diff --git a/0007-Try-not-to-crash-if-NM-does-not-respond-to-the-AddCo.patch b/0007-Try-not-to-crash-if-NM-does-not-respond-to-the-AddCo.patch new file mode 100644 index 0000000..216ba26 --- /dev/null +++ b/0007-Try-not-to-crash-if-NM-does-not-respond-to-the-AddCo.patch @@ -0,0 +1,52 @@ +From b7d95782cf8d94e130c6b57f7ba65fa769f32440 Mon Sep 17 00:00:00 2001 +From: "Lamarque V. Souza" +Date: Fri, 2 Dec 2011 00:00:37 -0200 +Subject: [PATCH 07/10] Try not to crash if NM does not respond to the + AddConnection call. (cherry picked from commit + a6678b496b527e44bc6de193a68762c025d18d48) + +--- + .../nmdbussettingsconnectionprovider.cpp | 14 ++++++++++---- + plasma_nm_version.h | 2 +- + 2 files changed, 11 insertions(+), 5 deletions(-) + +diff --git a/backends/NetworkManager/nmdbussettingsconnectionprovider.cpp b/backends/NetworkManager/nmdbussettingsconnectionprovider.cpp +index 04792e9..bf2d8bc 100644 +--- a/backends/NetworkManager/nmdbussettingsconnectionprovider.cpp ++++ b/backends/NetworkManager/nmdbussettingsconnectionprovider.cpp +@@ -438,12 +438,18 @@ void NMDBusSettingsConnectionProvider::onConnectionAddArrived(QDBusPendingCallWa + // This does not work for VPN connections. + // TODO: change this to a dbus call to the kded module. + QString uuid = d->uuidToPath.key(objPath.path(), QUuid()).toString(); +- RemoteConnection *remote = d->connections.value(uuid); ++ if (uuid.isNull()) { ++ initialiseAndRegisterRemoteConnection(objPath.path()); ++ } ++ uuid = d->uuidToPath.key(objPath.path(), QUuid()).toString(); + QVariantMapMap map = d->secretsToSave.take(uuid); +- sleep(1); +- remote->Update(map); +- emit addConnectionCompleted(true, QString()); ++ RemoteConnection *remote = d->connections.value(uuid); ++ if (remote) { ++ sleep(1); ++ remote->Update(map); ++ } + ++ emit addConnectionCompleted(true, QString()); + kDebug() << "Connection added successfully: " << objPath.path() << uuid; + } + +diff --git a/plasma_nm_version.h b/plasma_nm_version.h +index c85bf2d..a07af46 100644 +--- a/plasma_nm_version.h ++++ b/plasma_nm_version.h +@@ -1,4 +1,4 @@ + #ifndef PLASMA_NM_VERSION_H + #define PLASMA_NM_VERSION_H +-static const char * plasmaNmVersion = "0.9.0_rc3 (nm09 20111130)"; ++static const char * plasmaNmVersion = "0.9.0_rc3 (nm09 20111202)"; + #endif +-- +1.7.7.4 + diff --git a/0008-Fix-wifi-WPA2-edit-dialog.patch b/0008-Fix-wifi-WPA2-edit-dialog.patch new file mode 100644 index 0000000..c644d3e --- /dev/null +++ b/0008-Fix-wifi-WPA2-edit-dialog.patch @@ -0,0 +1,46 @@ +From 56c6c6bc9a8cb7e6173be255af9a2a5204627270 Mon Sep 17 00:00:00 2001 +From: "Lamarque V. Souza" +Date: Fri, 2 Dec 2011 15:58:16 -0200 +Subject: [PATCH 08/10] Fix wifi WPA2 edit dialog. (cherry picked from commit + 1fb0bdce94758cc144d894bc6e82dee54d0233fc) + +--- + libs/ui/security/eapmethodstack.cpp | 14 ++++++++++---- + 1 files changed, 10 insertions(+), 4 deletions(-) + +diff --git a/libs/ui/security/eapmethodstack.cpp b/libs/ui/security/eapmethodstack.cpp +index bca6ec0..14a15ae 100644 +--- a/libs/ui/security/eapmethodstack.cpp ++++ b/libs/ui/security/eapmethodstack.cpp +@@ -79,9 +79,15 @@ void EapMethodStack::setCurrentEapMethod(int key) + /* Triggered when the user changes the EAP method using the cboEapMethod combo box. */ + void EapMethodStack::setCurrentEapMethodInternal(int index) + { ++ // Save old eap method's data into this connection's settings. ++ qobject_cast(eapMethods->currentWidget())->writeConfig(); ++ ++ // Change to the chosen epa method. + eapMethods->setCurrentIndex(index); +- readConfig(); +- readSecrets(); ++ ++ // Load this connection's setting into the chosen epa method. ++ qobject_cast(eapMethods->widget(index))->readConfig(); ++ qobject_cast(eapMethods->widget(index))->readSecrets(); + } + + EapMethod * EapMethodStack::currentEapMethod() const +@@ -120,8 +126,8 @@ void EapMethodStack::readSecrets() + + void EapMethodStack::setShowPasswords(bool on) + { +- if (eapMethods->count()) { +- qobject_cast( eapMethods->currentWidget())->setShowPasswords(on); ++ for (int i = 0; i < eapMethods->count(); ++i) { ++ qobject_cast( eapMethods->widget(i))->setShowPasswords(on); + } + } + +-- +1.7.7.4 + diff --git a/0009-Change-networkmanagement_configshell-to-inform-error.patch b/0009-Change-networkmanagement_configshell-to-inform-error.patch new file mode 100644 index 0000000..834251e --- /dev/null +++ b/0009-Change-networkmanagement_configshell-to-inform-error.patch @@ -0,0 +1,144 @@ +From 96274a4cdb784303b61e5c0a7a1b83e645dc31c3 Mon Sep 17 00:00:00 2001 +From: "Lamarque V. Souza" +Date: Sat, 3 Dec 2011 13:21:50 -0200 +Subject: [PATCH 09/10] Change networkmanagement_configshell to inform error + using dialogs instead of console messages. + +CCBUG: 285637 +--- + plasma_nm_version.h | 2 +- + settings/configshell/bluetooth.cpp | 19 +++++++++++-------- + settings/configshell/manageconnection.cpp | 7 ++----- + 3 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/plasma_nm_version.h b/plasma_nm_version.h +index a07af46..135c4fa 100644 +--- a/plasma_nm_version.h ++++ b/plasma_nm_version.h +@@ -1,4 +1,4 @@ + #ifndef PLASMA_NM_VERSION_H + #define PLASMA_NM_VERSION_H +-static const char * plasmaNmVersion = "0.9.0_rc3 (nm09 20111202)"; ++static const char * plasmaNmVersion = "0.9.0_rc3 (nm09 20111203)"; + #endif +diff --git a/settings/configshell/bluetooth.cpp b/settings/configshell/bluetooth.cpp +index 2edd8d4..1cfa69b 100644 +--- a/settings/configshell/bluetooth.cpp ++++ b/settings/configshell/bluetooth.cpp +@@ -27,6 +27,8 @@ along with this program. If not, see . + + #include + #include ++#include ++#include + + #include "bluetooth.h" + #include "manageconnection.h" +@@ -50,7 +52,7 @@ void Bluetooth::init() + QRegExp rx("dun|rfcomm?|nap"); + + if (rx.indexIn(mService) < 0) { +- kError(KDE_DEFAULT_DEBUG_AREA) << "Error: we only support 'dun' and 'nap' services."; ++ KMessageBox::sorry(0, i18n("We support 'dun' and 'nap' services only.")); + kapp->quit(); + return; + } +@@ -64,7 +66,7 @@ void Bluetooth::init() + QLatin1String("org.bluez.Manager"), QDBusConnection::systemBus()); + + if (!bluez.isValid()) { +- kError(KDE_DEFAULT_DEBUG_AREA) << "Error: could not contact BlueZ."; ++ KMessageBox::error(0, i18n("Could not contact bluetooth manager (BlueZ).")); + kapp->quit(); + return; + } +@@ -73,7 +75,7 @@ void Bluetooth::init() + QDBusReply adapterPath = bluez.call(QLatin1String("DefaultAdapter")); + + if (!adapterPath.isValid()) { +- kError(KDE_DEFAULT_DEBUG_AREA) << "Error: default bluetooth adapter not found. Quiting."; ++ KMessageBox::error(0, i18n("Default bluetooth adapter not found: %1", adapterPath.error().message())); + kapp->quit(); + return; + } +@@ -92,6 +94,7 @@ void Bluetooth::init() + if (!devicePath.isValid()) { + kWarning(KDE_DEFAULT_DEBUG_AREA) << mBdaddr << " is not registered in default bluetooth adapter, it may be in another adapter."; + kWarning(KDE_DEFAULT_DEBUG_AREA) << mBdaddr << " waiting for it to be registered in ModemManager"; ++ QTimer::singleShot(60000, kapp, SLOT(quit())); + return; + } + +@@ -136,13 +139,13 @@ void Bluetooth::init() + } + + if (mService != QLatin1String("nap") && !dun) { +- kError(KDE_DEFAULT_DEBUG_AREA) << "Error: " << mBdaddr << "does not support Dialup Networking (DUN)."; ++ KMessageBox::error(0, i18n("%1 (%2) does not support Dialup Networking (DUN).", mDeviceName, mBdaddr)); + kapp->quit(); + return; + } + + if (mService == QLatin1String("nap") && !nap) { +- kError(KDE_DEFAULT_DEBUG_AREA) << "Error: " << mBdaddr << "does not support Network Access Point (NAP)."; ++ KMessageBox::error(0, i18n("%1 (%2) does not support Network Access Point (NAP).", mDeviceName, mBdaddr)); + kapp->quit(); + return; + } +@@ -169,7 +172,7 @@ void Bluetooth::init() + + QDBusReply reply = serial.call(QLatin1String("Connect"), mService); + if (!reply.isValid()) { +- kError(KDE_DEFAULT_DEBUG_AREA) << "Error: org.bluez.Serial.Connect did not work. Quiting."; ++ KMessageBox::error(0, i18n("Error activating devices's serial port: %1", reply.error().message())); + kapp->quit(); + return; + } +@@ -194,9 +197,9 @@ void Bluetooth::modemAdded(const QString &udi) + + if (!modem || modem->device() != mDunDevice) { + if (modem) { +- kError(KDE_DEFAULT_DEBUG_AREA) << "Error: modem" << modem->device() << " is not the one we want(" << mDunDevice << "). Quitting."; ++ KMessageBox::error(0, i18n("Device %1 is not the one we want (%2)", modem->device(), mDunDevice)); + } else { +- kError(KDE_DEFAULT_DEBUG_AREA) << "Error: modem interface for " << udi << " not found. Quitting"; ++ KMessageBox::error(0, i18n("Device for serial port %1 (%2) not found.", mDunDevice, udi)); + } + kapp->quit(); + return; +diff --git a/settings/configshell/manageconnection.cpp b/settings/configshell/manageconnection.cpp +index 2a560c8..a457b2d 100644 +--- a/settings/configshell/manageconnection.cpp ++++ b/settings/configshell/manageconnection.cpp +@@ -19,7 +19,6 @@ along with this program. If not, see . + */ + + #include +-#include + + #include + #include +@@ -35,9 +34,9 @@ ManageConnection::ManageConnection(Knm::Connection *con): m_manager("org.kde.net + { + bool addConnection = true; + mSystemSettings = new NMDBusSettingsConnectionProvider(0, 0); +- Knm::BluetoothSetting * btSetting = static_cast(con->setting(Knm::Setting::Bluetooth)); + +- if (btSetting) { ++ if (con->type() == Knm::Connection::Bluetooth) { ++ Knm::BluetoothSetting * btSetting = static_cast(con->setting(Knm::Setting::Bluetooth)); + foreach(const QString & connectionId, mSystemSettings->connectionList()->connections()) { + Knm::Connection * c = mSystemSettings->connectionList()->findConnection(connectionId); + Knm::BluetoothSetting * setting = static_cast(c->setting(Knm::Setting::Bluetooth)); +@@ -50,8 +49,6 @@ ManageConnection::ManageConnection(Knm::Connection *con): m_manager("org.kde.net + break; + } + } +- } else { +- kError(KDE_DEFAULT_DEBUG_AREA) << "bluetooth setting not found"; + } + + if (addConnection) { +-- +1.7.7.4 + diff --git a/0010-Change-mobile-broadband-wwan-checkbox-into-a-tristat.patch b/0010-Change-mobile-broadband-wwan-checkbox-into-a-tristat.patch new file mode 100644 index 0000000..a8ba1ac --- /dev/null +++ b/0010-Change-mobile-broadband-wwan-checkbox-into-a-tristat.patch @@ -0,0 +1,68 @@ +From c3d56a68858ce53d311da66f926379354d648b6f Mon Sep 17 00:00:00 2001 +From: "Lamarque V. Souza" +Date: Sat, 3 Dec 2011 20:35:41 -0200 +Subject: [PATCH 10/10] Change mobile broadband (wwan) checkbox into a + tristate checkbox. I do not know why NM sends a wwan + disabled signal right after we send an enable wwan + command, the checkbox bounces for while until NM + finally decides to enable or not the mobile broadband + state. + +The third state is "partically checked", represented by a dashed tick +mark. + +BUG: 287794 +--- + applet/nmpopup.cpp | 8 +++++--- + 1 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/applet/nmpopup.cpp b/applet/nmpopup.cpp +index db0d932..840e1e0 100644 +--- a/applet/nmpopup.cpp ++++ b/applet/nmpopup.cpp +@@ -27,6 +27,7 @@ along with this program. If not, see . + #include + #include + #include ++#include + + // KDE + #include +@@ -129,6 +130,7 @@ void NMPopup::init() + m_wwanCheckBox = new Plasma::CheckBox(m_leftWidget); + m_wwanCheckBox->setText(i18nc("CheckBox to enable or disable wwan (mobile broadband) interface)", "Enable mobile broadband")); + m_wwanCheckBox->hide(); ++ m_wwanCheckBox->nativeWidget()->setTristate(true); + checkboxLayout->addItem(m_wwanCheckBox, 0, 1); + + connect(m_wwanCheckBox, SIGNAL(toggled(bool)), SLOT(wwanEnabledToggled(bool))); +@@ -299,7 +301,7 @@ void NMPopup::readConfig() + m_showMoreButton->setEnabled(Solid::Control::NetworkManagerNm09::isNetworkingEnabled() && + Solid::Control::NetworkManagerNm09::isWirelessEnabled()); + +- m_wwanCheckBox->setChecked(Solid::Control::NetworkManagerNm09::isWwanEnabled()); ++ m_wwanCheckBox->nativeWidget()->setCheckState(Solid::Control::NetworkManagerNm09::isWwanEnabled() ? Qt::Checked : Qt::Unchecked); + m_wwanCheckBox->setEnabled(Solid::Control::NetworkManagerNm09::isWwanHardwareEnabled()); + + foreach(InterfaceItem * i, m_interfaces) { +@@ -526,7 +528,7 @@ kDebug() << "Wireless hardware enabled ==" << Solid::Control::NetworkManagerNm09 + m_wifiCheckBox->setEnabled(Solid::Control::NetworkManagerNm09::isWirelessHardwareEnabled() || Solid::Control::NetworkManagerNm09::isWirelessEnabled()); + #endif + +- m_wwanCheckBox->setChecked(Solid::Control::NetworkManagerNm09::isWwanEnabled()); ++ m_wwanCheckBox->nativeWidget()->setCheckState(Solid::Control::NetworkManagerNm09::isWwanEnabled() ? Qt::Checked : Qt::Unchecked); + m_wwanCheckBox->setEnabled(Solid::Control::NetworkManagerNm09::isWwanHardwareEnabled() || Solid::Control::NetworkManagerNm09::isWwanEnabled()); + + updateHasWireless(checked); +@@ -618,7 +620,7 @@ void NMPopup::managerNetworkingEnabledChanged(bool enabled) + void NMPopup::managerWwanEnabledChanged(bool enabled) + { + kDebug() << "NM daemon changed wwan enable state" << enabled; +- m_wwanCheckBox->setChecked(enabled); ++ m_wwanCheckBox->nativeWidget()->setCheckState(enabled ? Qt::Checked : Qt::Unchecked); + if (enabled) { + m_wwanCheckBox->setEnabled(enabled); + } +-- +1.7.7.4 + diff --git a/kde-plasma-networkmanagement.spec b/kde-plasma-networkmanagement.spec index 785fb13..4a2b031 100644 --- a/kde-plasma-networkmanagement.spec +++ b/kde-plasma-networkmanagement.spec @@ -1,11 +1,11 @@ -%global beta rc3 +%global beta 20111203git %global tarballversion 0.8.98 Name: kde-plasma-networkmanagement Epoch: 1 Version: 0.9 -Release: 0.66.%{beta}.nm09%{?dist} +Release: 0.67.%{beta}.nm09%{?dist} Summary: NetworkManager KDE 4 integration Group: Applications/Internet @@ -18,6 +18,20 @@ Source0: ftp://ftp.kde.org/pub/kde/unstable/networkmanagement/%{tarballve # Add plasma-nm to default systray if needed, for upgraders... Source10: 00-fedora-networkmanagement.js +# git format-patch --output-directory patches/ v0.9.0_rc3..HEAD +# up to 20111203 +Patch101: 0001-Caches-deviceUni-and-activatableType-for-RemoteActiv.patch +Patch102: 0002-Disabling-connected-notification-by-default-since-no.patch +Patch103: 0003-Do-not-use-null-backend-pointer-in-warning-message.patch +Patch104: 0004-SVN_SILENT-made-messages-.desktop-file.patch +Patch105: 0005-fix-setting-focus-on-the-first-empty-input-field-in-.patch +Patch106: 0006-fix-version-forgot-to-change-the-script.patch +Patch107: 0007-Try-not-to-crash-if-NM-does-not-respond-to-the-AddCo.patch +Patch108: 0008-Fix-wifi-WPA2-edit-dialog.patch +Patch109: 0009-Change-networkmanagement_configshell-to-inform-error.patch +Patch110: 0010-Change-mobile-broadband-wwan-checkbox-into-a-tristat.patch + + BuildRequires: kdelibs4-devel >= 4.5.0 BuildRequires: kdebase-workspace-devel # really just a runtime dep, meh -- Rex @@ -98,6 +112,17 @@ Requires: NetworkManager-openconnect %prep %setup -q -n networkmanagement-%{tarballversion} +%patch101 -p1 -b .0001 +%patch102 -p1 -b .0002 +%patch103 -p1 -b .0003 +%patch104 -p1 -b .0004 +%patch105 -p1 -b .0005 +%patch106 -p1 -b .0006 +%patch107 -p1 -b .0007 +%patch108 -p1 -b .0008 +%patch109 -p1 -b .0009 +%patch110 -p1 -b .0010 + # nuke monolithic knm bits rm -rfv monolithic po/*/knetworkmanager.po sed -i.no_monolithic -e 's|add_subdirectory(monolithic)|#add_subdirectory(monolithic)|' CMakeLists.txt @@ -217,6 +242,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || : %changelog +* Sun Dec 04 2011 Rex Dieter 1:0.9-0.67.20111203git.nm09 +- 20111203 snapshot + * Sun Nov 27 2011 Rex Dieter 1:0.9-0.66.rc3.nm09 - Update to 0.9 rc3 (0.8.98) for NM 0.9