Diffstat (limited to 'noncore/settings/networksettings') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanmodule.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp index e34f0ce..371b689 100644 --- a/noncore/settings/networksettings/wlan/wlanmodule.cpp +++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp | |||
@@ -101,97 +101,99 @@ QList<Interface> WLANModule::getInterfaces(){ | |||
101 | * @param name the name of the type of interface that should be created given | 101 | * @param name the name of the type of interface that should be created given |
102 | * by possibleNewInterfaces(); | 102 | * by possibleNewInterfaces(); |
103 | * @return Interface* NULL if it was unable to be created. | 103 | * @return Interface* NULL if it was unable to be created. |
104 | */ | 104 | */ |
105 | Interface *WLANModule::addNewInterface(const QString &){ | 105 | Interface *WLANModule::addNewInterface(const QString &){ |
106 | // We can't add a 802.11 interface, either the hardware will be there | 106 | // We can't add a 802.11 interface, either the hardware will be there |
107 | // or it wont. | 107 | // or it wont. |
108 | return NULL; | 108 | return NULL; |
109 | } | 109 | } |
110 | 110 | ||
111 | /** | 111 | /** |
112 | * Attempts to remove the interface, doesn't delete i | 112 | * Attempts to remove the interface, doesn't delete i |
113 | * @return bool true if successfull, false otherwise. | 113 | * @return bool true if successfull, false otherwise. |
114 | */ | 114 | */ |
115 | bool WLANModule::remove(Interface*){ | 115 | bool WLANModule::remove(Interface*){ |
116 | // Can't remove a hardware device, you can stop it though. | 116 | // Can't remove a hardware device, you can stop it though. |
117 | return false; | 117 | return false; |
118 | } | 118 | } |
119 | 119 | ||
120 | void WLANModule::receive(const QCString ¶m, const QByteArray &arg) | 120 | void WLANModule::receive(const QCString ¶m, const QByteArray &arg) |
121 | { | 121 | { |
122 | qDebug("WLANModule::receive "+param); | 122 | qDebug("WLANModule::receive "+param); |
123 | QStringList params = QStringList::split(",",param); | 123 | QStringList params = QStringList::split(",",param); |
124 | int count = params.count(); | 124 | int count = params.count(); |
125 | qDebug("WLANModule got %i params", count ); | 125 | qDebug("WLANModule got %i params", count ); |
126 | if (count < 2){ | 126 | if (count < 2){ |
127 | qDebug("Erorr less than 2 parameter"); | 127 | qDebug("Erorr less than 2 parameter"); |
128 | qDebug("RETURNING"); | 128 | qDebug("RETURNING"); |
129 | return; | 129 | return; |
130 | } | 130 | } |
131 | 131 | ||
132 | QDataStream stream(arg,IO_ReadOnly); | 132 | QDataStream stream(arg,IO_ReadOnly); |
133 | QString interface; | 133 | QString interface; |
134 | QString action; | 134 | QString action; |
135 | while (! stream.atEnd() ){ | 135 | while (! stream.atEnd() ){ |
136 | stream >> interface; | 136 | stream >> interface; |
137 | stream >> action; | 137 | stream >> action; |
138 | qDebug("WLANModule got interface %s and acion %s", interface.latin1(), action.latin1()); | 138 | qDebug("WLANModule got interface %s and acion %s", interface.latin1(), action.latin1()); |
139 | // find interfaces | 139 | // find interfaces |
140 | Interface *ifa=0; | 140 | Interface *ifa=0; |
141 | for ( Interface *i=list.first(); i != 0; i=list.next() ){ | 141 | for ( Interface *i=list.first(); i != 0; i=list.next() ){ |
142 | if (i->getInterfaceName() == interface){ | 142 | if (i->getInterfaceName() == interface){ |
143 | qDebug("WLANModule found interface %s",interface.latin1()); | 143 | qDebug("WLANModule found interface %s",interface.latin1()); |
144 | ifa = i; | 144 | ifa = i; |
145 | } | 145 | } |
146 | } | 146 | } |
147 | 147 | ||
148 | if (ifa == 0){ | 148 | if (ifa == 0){ |
149 | qFatal("WLANModule Did not find %s",interface.latin1()); | 149 | qDebug("WLANModule Did not find %s",interface.latin1()); |
150 | qDebug("returning"); | ||
151 | return; | ||
150 | } | 152 | } |
151 | 153 | ||
152 | if (count == 2){ | 154 | if (count == 2){ |
153 | // those should call the interface directly | 155 | // those should call the interface directly |
154 | QWidget *info = getInfo( ifa ); | 156 | QWidget *info = getInfo( ifa ); |
155 | info->showMaximized(); | 157 | info->showMaximized(); |
156 | 158 | ||
157 | if ( action.contains("start" ) ){ | 159 | if ( action.contains("start" ) ){ |
158 | ifa->start(); | 160 | ifa->start(); |
159 | } else if ( action.contains("restart" ) ){ | 161 | } else if ( action.contains("restart" ) ){ |
160 | ifa->restart(); | 162 | ifa->restart(); |
161 | } else if ( action.contains("stop" ) ){ | 163 | } else if ( action.contains("stop" ) ){ |
162 | ifa->stop(); | 164 | ifa->stop(); |
163 | }else if ( action.contains("refresh" ) ){ | 165 | }else if ( action.contains("refresh" ) ){ |
164 | ifa->refresh(); | 166 | ifa->refresh(); |
165 | } | 167 | } |
166 | }else if (count == 3){ | 168 | }else if (count == 3){ |
167 | QString value; | 169 | QString value; |
168 | if (!wlanconfigWiget){ | 170 | if (!wlanconfigWiget){ |
169 | //FIXME: what if it got closed meanwhile? | 171 | //FIXME: what if it got closed meanwhile? |
170 | wlanconfigWiget = (WLANImp*) configure(ifa); | 172 | wlanconfigWiget = (WLANImp*) configure(ifa); |
171 | } | 173 | } |
172 | wlanconfigWiget->showMaximized(); | 174 | wlanconfigWiget->showMaximized(); |
173 | stream >> value; | 175 | stream >> value; |
174 | qDebug("WLANModule is setting %s of %s to %s", action.latin1(), interface.latin1(), value.latin1() ); | 176 | qDebug("WLANModule is setting %s of %s to %s", action.latin1(), interface.latin1(), value.latin1() ); |
175 | if ( action.contains("ESSID") ){ | 177 | if ( action.contains("ESSID") ){ |
176 | QComboBox *combo = wlanconfigWiget->essid; | 178 | QComboBox *combo = wlanconfigWiget->essid; |
177 | bool found = false; | 179 | bool found = false; |
178 | for ( int i = 0; i < combo->count(); i++) | 180 | for ( int i = 0; i < combo->count(); i++) |
179 | if ( combo->text( i ) == value ){ | 181 | if ( combo->text( i ) == value ){ |
180 | combo->setCurrentItem( i ); | 182 | combo->setCurrentItem( i ); |
181 | found = true; | 183 | found = true; |
182 | } | 184 | } |
183 | if (!found) combo->insertItem( value, 0 ); | 185 | if (!found) combo->insertItem( value, 0 ); |
184 | }else if ( action.contains("Mode") ){ | 186 | }else if ( action.contains("Mode") ){ |
185 | QComboBox *combo = wlanconfigWiget->mode; | 187 | QComboBox *combo = wlanconfigWiget->mode; |
186 | for ( int i = 0; i < combo->count(); i++) | 188 | for ( int i = 0; i < combo->count(); i++) |
187 | if ( combo->text( i ) == value ){ | 189 | if ( combo->text( i ) == value ){ |
188 | combo->setCurrentItem( i ); | 190 | combo->setCurrentItem( i ); |
189 | } | 191 | } |
190 | 192 | ||
191 | }else if (action.contains("Channel")){ | 193 | }else if (action.contains("Channel")){ |
192 | wlanconfigWiget->specifyChan->setChecked( true ); | 194 | wlanconfigWiget->specifyChan->setChecked( true ); |
193 | wlanconfigWiget->networkChannel->setValue( value.toInt() ); | 195 | wlanconfigWiget->networkChannel->setValue( value.toInt() ); |
194 | }else if (action.contains("MacAddr")){ | 196 | }else if (action.contains("MacAddr")){ |
195 | wlanconfigWiget->specifyAp->setChecked( true ); | 197 | wlanconfigWiget->specifyAp->setChecked( true ); |
196 | wlanconfigWiget->macEdit->setText( value ); | 198 | wlanconfigWiget->macEdit->setText( value ); |
197 | }else | 199 | }else |