[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kppp
From:       Harri Porten <porten () kde ! org>
Date:       2005-07-01 22:31:29
Message-ID: 1120257089.209400.20849.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 430603 by porten:

fixing two more logic flaws discovered by Ivan


 M  +1 -1      connect.cpp  
 M  +1 -1      general.cpp  
 M  +1 -1      version.h  


--- trunk/KDE/kdenetwork/kppp/connect.cpp #430602:430603
@@ -1276,7 +1276,7 @@
   // the english/i18n mix below is ugly but we want to keep working
   // after someone changed the code to use i18n'ed config values
   QString flowCtrl = gpppdata.flowcontrol();
-  if(flowCtrl != "None" || flowCtrl != i18n("None")) {
+  if(flowCtrl != "None" && flowCtrl != i18n("None")) {
     if(flowCtrl == "CRTSCTS" || flowCtrl == "Hardware [CRTSCTS]" ||
        flowCtrl == i18n("Hardware [CRTSCTS]"))
       command += " crtscts";
--- trunk/KDE/kdenetwork/kppp/general.cpp #430602:430603
@@ -403,7 +403,7 @@
   }
 
   for(int i=0; i <= flowcontrol->count()-1; i++)
-    if(gpppdata.flowcontrol() == flowcontrol->text(i))
+    if(gpppdata.flowcontrol() == flowListItem[i])
       flowcontrol->setCurrentItem(i);
 
 	//set the modem speed
--- trunk/KDE/kdenetwork/kppp/version.h #430602:430603
@@ -1,3 +1,3 @@
 #ifndef KPPPVERSION
-#define KPPPVERSION "2.3.1"
+#define KPPPVERSION "2.3.2"
 #endif
[prev in list] [next in list] [prev in thread] [next in thread]