Attachment #1506 for bug #1649

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1649
Collapse All | Expand All

Lines 256-262 Link Here

(-)kshowmail/kshowmail/kcmconfigs/accountsetupdialog.cpp (-1 / +1 lines)
256	//will return an empty string. If the user has typed in a new password, KPasswordEdit::password()	256	//will return an empty string. If the user has typed in a new password, KPasswordEdit::password()
257	//will return the correct password	257	//will return the correct password
258	TQString pass;	258	TQString pass;
259	if( txtPassword->password() == "" \|\| txtPassword->password() == TQString::null )	259	if( strcmp(txtPassword->password(), "") \|\| strcmp(txtPassword->password(), TQString::null) )
260	pass = txtPassword->text();	260	pass = txtPassword->text();
261	else	261	else
262	pass = txtPassword->password();	262	pass = txtPassword->password();




  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( strcmp(DEFAULT_LOG_REMOVE_DELETED_MAILS, CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT) )
      grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AT_EXIT );
    else
      grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );

  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( strcmp(DEFAULT_LOG_REMOVE_MOVED_MAILS, CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT) )
      grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AT_EXIT );
  else
    grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );

  else
    chkLogMovedMails->setChecked( false );

  if( strcmp(DEFAULT_LOG_REMOVE_DELETED_MAILS, CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT) )
    grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AT_EXIT );
  else if( strcmp(DEFAULT_LOG_REMOVE_DELETED_MAILS, CONFIG_VALUE_LOG_REMOVE_MAILS_AFTER_DAYS) )
    grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );
  else
    grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );

  if( strcmp(DEFAULT_LOG_REMOVE_MOVED_MAILS, CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT) )
    grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AT_EXIT );
  else if( strcmp(DEFAULT_LOG_REMOVE_MOVED_MAILS, CONFIG_VALUE_LOG_REMOVE_MAILS_AFTER_DAYS) )
    grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );
  else
    grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );

Lines 217-223 Link Here

(-)kshowmail/kshowmail/serverdialog.cpp (-1 / +1 lines)
217	//will return an empty string. If the user has typed in a new password, KPasswordEdit::password()	217	//will return an empty string. If the user has typed in a new password, KPasswordEdit::password()
218	//will return the correct password	218	//will return the correct password
219	TQString pass;	219	TQString pass;
220	if( txtPassword->password() == "" \|\| txtPassword->password() == TQString::null )	220	if( strcmp(txtPassword->password(), "") \|\| strcmp(txtPassword->password(), TQString::null) )
221	pass = txtPassword->text();	221	pass = txtPassword->text();
222	else	222	else
223	pass = txtPassword->password();	223	pass = txtPassword->password();

Return to bug 1649

Lines 121-127 Link Here

(-)kshowmail/kshowmail/kcmconfigs/configlog.cpp (-6 / +6 lines)
121	else if( config->readEntry( CONFIG_ENTRY_LOG_REMOVE_DELETED_MAILS, DEFAULT_LOG_REMOVE_DELETED_MAILS ) == CONFIG_VALUE_LOG_REMOVE_MAILS_AFTER_DAYS )	121	else if( config->readEntry( CONFIG_ENTRY_LOG_REMOVE_DELETED_MAILS, DEFAULT_LOG_REMOVE_DELETED_MAILS ) == CONFIG_VALUE_LOG_REMOVE_MAILS_AFTER_DAYS )
122	grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );	122	grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );
123	else	123	else
124	if( DEFAULT_LOG_REMOVE_DELETED_MAILS == CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT )	124	if( strcmp(DEFAULT_LOG_REMOVE_DELETED_MAILS, CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT) )
125	grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AT_EXIT );	125	grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AT_EXIT );
126	else	126	else
127	grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );	127	grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );
Lines 131-137 Link Here
131	else if( config->readEntry( CONFIG_ENTRY_LOG_REMOVE_MOVED_MAILS, DEFAULT_LOG_REMOVE_MOVED_MAILS ) == CONFIG_VALUE_LOG_REMOVE_MAILS_AFTER_DAYS )	131	else if( config->readEntry( CONFIG_ENTRY_LOG_REMOVE_MOVED_MAILS, DEFAULT_LOG_REMOVE_MOVED_MAILS ) == CONFIG_VALUE_LOG_REMOVE_MAILS_AFTER_DAYS )
132	grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );	132	grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );
133	else	133	else
134	if( DEFAULT_LOG_REMOVE_MOVED_MAILS == CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT )	134	if( strcmp(DEFAULT_LOG_REMOVE_MOVED_MAILS, CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT) )
135	grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AT_EXIT );	135	grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AT_EXIT );
136	else	136	else
137	grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );	137	grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );
Lines 155-170 Link Here
155	else	155	else
156	chkLogMovedMails->setChecked( false );	156	chkLogMovedMails->setChecked( false );
157		157
158	if( DEFAULT_LOG_REMOVE_DELETED_MAILS == CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT )	158	if( strcmp(DEFAULT_LOG_REMOVE_DELETED_MAILS, CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT) )
159	grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AT_EXIT );	159	grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AT_EXIT );
160	else if( DEFAULT_LOG_REMOVE_DELETED_MAILS == CONFIG_VALUE_LOG_REMOVE_MAILS_AFTER_DAYS )	160	else if( strcmp(DEFAULT_LOG_REMOVE_DELETED_MAILS, CONFIG_VALUE_LOG_REMOVE_MAILS_AFTER_DAYS) )
161	grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );	161	grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );
162	else	162	else
163	grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );	163	grpDelMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );
164		164
165	if( DEFAULT_LOG_REMOVE_MOVED_MAILS == CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT )	165	if( strcmp(DEFAULT_LOG_REMOVE_MOVED_MAILS, CONFIG_VALUE_LOG_REMOVE_MAILS_AT_EXIT) )
166	grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AT_EXIT );	166	grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AT_EXIT );
167	else if( DEFAULT_LOG_REMOVE_MOVED_MAILS == CONFIG_VALUE_LOG_REMOVE_MAILS_AFTER_DAYS )	167	else if( strcmp(DEFAULT_LOG_REMOVE_MOVED_MAILS, CONFIG_VALUE_LOG_REMOVE_MAILS_AFTER_DAYS) )
168	grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );	168	grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );
169	else	169	else
170	grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );	170	grpMovMailsRemove->setButton( ID_BUTTON_REMOVE_AFTER_DAYS );