[pkg-wpa-devel] r1307 - in /wpasupplicant/trunk/debian: changelog patches/10_wpa_gui_qt4_wps_tab_cleanups.patch patches/series

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

Author: kelmo-guest
Date: Sun Jan 11 12:42:25 2009
New Revision: 1307

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1307
Log:
Add debian/patches/10_wpa_gui_qt4_wps_tab_cleanups.patch to cleanup
a couple of minor glitches with new wpa_gui-qt4 WPS additions.

Added:
    wpasupplicant/trunk/debian/patches/10_wpa_gui_qt4_wps_tab_cleanups.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=1307&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Sun Jan 11 12:42:25 2009
@@ -7,8 +7,10 @@
     copyright.
   * Refresh debian/patches/05_qmake_version_makefile.patch and
     debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch.
-
- -- Kel Modderman <kel at otaku42.de>  Sat, 10 Jan 2009 19:04:46 +1000
+  * Add debian/patches/10_wpa_gui_qt4_wps_tab_cleanups.patch to cleanup
+    a couple of minor glitches with new wpa_gui-qt4 WPS additions.
+
+ -- Kel Modderman <kel at otaku42.de>  Sun, 11 Jan 2009 22:42:03 +1000
 
 wpasupplicant (0.6.6-2) experimental; urgency=low
 

Added: 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=1307&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/10_wpa_gui_qt4_wps_tab_cleanups.patch (added)
+++ wpasupplicant/trunk/debian/patches/10_wpa_gui_qt4_wps_tab_cleanups.patch Sun Jan 11 12:42:25 2009
@@ -1,0 +1,36 @@
+Fix compile warning by renaming gridLayout to wpsGridLayout in wpagui.ui, it
+seems to be used internally.
+
+/usr/bin/uic-qt4 eventhistory.ui -o .ui/ui_eventhistory.h
+/usr/bin/uic-qt4 scanresults.ui -o .ui/ui_scanresults.h
+/usr/bin/uic-qt4 wpagui.ui -o .ui/ui_wpagui.h
+Warning: name gridLayout is already used
+/usr/bin/uic-qt4 userdatarequest.ui -o .ui/ui_userdatarequest.h
+/usr/bin/uic-qt4 networkconfig.ui -o .ui/ui_networkconfig.h
+
+Also disable WPS tab if the running supplicant doesn't support that, just as
+the WPS action menu is.
+
+Signed-off-by: Kel Modderman <kel at otaku42.de>
+---
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.ui
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.ui
+@@ -293,7 +293,7 @@
+        <attribute name="title" >
+         <string>WPS</string>
+        </attribute>
+-       <layout class="QGridLayout" name="gridLayout" >
++       <layout class="QGridLayout" name="wpsGridLayout" >
+         <item row="0" column="0" >
+          <widget class="QLabel" name="label_2" >
+           <property name="text" >
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+@@ -407,6 +407,7 @@ int WpaGui::openCtrlConnection(const cha
+ 		QString res(buf);
+ 		QStringList types = res.split(QChar(' '));
+ 		actionWPS->setEnabled(types.contains("WSC"));
++		wpsTab->setEnabled(types.contains("WSC"));
+ 	}
+ 
+ 	return 0;

Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1307&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Sun Jan 11 12:42:25 2009
@@ -4,3 +4,4 @@
 04_append_mmd_to_default_cflags.patch
 05_qmake_version_makefile.patch
 06_wpa_gui_menu_exec_path.patch
+10_wpa_gui_qt4_wps_tab_cleanups.patch