Hello community, here is the log from the commit of package okular for openSUSE:Factory checked in at 2012-03-13 09:37:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/okular (Old) and /work/SRC/openSUSE:Factory/.okular.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "okular", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/okular/okular.changes 2012-02-08 17:19:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.okular.new/okular.changes 2012-03-13 09:37:13.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:24:54 CET 2012 - [email protected] + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- okular-4.8.0.tar.bz2 New: ---- okular-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ okular.spec ++++++ --- /var/tmp/diff_new_pack.yyR2Nn/_old 2012-03-13 09:37:15.000000000 +0100 +++ /var/tmp/diff_new_pack.yyR2Nn/_new 2012-03-13 09:37:15.000000000 +0100 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: okular -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Document Viewer License: GPL-2.0+ @@ -57,8 +58,8 @@ %package devel Summary: Document Viewer - Development Files Group: Development/Libraries/KDE -Requires: libkde4-devel Requires: %{name} = %{version} +Requires: libkde4-devel Provides: kde4-%{name}-devel = 4.3.0 Obsoletes: kde4-%{name}-devel < 4.3.0 %kde4_runtime_requires ++++++ okular-4.8.0.tar.bz2 -> okular-4.8.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/VERSION new/okular-4.8.1/VERSION --- old/okular-4.8.0/VERSION 2012-01-18 19:49:57.000000000 +0100 +++ new/okular-4.8.1/VERSION 2012-02-29 23:57:33.000000000 +0100 @@ -1 +1 @@ -okular v0.14.0 +okular v0.14.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/core/textpage.cpp new/okular-4.8.1/core/textpage.cpp --- old/okular-4.8.0/core/textpage.cpp 2011-12-20 20:14:45.000000000 +0100 +++ new/okular-4.8.1/core/textpage.cpp 2012-02-29 23:57:31.000000000 +0100 @@ -1098,10 +1098,10 @@ */ static void removeSpace(TextList *words) { - TextList::Iterator it = words->begin(), itEnd = words->end(); + TextList::Iterator it = words->begin(); const QString str(' '); - while ( it != itEnd ) + while ( it != words->end() ) { if((*it)->text() == str) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/core/version.h new/okular-4.8.1/core/version.h --- old/okular-4.8.0/core/version.h 2012-01-18 19:49:57.000000000 +0100 +++ new/okular-4.8.1/core/version.h 2012-02-29 23:57:33.000000000 +0100 @@ -10,10 +10,10 @@ #ifndef _OKULAR_VERSION_H_ #define _OKULAR_VERSION_H_ -#define OKULAR_VERSION_STRING "0.14.0" +#define OKULAR_VERSION_STRING "0.14.1" #define OKULAR_VERSION_MAJOR 0 #define OKULAR_VERSION_MINOR 14 -#define OKULAR_VERSION_RELEASE 0 +#define OKULAR_VERSION_RELEASE 1 #define OKULAR_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) #define OKULAR_VERSION \ Files old/okular-4.8.0/doc/index.cache.bz2 and new/okular-4.8.1/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/generators/chm/okularApplication_chm.desktop new/okular-4.8.1/generators/chm/okularApplication_chm.desktop --- old/okular-4.8.0/generators/chm/okularApplication_chm.desktop 2012-01-18 19:49:57.000000000 +0100 +++ new/okular-4.8.1/generators/chm/okularApplication_chm.desktop 2012-02-29 23:57:31.000000000 +0100 @@ -127,6 +127,7 @@ Categories=Qt;KDE;Graphics;Viewer; NoDisplay=true X-KDE-Keywords=chm +X-KDE-Keywords[ar]=chm X-KDE-Keywords[ca]=chm X-KDE-Keywords[ca@valencia]=chm X-KDE-Keywords[cs]=chm @@ -141,6 +142,7 @@ X-KDE-Keywords[hu]=chm X-KDE-Keywords[it]=chm X-KDE-Keywords[kk]=chm +X-KDE-Keywords[ko]=chm X-KDE-Keywords[nb]=chm X-KDE-Keywords[nds]=CHM X-KDE-Keywords[nl]=chm @@ -148,6 +150,7 @@ X-KDE-Keywords[pl]=chm X-KDE-Keywords[pt]=chm X-KDE-Keywords[pt_BR]=chm +X-KDE-Keywords[ru]=chm X-KDE-Keywords[sk]=chm X-KDE-Keywords[sr]=chm,ЦХМ X-KDE-Keywords[sr@ijekavian]=chm,ЦХМ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/generators/comicbook/okularApplication_comicbook.desktop new/okular-4.8.1/generators/comicbook/okularApplication_comicbook.desktop --- old/okular-4.8.0/generators/comicbook/okularApplication_comicbook.desktop 2012-01-18 19:49:57.000000000 +0100 +++ new/okular-4.8.1/generators/comicbook/okularApplication_comicbook.desktop 2012-02-29 23:57:31.000000000 +0100 @@ -127,6 +127,7 @@ Categories=Qt;KDE;Graphics;Viewer; NoDisplay=true X-KDE-Keywords=cbr, cbz, cbt, Comic Book +X-KDE-Keywords[ar]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[ca]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[ca@valencia]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[cs]=cbr, cbz, cbt, Comic Book @@ -141,6 +142,7 @@ X-KDE-Keywords[hu]=cbr, cbz, cbt, Képregény X-KDE-Keywords[it]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[kk]=cbr, cbz, cbt, Comic Book +X-KDE-Keywords[ko]=cbr, cbz, cbt, Comic Book,만화책 X-KDE-Keywords[nb]=cbr, cbz, cbt, tegneserie X-KDE-Keywords[nds]=cbr, cbz, cbt, Comicbook X-KDE-Keywords[nl]=cbr, cbz, cbt, Stripverhaal @@ -148,6 +150,7 @@ X-KDE-Keywords[pl]=cbr, cbz, cbt, Komiks X-KDE-Keywords[pt]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[pt_BR]=cbr, cbz, cbt, Comic Book +X-KDE-Keywords[ru]=cbr, cbz, cbt, Comic Book, комикс X-KDE-Keywords[sk]=cbr, cbz, cbt, Comic Book, Kniha komiksov X-KDE-Keywords[sr]=cbr, cbz, cbt, Comic Book,комикбук X-KDE-Keywords[sr@ijekavian]=cbr, cbz, cbt, Comic Book,комикбук diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/generators/djvu/okularApplication_djvu.desktop new/okular-4.8.1/generators/djvu/okularApplication_djvu.desktop --- old/okular-4.8.0/generators/djvu/okularApplication_djvu.desktop 2012-01-18 19:49:57.000000000 +0100 +++ new/okular-4.8.1/generators/djvu/okularApplication_djvu.desktop 2012-02-29 23:57:31.000000000 +0100 @@ -127,6 +127,7 @@ Categories=Qt;KDE;Graphics;Viewer; NoDisplay=true X-KDE-Keywords=djvu +X-KDE-Keywords[ar]=djvu X-KDE-Keywords[ca]=djvu X-KDE-Keywords[ca@valencia]=djvu X-KDE-Keywords[cs]=djvu @@ -141,6 +142,7 @@ X-KDE-Keywords[hu]=djvu X-KDE-Keywords[it]=djvu X-KDE-Keywords[kk]=djvu +X-KDE-Keywords[ko]=djvu X-KDE-Keywords[nb]=djvu X-KDE-Keywords[nds]=DjVu X-KDE-Keywords[nl]=djvu @@ -148,6 +150,7 @@ X-KDE-Keywords[pl]=djvu X-KDE-Keywords[pt]=djvu X-KDE-Keywords[pt_BR]=djvu +X-KDE-Keywords[ru]=djvu X-KDE-Keywords[sk]=djvu X-KDE-Keywords[sr]=djvu,ДјВу X-KDE-Keywords[sr@ijekavian]=djvu,ДјВу diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/generators/dvi/okularApplication_dvi.desktop new/okular-4.8.1/generators/dvi/okularApplication_dvi.desktop --- old/okular-4.8.0/generators/dvi/okularApplication_dvi.desktop 2012-01-18 19:49:57.000000000 +0100 +++ new/okular-4.8.1/generators/dvi/okularApplication_dvi.desktop 2012-02-29 23:57:31.000000000 +0100 @@ -127,6 +127,7 @@ Categories=Qt;KDE;Graphics;Viewer; NoDisplay=true X-KDE-Keywords=dvi +X-KDE-Keywords[ar]=dvi X-KDE-Keywords[ca]=dvi X-KDE-Keywords[ca@valencia]=dvi X-KDE-Keywords[cs]=dvi @@ -141,6 +142,7 @@ X-KDE-Keywords[hu]=dvi X-KDE-Keywords[it]=dvi X-KDE-Keywords[kk]=dvi +X-KDE-Keywords[ko]=dvi X-KDE-Keywords[nb]=dvi X-KDE-Keywords[nds]=DVI X-KDE-Keywords[nl]=dvi @@ -148,6 +150,7 @@ X-KDE-Keywords[pl]=dvi X-KDE-Keywords[pt]=dvi X-KDE-Keywords[pt_BR]=dvi +X-KDE-Keywords[ru]=dvi X-KDE-Keywords[sk]=dvi X-KDE-Keywords[sr]=dvi,ДВИ X-KDE-Keywords[sr@ijekavian]=dvi,ДВИ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/generators/epub/okularApplication_epub.desktop new/okular-4.8.1/generators/epub/okularApplication_epub.desktop --- old/okular-4.8.0/generators/epub/okularApplication_epub.desktop 2012-01-18 19:49:57.000000000 +0100 +++ new/okular-4.8.1/generators/epub/okularApplication_epub.desktop 2012-02-29 23:57:31.000000000 +0100 @@ -127,6 +127,7 @@ Categories=Qt;KDE;Graphics;Viewer; NoDisplay=true X-KDE-Keywords=epub, e-book +X-KDE-Keywords[ar]=epub, e-book X-KDE-Keywords[ca]=epub, e-book X-KDE-Keywords[ca@valencia]=epub, e-book X-KDE-Keywords[cs]=epub, e-book @@ -141,6 +142,7 @@ X-KDE-Keywords[hu]=epub, e-book X-KDE-Keywords[it]=epub, e-book X-KDE-Keywords[kk]=epub, e-book +X-KDE-Keywords[ko]=epub, e-book,전자책,이북 X-KDE-Keywords[nb]=epub, e-bok X-KDE-Keywords[nds]=epub, e-book X-KDE-Keywords[nl]=epub, e-book @@ -148,6 +150,7 @@ X-KDE-Keywords[pl]=epub, e-book X-KDE-Keywords[pt]=epub, e-book X-KDE-Keywords[pt_BR]=epub, e-book +X-KDE-Keywords[ru]=epub, e-book, электронная книга X-KDE-Keywords[sk]=epub, e-book X-KDE-Keywords[sr]=epub, e-book,ЕПУБ,е‑књига X-KDE-Keywords[sr@ijekavian]=epub, e-book,ЕПУБ,е‑књига diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/generators/fictionbook/okularApplication_fb.desktop new/okular-4.8.1/generators/fictionbook/okularApplication_fb.desktop --- old/okular-4.8.0/generators/fictionbook/okularApplication_fb.desktop 2012-01-18 19:49:57.000000000 +0100 +++ new/okular-4.8.1/generators/fictionbook/okularApplication_fb.desktop 2012-02-29 23:57:31.000000000 +0100 @@ -127,6 +127,7 @@ Categories=Qt;KDE;Graphics;Viewer; NoDisplay=true X-KDE-Keywords=FictionBook, e-book, fb2 +X-KDE-Keywords[ar]=FictionBook, e-book, fb2 X-KDE-Keywords[ca]=FictionBook, e-book, fb2 X-KDE-Keywords[ca@valencia]=FictionBook, e-book, fb2 X-KDE-Keywords[da]=FictionBook,e-book,fb2 @@ -140,6 +141,7 @@ X-KDE-Keywords[hu]=FictionBook, e-book, fb2 X-KDE-Keywords[it]=FictionBook, e-book, fb2 X-KDE-Keywords[kk]=FictionBook, e-book, fb2 +X-KDE-Keywords[ko]=FictionBook, e-book, fb2 X-KDE-Keywords[nb]=FictionBook, e-bok, fb2 X-KDE-Keywords[nds]=FictionBook, e-book, fb2 X-KDE-Keywords[nl]=Fictieboek, e-book, fb2 @@ -147,6 +149,7 @@ X-KDE-Keywords[pl]=FictionBook, e-book, fb2 X-KDE-Keywords[pt]=FictionBook, e-book, fb2 X-KDE-Keywords[pt_BR]=FictionBook, e-book, fb2 +X-KDE-Keywords[ru]=FictionBook, e-book, fb2, электронная книга X-KDE-Keywords[sk]=FictionBook, e-book, fb2 X-KDE-Keywords[sr]=FictionBook, e-book, fb2,фикшнбук,е‑књига X-KDE-Keywords[sr@ijekavian]=FictionBook, e-book, fb2,фикшнбук,е‑књига diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/generators/plucker/okularApplication_plucker.desktop new/okular-4.8.1/generators/plucker/okularApplication_plucker.desktop --- old/okular-4.8.0/generators/plucker/okularApplication_plucker.desktop 2012-01-18 19:49:57.000000000 +0100 +++ new/okular-4.8.1/generators/plucker/okularApplication_plucker.desktop 2012-02-29 23:57:31.000000000 +0100 @@ -127,6 +127,7 @@ Categories=Qt;KDE;Graphics;Viewer; NoDisplay=true X-KDE-Keywords=plucker +X-KDE-Keywords[ar]=plucker X-KDE-Keywords[ca]=plucker X-KDE-Keywords[ca@valencia]=plucker X-KDE-Keywords[da]=plucker @@ -140,6 +141,7 @@ X-KDE-Keywords[hu]=plucker X-KDE-Keywords[it]=plucker X-KDE-Keywords[kk]=plucker +X-KDE-Keywords[ko]=plucker X-KDE-Keywords[nb]=plucker X-KDE-Keywords[nds]=Plucker X-KDE-Keywords[nl]=plucker @@ -147,6 +149,7 @@ X-KDE-Keywords[pl]=plucker X-KDE-Keywords[pt]=plucker X-KDE-Keywords[pt_BR]=plucker +X-KDE-Keywords[ru]=plucker X-KDE-Keywords[sk]=plucker X-KDE-Keywords[sr]=plucker,Плакер X-KDE-Keywords[sr@ijekavian]=plucker,Плакер diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/generators/poppler/okularApplication_pdf.desktop new/okular-4.8.1/generators/poppler/okularApplication_pdf.desktop --- old/okular-4.8.0/generators/poppler/okularApplication_pdf.desktop 2012-01-18 19:49:57.000000000 +0100 +++ new/okular-4.8.1/generators/poppler/okularApplication_pdf.desktop 2012-02-29 23:57:31.000000000 +0100 @@ -126,6 +126,7 @@ InitialPreference=8 Categories=Qt;KDE;Graphics;Viewer; X-KDE-Keywords=PDF, Portable Document Format +X-KDE-Keywords[ar]=PDF, Portable Document Format X-KDE-Keywords[ca]=PDF, Portable Document Format, Format de document portable X-KDE-Keywords[ca@valencia]=PDF, Portable Document Format, Format de document portable X-KDE-Keywords[cs]=PDF, Portable Document Format @@ -140,6 +141,7 @@ X-KDE-Keywords[hu]=PDF, Portable Document Format X-KDE-Keywords[it]=PDF, Portable Document Format, formato per documenti portabile X-KDE-Keywords[kk]=PDF, Portable Document Format +X-KDE-Keywords[ko]=PDF, Portable Document Format X-KDE-Keywords[nb]=PDF, Portabelt Dokument Format X-KDE-Keywords[nds]=PDF, Porteerbor Dokmentformaat X-KDE-Keywords[nl]=PDF, Portable Document Format @@ -147,6 +149,7 @@ X-KDE-Keywords[pl]=PDF, Przenośny Format Dokumentu X-KDE-Keywords[pt]=PDF, Formato de Documento Portável X-KDE-Keywords[pt_BR]=PDF, Formato de documento portável +X-KDE-Keywords[ru]=PDF, Portable Document Format X-KDE-Keywords[sk]=PDF, Portable Document Format X-KDE-Keywords[sr]=PDF, Portable Document Format,ПДФ X-KDE-Keywords[sr@ijekavian]=PDF, Portable Document Format,ПДФ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/generators/xps/okularApplication_xps.desktop new/okular-4.8.1/generators/xps/okularApplication_xps.desktop --- old/okular-4.8.0/generators/xps/okularApplication_xps.desktop 2012-01-18 19:49:57.000000000 +0100 +++ new/okular-4.8.1/generators/xps/okularApplication_xps.desktop 2012-02-29 23:57:31.000000000 +0100 @@ -126,6 +126,7 @@ InitialPreference=7 Categories=Qt;KDE;Graphics;Viewer; X-KDE-Keywords=XPS +X-KDE-Keywords[ar]=XPS X-KDE-Keywords[ca]=XPS X-KDE-Keywords[ca@valencia]=XPS X-KDE-Keywords[cs]=XPS @@ -140,6 +141,7 @@ X-KDE-Keywords[hu]=XPS X-KDE-Keywords[it]=XPS X-KDE-Keywords[kk]=XPS +X-KDE-Keywords[ko]=XPS X-KDE-Keywords[nb]=XPS X-KDE-Keywords[nds]=XPS X-KDE-Keywords[nl]=XPS @@ -147,6 +149,7 @@ X-KDE-Keywords[pl]=XPS X-KDE-Keywords[pt]=XPS X-KDE-Keywords[pt_BR]=XPS +X-KDE-Keywords[ru]=XPS X-KDE-Keywords[sk]=XPS X-KDE-Keywords[sr]=XPS,ИксПС X-KDE-Keywords[sr@ijekavian]=XPS,ИксПС diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/ui/findbar.cpp new/okular-4.8.1/ui/findbar.cpp --- old/okular-4.8.0/ui/findbar.cpp 2011-08-07 17:42:18.000000000 +0200 +++ new/okular-4.8.1/ui/findbar.cpp 2012-02-29 23:57:31.000000000 +0100 @@ -49,7 +49,7 @@ m_search->lineEdit()->setSearchMoveViewport( true ); m_search->lineEdit()->setToolTip( i18n( "Text to search for" ) ); m_search->installEventFilter( this ); - label->setBuddy( m_search ); + label->setBuddy( m_search->lineEdit() ); lay->addWidget( m_search ); QPushButton * findNextBtn = new QPushButton( KIcon( "go-down-search" ), i18nc( "Find and go to the next search match", "Next" ), this ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/ui/presentationwidget.cpp new/okular-4.8.1/ui/presentationwidget.cpp --- old/okular-4.8.0/ui/presentationwidget.cpp 2012-01-18 19:49:57.000000000 +0100 +++ new/okular-4.8.1/ui/presentationwidget.cpp 2012-02-29 23:57:31.000000000 +0100 @@ -129,7 +129,7 @@ PresentationWidget::PresentationWidget( QWidget * parent, Okular::Document * doc, KActionCollection * collection ) : QWidget( 0 /* must be null, to have an independent widget */, Qt::FramelessWindowHint ), - m_pressedLink( 0 ), m_handCursor( false ), m_drawingEngine( 0 ), m_screenSaverCookie( -1 ), + m_pressedLink( 0 ), m_handCursor( false ), m_drawingEngine( 0 ), m_parentWidget( parent ), m_document( doc ), m_frameIndex( -1 ), m_topBar( 0 ), m_pagesEdit( 0 ), m_searchBar( 0 ), m_screenSelect( 0 ), m_isSetup( false ), m_blockNotifications( false ), m_inBlackScreenMode( false ) @@ -232,8 +232,8 @@ setupActions( collection ); - // inhibit the screen saver - inhibitScreenSaver(); + // inhibit power management + inhibitPowerManagement(); show(); @@ -245,8 +245,8 @@ PresentationWidget::~PresentationWidget() { - // allow the screen saver again - allowScreenSaver(); + // allow power management saver again + allowPowerManagement(); // stop the audio playbacks Okular::AudioPlayer::instance()->stopPlaybacks(); @@ -1391,33 +1391,18 @@ generatePage( true /* no transitions */ ); } -void PresentationWidget::inhibitScreenSaver() +void PresentationWidget::inhibitPowerManagement() { QString reason = i18nc( "Reason for inhibiting the screensaver activation, when the presentation mode is active", "Giving a presentation" ); - QDBusMessage message = QDBusMessage::createMethodCall( "org.freedesktop.ScreenSaver", "/ScreenSaver", - "org.freedesktop.ScreenSaver", "Inhibit" ); - message << QString( "Okular" ); - message << reason; - - QDBusReply<uint> reply = QDBusConnection::sessionBus().call( message ); - if ( reply.isValid() ) - m_screenSaverCookie = reply.value(); // Inhibit screen and sleep + // Note: beginSuppressingScreenPowerManagement inhibits DPMS, automatic brightness change and screensaver m_screenInhibitCookie = Solid::PowerManagement::beginSuppressingScreenPowerManagement(reason); m_sleepInhibitCookie = Solid::PowerManagement::beginSuppressingSleep(reason); } -void PresentationWidget::allowScreenSaver() +void PresentationWidget::allowPowerManagement() { - if ( m_screenSaverCookie != -1 ) - { - QDBusMessage message = QDBusMessage::createMethodCall( "org.freedesktop.ScreenSaver", "/ScreenSaver", - "org.freedesktop.ScreenSaver", "UnInhibit" ); - message << (uint)m_screenSaverCookie; - QDBusConnection::sessionBus().send( message ); - } - // Remove cookies Solid::PowerManagement::stopSuppressingScreenPowerManagement(m_screenInhibitCookie); Solid::PowerManagement::stopSuppressingSleep(m_sleepInhibitCookie); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okular-4.8.0/ui/presentationwidget.h new/okular-4.8.1/ui/presentationwidget.h --- old/okular-4.8.0/ui/presentationwidget.h 2012-01-18 19:49:57.000000000 +0100 +++ new/okular-4.8.1/ui/presentationwidget.h 2012-02-29 23:57:31.000000000 +0100 @@ -86,8 +86,8 @@ void requestPixmaps(); void setScreen( int ); void applyNewScreenSize( const QSize & oldSize ); - void inhibitScreenSaver(); - void allowScreenSaver(); + void inhibitPowerManagement(); + void allowPowerManagement(); void showTopBar( bool ); // create actions that interact with this widget void setupActions( KActionCollection * collection ); @@ -104,7 +104,6 @@ AnnotatorEngine * m_drawingEngine; QRect m_drawingRect; int m_screen; - int m_screenSaverCookie; int m_screenInhibitCookie; int m_sleepInhibitCookie; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
