← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/kde4libs/jaunty

« back to all changes in this revision

Viewing changes to kioslave/http/kcookiejar/kcookiewin.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Wenning, Jonathan Thomas, Andreas Wenning
  • Date: 2009-04-01 05:55:52 UTC
  • mfrom: (1.1.29 upstream)
  • Revision ID: james.westby@ubuntu.com-20090401055552-uel5di5f3xiftax3
Tags: 4:4.2.2-0ubuntu1
https://launchpad.net/bugs/344709
https://launchpad.net/bugs/348823
[ Jonathan Thomas ]
* New upstream release (LP: #344709, #348823):
  - Bump upstreamversion and runtimedeps in debian/rules
  - Remove kubuntu_65_kcmdlineargs_decoding_svn934640.diff, applied upstream

[ Andreas Wenning ]
* Remove patch kubuntu_69_do_not_show_plasma_popups_over_screensaver.diff,
  applied upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
kioslave/http/kcookiejar/kcookiewin.cpp
152
152
                              "<em>(see WebBrowsing/Cookies in the Control Center)</em>.") );
153
153
#endif
154
154
    m_btnGrp->setLayout(vbox);
155
 
    if (defaultButton == 0 )
 
155
    if (defaultButton == KCookieJar::ApplyToShownCookiesOnly )
156
156
        m_onlyCookies->setChecked(true);
157
 
    else if(defaultButton==1)
 
157
    else if (defaultButton == KCookieJar::ApplyToCookiesFromDomain)
158
158
        m_allCookiesDomain->setChecked(true);
159
 
    else if(defaultButton==2)
 
159
    else if (defaultButton == KCookieJar::ApplyToAllCookies)
160
160
        m_allCookies->setChecked(true);
161
161
    else
162
162
        m_onlyCookies->setChecked(true);
163
163
    setButtonText(KDialog::Yes, i18n("&Accept"));
164
164
    setButtonText(KDialog::No, i18n("&Reject"));
165
165
    //QShortcut( Qt::Key_Escape, btn, SLOT(animateClick()) );
166
 
#ifndef QT_NO_WHATSTHIS
167
166
    setButtonToolTip(Details, i18n("See or modify the cookie information") );
168
 
#endif
169
167
    setDefaultButton(Yes);
170
168
 
171
169
    setDetailsWidgetVisible(showDetails);
183
181
 
184
182
    KCookieAdvice advice = (result==KDialog::Yes) ? KCookieAccept : KCookieReject;
185
183
 
186
 
    int preferredPolicy=-1;
187
 
    if( m_onlyCookies->isChecked())
188
 
        preferredPolicy = 0;
189
 
    else if( m_allCookiesDomain->isChecked())
190
 
    {
191
 
        preferredPolicy = 1;
 
184
    KCookieJar::KCookieDefaultPolicy preferredPolicy = KCookieJar::ApplyToShownCookiesOnly;
 
185
    if (m_allCookiesDomain->isChecked()) {
 
186
        preferredPolicy = KCookieJar::ApplyToCookiesFromDomain;
192
187
        cookiejar->setDomainAdvice( cookie, advice );
193
 
    }
194
 
    else if( m_allCookies->isChecked())
195
 
    {
196
 
        preferredPolicy = 2;
 
188
    } else if (m_allCookies->isChecked()) {
 
189
        preferredPolicy = KCookieJar::ApplyToAllCookies;
197
190
        cookiejar->setGlobalAdvice( advice );
198
191
    }
199
192
    cookiejar->setPreferredDefaultPolicy( preferredPolicy );