From 23d666cf7f2851bf3533736a10c32e34d8ae60bf Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@kde.org>
Date: Mon, 29 Jan 2007 14:28:58 +0000
Subject: [PATCH] move the DRM skip checks to the Document

svn path=/trunk/playground/graphics/okular/; revision=628208
---
 core/document.cpp                    | 8 ++++++++
 generators/poppler/generator_pdf.cpp | 5 -----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/core/document.cpp b/core/document.cpp
index 9b68b2a54..9beb7ac32 100644
--- a/core/document.cpp
+++ b/core/document.cpp
@@ -19,6 +19,7 @@
 #include <QtCore/QTimer>
 #include <QtGui/QApplication>
 
+#include <kauthorized.h>
 #include <kconfigdialog.h>
 #include <kdebug.h>
 #include <klibloader.h>
@@ -45,6 +46,8 @@
 #include "settings.h"
 #include "sourcereference.h"
 
+#include <config-okular.h>
+
 using namespace Okular;
 
 struct AllocatedPixmap
@@ -1118,6 +1121,11 @@ KUrl Document::currentDocument() const
 
 bool Document::isAllowed( Permissions flags ) const
 {
+#if !OKULAR_FORCE_DRM
+    if ( KAuthorized::authorize( "skip_drm" ) && !Okular::Settings::obeyDRM() )
+        return true;
+#endif
+
     return d->m_generator ? d->m_generator->isAllowed( flags ) : false;
 }
 
diff --git a/generators/poppler/generator_pdf.cpp b/generators/poppler/generator_pdf.cpp
index 94f9f341d..449006868 100644
--- a/generators/poppler/generator_pdf.cpp
+++ b/generators/poppler/generator_pdf.cpp
@@ -13,7 +13,6 @@
 #include <qimage.h>
 #include <qregexp.h>
 #include <qtextstream.h>
-#include <kauthorized.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpassworddialog.h>
@@ -585,10 +584,6 @@ const QList<Okular::EmbeddedFile*> *PDFGenerator::embeddedFiles() const
 
 bool PDFGenerator::isAllowed( Okular::Permissions permissions ) const
 {
-#if !OKULAR_FORCE_DRM
-    if (KAuthorized::authorize("skip_drm") && !Okular::Settings::obeyDRM()) return true;
-#endif
-
     bool b = true;
     if (permissions & Okular::AllowModify) b = b && pdfdoc->okToChange();
     if (permissions & Okular::AllowCopy) b = b && pdfdoc->okToCopy();