← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/kdeplasma-addons/oneiric-updates

« back to all changes in this revision

Viewing changes to dataengines/comic/comicprovider.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Philip Muškovac, Philip Muškovac, Felix Geyer
  • Date: 2011-06-07 00:52:20 UTC
  • mfrom: (0.1.12 sid)
  • Revision ID: james.westby@ubuntu.com-20110607005220-vvxuceku1xegr73s
Tags: 4:4.6.3-1ubuntu1
[ Philip Muškovac ]
* Merge from debian. Remaining changes: 
  - Keep our patch
  - Add debian/xinput folder
  - Build plasma-widget-kdeobservatory, plasma-widget-kimpanel,
    plasma-widget-kimpanel-backend-ibus
  - plasma-wallpapers-addons depends on plasma-dataengines-workspace,
    kdewallpapers, kdebase-workspace-wallpapers
  - Add plasma-widget-kimpanel-backend-ibus.{install, postinst, prerm}
  - Don't install kimpanel in plasma-widget-addons
  - Build against libboost1.46-dev
  - plasma-dataengines-addons replaces kdeplasma-addons (<< 4:4.4.60) and
    plasma-widgets-addons (<< 4:4.4.60)
  - plasma-widgets-addons suggests plasma-widget-lancelot instead of
    recommends
  - plasma-widgets-addons Breaks/Replaces plasma-widget-system-status
  - Build-depend on shared-mime-info and libglib2.0-dev
* Update Vcs- links as the branch is now owned by kubuntu-packagers

[ Felix Geyer ]
* Add python to plasma-widget-kimpanel-backend-ibus dependencies.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dataengines/comic/comicprovider.cpp
74
74
        QString mRequestedId;
75
75
        QString mRequestedComicName;
76
76
        QString mComicAuthor;
 
77
        KUrl mImageUrl;
77
78
        bool mIsCurrent;
78
79
        bool mIsLeftToRight;
79
80
        bool mIsTopToBottom;
210
211
 
211
212
void ComicProvider::requestPage( const KUrl &url, int id, const MetaInfos &infos )
212
213
{
 
214
    if (id == Image) {
 
215
        d->mImageUrl = url;
 
216
    }
 
217
 
213
218
    KIO::StoredTransferJob *job = KIO::storedGet( url, KIO::Reload, KIO::HideProgressInfo );
214
219
    job->setProperty( "uid", id );
215
220
    connect( job, SIGNAL( result( KJob* ) ), this, SLOT( jobDone( KJob* ) ) );
225
230
 
226
231
void ComicProvider::requestRedirectedUrl( const KUrl &url, int id, const MetaInfos &infos )
227
232
{
228
 
 
229
233
    KIO::MimetypeJob *job = KIO::mimetype( url, KIO::HideProgressInfo );
230
234
    job->setProperty( "uid", id );
231
235
    d->mRedirections[job] = url;
288
292
    return KUrl();
289
293
}
290
294
 
 
295
KUrl ComicProvider::imageUrl() const
 
296
{
 
297
    return d->mImageUrl;
 
298
}
 
299
 
291
300
bool ComicProvider::isLeftToRight() const
292
301
{
293
302
    return true;