[pkg-wpa-devel] r1050 - in /wpasupplicant/trunk/debian: changelog patches/39_wpa_gui_qt4_closeevent.patch patches/series

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Mon Jan 21 13:45:37 2008
New Revision: 1050

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1050
Log:
* Add debian/patches/39_wpa_gui_qt4_closeevent.patch to improve handling of
  wpa_gui-qt4 exit, both from File->exit and the X button on the titlebar.

Added:
    wpasupplicant/trunk/debian/patches/39_wpa_gui_qt4_closeevent.patch
Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/patches/series

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1050&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Mon Jan 21 13:45:37 2008
@@ -33,8 +33,10 @@
     in the wpa_supplicant/ directory.
   * Add ${misc:depends} to Depends field of our packages to ensure we do not
     miss out on any substvars that debhelper may provide us with.
-
- -- Kel Modderman <kel at otaku42.de>  Mon, 21 Jan 2008 20:37:57 +1000
+  * Add debian/patches/39_wpa_gui_qt4_closeevent.patch to improve handling of
+    wpa_gui-qt4 exit, both from File->exit and the X button on the titlebar.
+
+ -- Kel Modderman <kel at otaku42.de>  Mon, 21 Jan 2008 23:42:55 +1000
 
 wpasupplicant (0.6.2-1) experimental; urgency=low
 

Added: wpasupplicant/trunk/debian/patches/39_wpa_gui_qt4_closeevent.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/39_wpa_gui_qt4_closeevent.patch?rev=1050&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/39_wpa_gui_qt4_closeevent.patch (added)
+++ wpasupplicant/trunk/debian/patches/39_wpa_gui_qt4_closeevent.patch Mon Jan 21 13:45:37 2008
@@ -1,0 +1,49 @@
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+@@ -18,6 +18,7 @@
+ #endif
+ 
+ #include <QMessageBox>
++#include <QCloseEvent>
+ 
+ #include "wpagui.h"
+ #include "dirent.h"
+@@ -36,7 +37,7 @@
+ 	connect(helpContentsAction, SIGNAL(triggered()), this,
+ 		SLOT(helpContents()));
+ 	connect(helpAboutAction, SIGNAL(triggered()), this, SLOT(helpAbout()));
+-	connect(fileExitAction, SIGNAL(triggered()), this, SLOT(exitApp()));
++	connect(fileExitAction, SIGNAL(triggered()), this, SLOT(close()));
+ 	connect(disconnectButton, SIGNAL(clicked()), this, SLOT(disconnect()));
+ 	connect(scanButton, SIGNAL(clicked()), this, SLOT(scan()));
+ 	connect(connectButton, SIGNAL(clicked()), this, SLOT(connectB()));
+@@ -841,7 +842,7 @@
+ }
+ 
+ 
+-void WpaGui::exitApp()
++void WpaGui::closeEvent(QCloseEvent *event)
+ {
+ 	if (eh) {
+ 		eh->close();
+@@ -861,5 +862,5 @@
+ 		udr = NULL;
+ 	}
+ 
+-	close();
++	event->accept();
+ }
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.h
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.h
+@@ -55,10 +55,10 @@
+ 	virtual void disableAllNetworks();
+ 	virtual void saveConfig();
+ 	virtual void selectAdapter(const QString &sel);
+-	virtual void exitApp();
+ 
+ protected slots:
+ 	virtual void languageChange();
++	virtual void closeEvent(QCloseEvent *event);
+ 
+ private:
+ 	ScanResults *scanres;

Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1050&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Mon Jan 21 13:45:37 2008
@@ -14,3 +14,4 @@
 36_ctrl_iface_remove_all.patch
 37_rm_wait_for_interface.patch
 38_dbus_blob_support.patch
+39_wpa_gui_qt4_closeevent.patch