Changeset 65 for trunk/tests/DumbDocument.cxx

Timestamp:

04/14/06 16:24:42 (3 years ago)

Author:

jordi

Message:

The Main presenter now can reload encrypted files without bothering the user about password, unless the document's password has been changed. In this case, it will behaviour like opening the file as new.

Files:

• trunk/tests/DumbDocument.cxx (modified) (5 diffs)

trunk/tests/DumbDocument.cxx

@@ -30 +30 @@
     m_Loaded = FALSE;
     m_OpenError = DocumentErrorNone;
-    m_Password = NULL;
+    m_TestPassword = NULL; 
     setNumPages (2);
 }
@@ -36 +36 @@
 DumbDocument::~DumbDocument ()
 {
-    g_free (m_Password);
+    g_free (m_TestPassword);
 }
 
@@ -51 +51 @@
     if ( DocumentErrorNone == m_OpenError )
     {
+        m_Loaded = TRUE;
         setFileName (filename);
-        m_Loaded = TRUE;
+        setPassword (password);
     }
     else if ( DocumentErrorEncrypted == m_OpenError &&
-              password != NULL && 
-              0 == g_ascii_strcasecmp (password, m_Password))
+              NULL != password && NULL != m_TestPassword &&
+              0 == g_ascii_strcasecmp (password, m_TestPassword))
     {
+        m_Loaded = TRUE;
         setFileName (filename);
-        m_Loaded = TRUE;
+        setPassword (password);
     }
     else
@@ -65 +67 @@
         g_set_error (error, EPDFVIEW_DOCUMENT_ERROR, m_OpenError, 
                      "%s", IDocument::getErrorMessage (m_OpenError));
+        m_Loaded = FALSE;
     }
     setRotation (0);
@@ -102 +105 @@
 
 void
-DumbDocument::setPassword (const gchar *password)
+DumbDocument::setTestPassword (const gchar *password)
 {
-    g_free (m_Password);
-    m_Password = g_strdup (password);
+    gchar *oldPassword = m_TestPassword;
+    m_TestPassword = g_strdup (password);
+    g_free (oldPassword);
 }