[pkg-wpa-devel] r1317 - in /wpasupplicant/trunk/debian/patches: 10_wpa_gui_qt4_wps_tab_cleanups.patch 11_wpa_gui_qt4_qsession.patch

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

Author: kelmo-guest
Date: Sun Feb  1 20:57:31 2009
New Revision: 1317

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1317
Log:
Apply upstream committed patch to handle disabling of WPS tab in wpa_gui-qt4 and refresh debian/patches/11_wpa_gui_qt4_qsession.patch

Modified:
    wpasupplicant/trunk/debian/patches/10_wpa_gui_qt4_wps_tab_cleanups.patch
    wpasupplicant/trunk/debian/patches/11_wpa_gui_qt4_qsession.patch

Modified: wpasupplicant/trunk/debian/patches/10_wpa_gui_qt4_wps_tab_cleanups.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/10_wpa_gui_qt4_wps_tab_cleanups.patch?rev=1317&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/10_wpa_gui_qt4_wps_tab_cleanups.patch (original)
+++ wpasupplicant/trunk/debian/patches/10_wpa_gui_qt4_wps_tab_cleanups.patch Sun Feb  1 20:57:31 2009
@@ -26,12 +26,29 @@
            <property name="text" >
 --- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
 +++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
-@@ -407,6 +407,8 @@ int WpaGui::openCtrlConnection(const cha
+@@ -72,6 +72,13 @@ WpaGui::WpaGui(QWidget *parent, const ch
+ 
+ 	(void) statusBar();
+ 
++	/*
++	 * Disable WPS tab by default; it will be enabled if wpa_supplicant is
++	 * built with WPS support.
++	 */
++	wpsTab->setEnabled(false);
++	wpaguiTab->setTabEnabled(wpaguiTab->indexOf(wpsTab), false);
++
+ 	connect(fileEventHistoryAction, SIGNAL(triggered()), this,
+ 		SLOT(eventHistory()));
+ 	connect(fileSaveConfigAction, SIGNAL(triggered()), this,
+@@ -406,7 +413,10 @@ int WpaGui::openCtrlConnection(const cha
+ 
  		QString res(buf);
  		QStringList types = res.split(QChar(' '));
- 		actionWPS->setEnabled(types.contains("WSC"));
-+		wpaguiTab->setTabEnabled(wpaguiTab->indexOf(wpsTab),
-+					 types.contains("WSC"));
+-		actionWPS->setEnabled(types.contains("WSC"));
++		bool wps = types.contains("WSC");
++		actionWPS->setEnabled(wps);
++		wpsTab->setEnabled(wps);
++		wpaguiTab->setTabEnabled(wpaguiTab->indexOf(wpsTab), wps);
  	}
  
  	return 0;

Modified: wpasupplicant/trunk/debian/patches/11_wpa_gui_qt4_qsession.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/11_wpa_gui_qt4_qsession.patch?rev=1317&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/11_wpa_gui_qt4_qsession.patch (original)
+++ wpasupplicant/trunk/debian/patches/11_wpa_gui_qt4_qsession.patch Sun Feb  1 20:57:31 2009
@@ -77,7 +77,7 @@
  {
  	setupUi(this);
  
-@@ -137,6 +138,15 @@ WpaGui::WpaGui(QWidget *parent, const ch
+@@ -144,6 +145,15 @@ WpaGui::WpaGui(QWidget *parent, const ch
  
  	parse_argv();
  
@@ -93,7 +93,7 @@
  	if (QSystemTrayIcon::isSystemTrayAvailable())
  		createTrayIcon(startInTray);
  	else
-@@ -1294,6 +1304,7 @@ void WpaGui::createTrayIcon(bool trayOnl
+@@ -1303,6 +1313,7 @@ void WpaGui::createTrayIcon(bool trayOnl
  
  	if (!trayOnly)
  		show();
@@ -101,7 +101,7 @@
  }
  
  
-@@ -1317,10 +1328,13 @@ void WpaGui::trayActivated(QSystemTrayIc
+@@ -1326,10 +1337,13 @@ void WpaGui::trayActivated(QSystemTrayIc
  	 * custom closeEvent handler take care of children */
  	case QSystemTrayIcon::Trigger:
  		ackTrayIcon = true;
@@ -117,7 +117,7 @@
  		break;
  	case QSystemTrayIcon::MiddleClick:
  		showTrayStatus();
-@@ -1664,3 +1678,13 @@ void WpaGui::addInterface()
+@@ -1673,3 +1687,13 @@ void WpaGui::addInterface()
  	add_iface->show();
  	add_iface->exec();
  }