File strcompare.patch of Package kshowmail

Overview Repositories Revisions Requests Users Attributes Meta

File strcompare.patch of Package kshowmail

diff -Nru kshowmail-3.3.1.orig/kshowmail/kcmconfigs/accountsetupdialog.cpp kshowmail-3.3.1/kshowmail/kcmconfigs/accountsetupdialog.cpp
--- kshowmail-3.3.1.orig/kshowmail/kcmconfigs/accountsetupdialog.cpp	2009-02-24 23:22:48.000000000 +0300
+++ kshowmail-3.3.1/kshowmail/kcmconfigs/accountsetupdialog.cpp	2011-06-17 08:31:51.297221483 +0400
@@ -256,7 +256,7 @@
   //will return an empty string. If the user has typed in a new password, KPasswordEdit::password()
   //will return the correct password
   QString pass;
-  if( txtPassword->password() == "" || txtPassword->password() == QString::null )
+  if( strcmp(txtPassword->password(), "") == 0 || txtPassword->password() == QString::null )
     pass = txtPassword->text();
   else
     pass = txtPassword->password();
diff -Nru kshowmail-3.3.1.orig/kshowmail/kcmconfigs/configlog.cpp kshowmail-3.3.1/kshowmail/kcmconfigs/configlog.cpp
--- kshowmail-3.3.1.orig/kshowmail/kcmconfigs/configlog.cpp	2008-02-01 00:02:35.000000000 +0300
+++ kshowmail-3.3.1/kshowmail/kcmconfigs/configlog.cpp	2011-06-17 08:35:01.484504573 +0400
@@ -121,7 +121,7 @@
   else if( config->readEntry( CONFIG_ENTRY_LOG_REMOVE_DELETED_MAILS, DEFAULT_LOG_REMOVE_DELETED_MAILS ) == CONFIG_VALUE_LOG_REMOVE_MAILS_AFTER_DAYS )
     grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );
   else
-    if( DEFAULT_LOG_REMOVE_DELETED_MAILS == CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT )
+    if( strcmp(DEFAULT_LOG_REMOVE_DELETED_MAILS, CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT) == 0 )
       grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AT_EXIT );
     else
       grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );
@@ -131,7 +131,7 @@
   else if( config->readEntry( CONFIG_ENTRY_LOG_REMOVE_MOVED_MAILS, DEFAULT_LOG_REMOVE_MOVED_MAILS ) == CONFIG_VALUE_LOG_REMOVE_MAILS_AFTER_DAYS )
     grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );
   else
-    if( DEFAULT_LOG_REMOVE_MOVED_MAILS == CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT )
+    if( strcmp(DEFAULT_LOG_REMOVE_MOVED_MAILS, CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT) == 0 )
       grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AT_EXIT );
   else
     grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );
@@ -155,16 +155,16 @@
   else
     chkLogMovedMails->setChecked( false );
 
-  if( DEFAULT_LOG_REMOVE_DELETED_MAILS == CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT )
+  if( strcmp(DEFAULT_LOG_REMOVE_DELETED_MAILS, CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT) == 0 )
     grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AT_EXIT );
-  else if( DEFAULT_LOG_REMOVE_DELETED_MAILS == CONFIG_VALUE_LOG_REMOVE_MAILS_AFTER_DAYS )
+  else if( strcmp(DEFAULT_LOG_REMOVE_DELETED_MAILS, CONFIG_VALUE_LOG_REMOVE_MAILS_AFTER_DAYS) == 0 )
     grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );
   else
     grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );
 
-  if( DEFAULT_LOG_REMOVE_MOVED_MAILS == CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT )
+  if( strcmp(DEFAULT_LOG_REMOVE_MOVED_MAILS, CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT) == 0 )
     grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AT_EXIT );
-  else if( DEFAULT_LOG_REMOVE_MOVED_MAILS == CONFIG_VALUE_LOG_REMOVE_MAILS_AFTER_DAYS )
+  else if( strcmp(DEFAULT_LOG_REMOVE_MOVED_MAILS, CONFIG_VALUE_LOG_REMOVE_MAILS_AFTER_DAYS) == 0)
     grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );
   else
     grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );
diff -Nru kshowmail-3.3.1.orig/kshowmail/serverdialog.cpp kshowmail-3.3.1/kshowmail/serverdialog.cpp
--- kshowmail-3.3.1.orig/kshowmail/serverdialog.cpp	2009-02-24 23:22:48.000000000 +0300
+++ kshowmail-3.3.1/kshowmail/serverdialog.cpp	2011-06-17 08:36:48.805524284 +0400
@@ -217,7 +217,7 @@
   //will return an empty string. If the user has typed in a new password, KPasswordEdit::password()
   //will return the correct password
   QString pass;
-  if( txtPassword->password() == "" || txtPassword->password() == QString::null )
+  if( strcmp(txtPassword->password(), "") == 0 || txtPassword->password() == QString::null )
     pass = txtPassword->text();
   else
     pass = txtPassword->password();

Places

File strcompare.patch of Package kshowmail

Places