From: David Llewellyn-Jones Date: Mon, 24 Mar 2014 23:24:02 +0000 (+0000) Subject: Added status message on close of openvpn. Udated the yaml file to set X-Git-Url: https://www.flypig.org.uk/git/?p=openvpnui.git;a=commitdiff_plain;h=6bef755f7d79ccd2a8467ea9eea0db4d8532a41c Added status message on close of openvpn. Udated the yaml file to set the correct permissions on ovpnpermit. --- diff --git a/OpenVPNUI.pro.user b/OpenVPNUI.pro.user index 864be9f..c471047 100644 --- a/OpenVPNUI.pro.user +++ b/OpenVPNUI.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget @@ -53,7 +53,7 @@ MerSDK-SailfishOS-armv7hl MerSDK-SailfishOS-armv7hl - {d509da11-0d11-4fad-8b14-f7a950fad5bf} + {d2cef3cf-98e6-437c-a097-b7f269d12d9c} 0 2 0 @@ -268,7 +268,7 @@ OpenVPNUI (on Remote Device) - Qt4ProjectManager.MerRunConfiguration:/home/flypig/Documents/Development/SailfishOS/ovpnui/OpenVPNUI/OpenVPNUI.pro + Qt4ProjectManager.MerRunConfiguration:/home/flypig/Documents/Development/SailfishOS/openvpnui/OpenVPNUI.pro OpenVPNUI.pro @@ -284,243 +284,13 @@ 1 - - ProjectExplorer.Project.Target.1 - - MerSDK-SailfishOS-i486-x86 - MerSDK-SailfishOS-i486-x86 - {afe67e8f-9b68-41c9-a78e-976c32346149} - 0 - 0 - 0 - - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - /home/flypig/Documents/Development/SailfishOS/build-OpenVPNUI-MerSDK_SailfishOS_i486_x86-Debug - true - - - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - /home/flypig/Documents/Development/SailfishOS/build-OpenVPNUI-MerSDK_SailfishOS_i486_x86-Release - true - - 2 - - - - true - Start Emulator - - Qt4ProjectManager.MerEmulatorStartStep - - - true - Rsync - - Qt4ProjectManager.MerRsyncDeployStep - - 2 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy By Copying Binaries - - Qt4ProjectManager.MerRSyncDeployConfiguration - - - - - true - Start Emulator - - Qt4ProjectManager.MerEmulatorStartStep - - - true - Rpm - - Qt4ProjectManager.MerRpmDeployStep - - 2 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy As RPM Package - - Qt4ProjectManager.MerRpmDeployConfiguration - - 2 - - - true - - false - false - false - false - true - 0.01 - 10 - true - 25 - - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - -1 - - OpenVPNUI (on Remote Device) - - Qt4ProjectManager.MerRunConfiguration:/home/flypig/Documents/Development/SailfishOS/ovpnui/OpenVPNUI/OpenVPNUI.pro - - OpenVPNUI.pro - - false - - 3768 - false - true - false - false - true - - 1 - - ProjectExplorer.Project.TargetCount - 2 + 1 ProjectExplorer.Project.Updater.EnvironmentId - {551e7bc8-ec93-459f-bb3a-08a2bffda2a5} + {345860fb-8510-4b40-bec6-87a56aacf929} ProjectExplorer.Project.Updater.FileVersion diff --git a/bin/ovpnpermit b/bin/ovpnpermit index 2edc848..5f57070 100755 Binary files a/bin/ovpnpermit and b/bin/ovpnpermit differ diff --git a/rpm/OpenVPNUI.spec b/rpm/OpenVPNUI.spec index 0052ffd..25569f4 100644 --- a/rpm/OpenVPNUI.spec +++ b/rpm/OpenVPNUI.spec @@ -21,10 +21,10 @@ URL: http://example.org/ Source0: %{name}-%{version}.tar.bz2 Source100: OpenVPNUI.yaml Requires: sailfishsilica-qt5 >= 0.10.9 -BuildRequires: pkgconfig(Qt5Quick) -BuildRequires: pkgconfig(Qt5Qml) -BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(sailfishapp) >= 0.0.10 +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Qml) +BuildRequires: pkgconfig(Qt5Quick) BuildRequires: desktop-file-utils %description @@ -63,15 +63,15 @@ desktop-file-install --delete-original \ %files %defattr(-,root,root,-) -%{_bindir} -%{_datadir}/%{name}/qml -%{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/86x86/apps/%{name}.png -%{_datadir}/%{name}/bin -%attr(4755,root,root) %{_datadir}/%{name}/bin/ovpnpermit -/usr/bin -/usr/share/OpenVPNUI -/usr/share/applications /usr/share/icons/hicolor/86x86/apps +/usr/share/applications +/usr/share/OpenVPNUI +/usr/bin +%attr(4755,root,root) %{_datadir}/%{name}/bin/ovpnpermit +%{_datadir}/%{name}/bin +%{_datadir}/icons/hicolor/86x86/apps/%{name}.png +%{_datadir}/applications/%{name}.desktop +%{_datadir}/%{name}/qml +%{_bindir} # >> files # << files diff --git a/rpm/OpenVPNUI.yaml b/rpm/OpenVPNUI.yaml index 80d30b6..e899975 100644 --- a/rpm/OpenVPNUI.yaml +++ b/rpm/OpenVPNUI.yaml @@ -12,21 +12,21 @@ Description: | Configure: none Builder: qtc5 PkgConfigBR: -- Qt5Quick -- Qt5Qml -- Qt5Core - sailfishapp >= 0.0.10 +- Qt5Core +- Qt5Qml +- Qt5Quick Requires: - sailfishsilica-qt5 >= 0.10.9 Files: -- '%{_bindir}' -- '%{_datadir}/%{name}/qml' -- '%{_datadir}/applications/%{name}.desktop' -- '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png' -- '%{_datadir}/%{name}/bin' -- '%attr(2755,root,root) %{_datadir}/%{name}/bin/ovpnpermit' -- /usr/bin -- /usr/share/OpenVPNUI -- /usr/share/applications - /usr/share/icons/hicolor/86x86/apps +- /usr/share/applications +- /usr/share/OpenVPNUI +- /usr/bin +- '%attr(4755,root,root) %{_datadir}/%{name}/bin/ovpnpermit' +- '%{_datadir}/%{name}/bin' +- '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png' +- '%{_datadir}/applications/%{name}.desktop' +- '%{_datadir}/%{name}/qml' +- '%{_bindir}' PkgBR: [] diff --git a/src/vpncontrol.cpp b/src/vpncontrol.cpp index d0d411b..3f80913 100644 --- a/src/vpncontrol.cpp +++ b/src/vpncontrol.cpp @@ -319,6 +319,7 @@ void VPNControl::finished(int code) { //delete vpnProcess; vpnProcess = NULL; } + logAppend("Finished with code " + QString::number(code)); setStatus(VPNSTATUS_UNINITIALISED); }