[pkg-wpa-devel] r1256 - in /wpasupplicant/trunk/debian: changelog patches/17_handle_last_window_closed.patch patches/series

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

Author: kelmo-guest
Date: Thu Sep 25 08:52:43 2008
New Revision: 1256

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1256
Log:
17_handle_last_window_closed.patch

Added:
    wpasupplicant/trunk/debian/patches/17_handle_last_window_closed.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=1256&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Thu Sep 25 08:52:43 2008
@@ -18,6 +18,7 @@
      - 14_qsystemtray_icon.patch
      - 15_tray_status_state.patch
      - 16_wpa_gui_icon_touchup.patch
+     - 17_handle_last_window_closed.patch
   * Install icon and menu entry for wpa_gui. [debian/rules] (Closes: #498923)
   * Add a shell script wrapper, debian/wpa_gui/netdev_wrapper, which will be
     used by the menu entry to try and exec /usr/sbin/wpa_gui with best
@@ -39,7 +40,7 @@
      - 08_only_use_cached_scan_results_if_nonempty.patch
   * Refresh patch series to apply without offset.
 
- -- Kel Modderman <kel at otaku42.de>  Thu, 25 Sep 2008 07:52:06 +1000
+ -- Kel Modderman <kel at otaku42.de>  Thu, 25 Sep 2008 18:15:38 +1000
 
 wpasupplicant (0.6.4-2) unstable; urgency=low
 

Added: wpasupplicant/trunk/debian/patches/17_handle_last_window_closed.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/17_handle_last_window_closed.patch?rev=1256&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/17_handle_last_window_closed.patch (added)
+++ wpasupplicant/trunk/debian/patches/17_handle_last_window_closed.patch Thu Sep 25 08:52:43 2008
@@ -1,0 +1,67 @@
+Do not connect lastWindowClosed() to quit(), instead explicitly close the
+application if File->Exit or window manager close button is activated.
+This allows the tray app to avoid being closed with last visible window,
+and launch scan and event history windows individually.
+
+Signed-off-by: Kel Modderman <kel at otaku42.de>
+---
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+@@ -595,9 +595,6 @@
+ 		delete scanres;
+ 	}
+ 
+-	if (!isVisible())
+-		show();
+-
+ 	scanres = new ScanResults();
+ 	if (scanres == NULL)
+ 		return;
+@@ -614,9 +611,6 @@
+ 		delete eh;
+ 	}
+ 
+-	if (!isVisible())
+-		show();
+-
+ 	eh = new EventHistory();
+ 	if (eh == NULL)
+ 		return;
+@@ -1093,6 +1087,8 @@
+ 
+ void WpaGui::createTrayIcon()
+ {
++	QApplication::setQuitOnLastWindowClosed(false);
++
+ 	tray_icon = new QSystemTrayIcon(this);
+ 	tray_icon->setToolTip(qAppName() + " - wpa_supplicant user interface");
+ 	tray_icon->setIcon(QIcon(":/icons/wpa_gui.svg"));
+@@ -1219,10 +1215,7 @@
+ 
+ void WpaGui::fileExit()
+ {
+-	if (tray_icon)
+-		tray_icon->hide();
+-
+-	close();
++	qApp->quit();
+ }
+ 
+ 
+@@ -1267,5 +1260,5 @@
+ 		return;
+ 	}
+ 
+-	event->accept();
++	qApp->quit();
+ }
+--- a/wpa_supplicant/wpa_gui-qt4/main.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/main.cpp
+@@ -33,7 +33,6 @@
+ #endif /* CONFIG_NATIVE_WINDOWS */
+ 
+ 	w.show();
+-	app.connect(&app, SIGNAL(lastWindowClosed()), &app, SLOT(quit()));
+ 	ret = app.exec();
+ 
+ #ifdef CONFIG_NATIVE_WINDOWS

Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1256&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Thu Sep 25 08:52:43 2008
@@ -13,4 +13,5 @@
 14_qsystemtray_icon.patch
 15_tray_status_state.patch
 16_wpa_gui_icon_touchup.patch
+17_handle_last_window_closed.patch
 20_wpa_gui_menu_exec_path.patch