← Back to branch summary

~ubuntu-branches/ubuntu/wily/kopete/wily-proposed

« back to all changes in this revision

Viewing changes to protocols/wlm/wlmchatsession.cpp

  • Committer: Package Import Robot
  • Author(s): Scarlett Clark
  • Date: 2014-09-22 17:26:50 UTC
  • mfrom: (1.1.23)
  • Revision ID: package-import@ubuntu.com-20140922172650-vej92wxqlm6wg3q4
Tags: 4:4.14.1-0ubuntu1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
protocols/wlm/wlmchatsession.cpp
487
487
#endif // HAVE_GIFLIB
488
488
}
489
489
 
 
490
static int
 
491
closeGif(GifFileType* file)
 
492
{
 
493
#if ((GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1) || GIFLIB_MAJOR > 5)
 
494
        return EGifCloseFile(file, NULL);
 
495
#else
 
496
        return EGifCloseFile(file);
 
497
#endif
 
498
}
 
499
 
490
500
/* stolen from kpaint write_to_gif() */
491
501
void
492
502
WlmChatSession::convertToGif( const QPixmap & ink, QString filename)
557
567
                screenColourmap);
558
568
 
559
569
    if (status != GIF_OK) {
560
 
        EGifCloseFile(GifFile);
 
570
        closeGif(GifFile);
561
571
        return;
562
572
    }
563
573
 
580
590
 
581
591
    if (status != GIF_OK) {
582
592
        printGifErrorMessage();
583
 
        EGifCloseFile(GifFile);
 
593
        closeGif(GifFile);
584
594
        return;
585
595
    }
586
596
 
587
 
    if (EGifCloseFile(GifFile) != GIF_OK) {
 
597
    if (closeGif(GifFile) != GIF_OK) {
588
598
        printGifErrorMessage();
589
599
        return;
590
600
    }