[pkg-wpa-devel] r974 - in /wpasupplicant/trunk/debian: changelog patches/30_qt4_combo_box_additem.patch

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

Author: kelmo-guest
Date: Wed Jan  2 00:52:49 2008
New Revision: 974

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=974
Log:
refresh debian/patches/30_qt4_combo_box_additem.patch to fix other wrong usages of insertItem()

Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/patches/30_qt4_combo_box_additem.patch

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=974&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Wed Jan  2 00:52:49 2008
@@ -62,9 +62,10 @@
     code. It also closes all child windows on File->Exit. (Closes: #426924)
   * wpasupplicant now Suggests wpagui.
   * Add debian/patches/30_qt4_combo_box_additem.patch to fix population of
-    wpa_gui-qt4 network id combo box by using qt4's addItem function.
-
- -- Kel Modderman <kel at otaku42.de>  Wed, 02 Jan 2008 09:58:55 +1000
+    wpa_gui-qt4 combo box lists by using qt4's addItem function to append new
+    items.
+
+ -- Kel Modderman <kel at otaku42.de>  Wed, 02 Jan 2008 10:51:14 +1000
 
 wpasupplicant (0.6.1~git20071119-1) unstable; urgency=low
 

Modified: wpasupplicant/trunk/debian/patches/30_qt4_combo_box_additem.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/30_qt4_combo_box_additem.patch?rev=974&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/30_qt4_combo_box_additem.patch (original)
+++ wpasupplicant/trunk/debian/patches/30_qt4_combo_box_additem.patch Wed Jan  2 00:52:49 2008
@@ -1,5 +1,23 @@
 --- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
 +++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+@@ -273,7 +273,7 @@
+ #endif
+ 
+ 	adapterSelect->clear();
+-	adapterSelect->insertItem(-1, ctrl_iface);
++	adapterSelect->addItem(ctrl_iface);
+ 	adapterSelect->setCurrentIndex(0);
+ 
+ 	len = sizeof(buf) - 1;
+@@ -286,7 +286,7 @@
+ 			if (pos2)
+ 				*pos2 = '\0';
+ 			if (strcmp(pos, ctrl_iface) != 0)
+-				adapterSelect->insertItem(-1, pos);
++				adapterSelect->addItem(pos);
+ 			if (pos2)
+ 				pos = pos2 + 1;
+ 			else
 @@ -475,7 +475,7 @@
  		QString network(id);
  		network.append(": ");
@@ -9,3 +27,22 @@
  
  		if (strstr(flags, "[CURRENT]")) {
  			networkSelect->setCurrentIndex(networkSelect->count() -
+--- a/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp
+@@ -110,12 +110,12 @@
+ 		encrSelect->removeItem(0);
+ 
+ 	if (sel == AUTH_NONE || sel == AUTH_IEEE8021X) {
+-		encrSelect->insertItem(-1, "None");
+-		encrSelect->insertItem(-1, "WEP");
++		encrSelect->addItem("None");
++		encrSelect->addItem("WEP");
+ 		encrSelect->setCurrentIndex(sel == AUTH_NONE ? 0 : 1);
+ 	} else {
+-		encrSelect->insertItem(-1, "TKIP");
+-		encrSelect->insertItem(-1, "CCMP");
++		encrSelect->addItem("TKIP");
++		encrSelect->addItem("CCMP");
+ 		encrSelect->setCurrentIndex((sel == AUTH_WPA2_PSK ||
+ 					     sel == AUTH_WPA2_EAP) ? 1 : 0);
+ 	}