← Back to branch summary

~ubuntu-branches/debian/sid/kde-baseapps/sid

« back to all changes in this revision

Viewing changes to konqueror/settings/kio/kcookiesmanagement.cpp

  • Committer: Package Import Robot
  • Author(s): Modestas Vainius, Eshat Cakar, Pino Toscano
  • Date: 2012-06-09 22:18:08 UTC
  • mfrom: (4.2.1) (6.1.1 experimental)
  • Revision ID: package-import@ubuntu.com-20120609221808-h1l0ekd5qmb8nefr
Tags: 4:4.8.4-1
* New upstream release.

[ Eshat Cakar ]
* Add watch file.
* Bump kde-sc-dev-latest build dependency to version 4:4.8.4.
* Update installed files.

[ Pino Toscano ]
* Move files of the konqueror documentation from kde-baseapps-data to
  konqueror itself.

Show diffs side-by-side

added added

removed removed

Lines of Context:
konqueror/settings/kio/kcookiesmanagement.cpp
119
119
  mUi.setupUi(this);
120
120
  mUi.searchLineEdit->setTreeWidget(mUi.cookiesTreeWidget);
121
121
  mUi.cookiesTreeWidget->setColumnWidth(0, 150);
122
 
  connect(mUi.cookiesTreeWidget, SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)), SLOT(on_changePolicyButton_clicked()));
 
122
  connect(mUi.cookiesTreeWidget, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), SLOT(on_changePolicyButton_clicked()));
123
123
}
124
124
 
125
125
KCookiesManagement::~KCookiesManagement()
249
249
      reset();
250
250
 
251
251
  CookieListViewItem *dom;
252
 
  QListIterator<QString> it (reply.value());
253
 
  while (it.hasNext())
 
252
  const QStringList domains (reply.value());
 
253
  Q_FOREACH(const QString& domain, domains)
254
254
  {
255
 
    const QString domain = it.next();
256
255
    const QString siteName = (domain.startsWith(QLatin1Char('.')) ? domain.mid(1) : domain);
257
256
    if (mUi.cookiesTreeWidget->findItems(siteName, Qt::MatchFixedString).isEmpty()) {
258
257
        dom = new CookieListViewItem(mUi.cookiesTreeWidget, domain);
278
277
  QList<int> fields;
279
278
  fields << 0 << 1 << 2 << 3;  
280
279
  // Always check for cookies in both "foo.bar" and ".foo.bar" domains...
281
 
  const QString domain = cookieDom->domain() % QLatin1String(" .") % cookieDom->domain();
 
280
  const QString domain = cookieDom->domain() + QLatin1String(" .") + cookieDom->domain();
282
281
  QDBusInterface kded("org.kde.kded", "/modules/kcookiejar", "org.kde.KCookieServer", QDBusConnection::sessionBus());  
283
282
  QDBusReply<QStringList> reply = kded.call("findCookies", QVariant::fromValue(fields),
284
283
                                            domain, QString(), QString(), QString());
362
361
      mUi.secureLineEdit->setText(cookie->secure);
363
362
    }
364
363
 
365
 
    mUi.changePolicyButton->setEnabled (true);
 
364
    mUi.changePolicyButton->setEnabled(true);
366
365
  }
367
366
  else
368
367
  {