Changeset 209

Timestamp:

06/10/06 08:32:52 (2 years ago)

Author:

jordi

Message:

The poppler.h header must be included without subdirectory in some computers. In others seems that this doesn't matter.

Location:

trunk/src

Files:

• MainPter.cxx (modified) (5 diffs)
• MainPter.h (modified) (1 diff)
• PDFDocument.cxx (modified) (1 diff)

trunk/src/MainPter.cxx

@@ -26 +26 @@
 G_LOCK_DEFINE_STATIC (fileLoaded);
 static volatile gboolean fileLoaded;
+G_LOCK_DEFINE_STATIC (fileSaved);
+static volatile gboolean fileSaved;
 #endif // DEBUG
 
@@ -56 +58 @@
     fileLoaded = FALSE;
     G_UNLOCK (fileLoaded);
+    G_LOCK (fileSaved);
+    fileSaved = FALSE;
+    G_UNLOCK (fileSaved);
 #endif
 }
@@ -848 +853 @@
     // Remove the status text.
     getView ().setStatusBarText (NULL);
+#if defined (DEBUG)
+    G_LOCK (fileSaved);
+    fileSaved = TRUE;
+    G_UNLOCK (fileSaved);
+#endif // DEBUG
 }
 
@@ -854 +864 @@
 {
     getView ().showErrorMessage (_("Error Saving File"), error->message);
+#if defined (DEBUG)
+    G_LOCK (fileSaved);
+    fileSaved = TRUE;
+    G_UNLOCK (fileSaved);
+#endif // DEBUG
 }
 
@@ -877 +892 @@
     G_UNLOCK (fileLoaded);
 }
+
+///
+/// @brief Waits until a file is saved.
+///
+/// This is *only* useful for testing, don't use it.
+///
+void
+MainPter::waitForFileSaved ()
+{
+    volatile gboolean end = FALSE;
+    do
+    {
+        G_LOCK (fileSaved);
+        end = fileSaved;
+        G_UNLOCK (fileSaved);
+    }
+    while ( !end );
+    G_LOCK (fileSaved);
+    fileSaved = FALSE;
+    G_UNLOCK (fileSaved);
+}
 #endif // DEBUG

trunk/src/MainPter.h

@@ -83 +83 @@
 #if defined (DEBUG)
             void waitForFileLoaded (void);
+            void waitForFileSaved (void);
 #endif // DEBUG
 

trunk/src/PDFDocument.cxx

@@ -18 +18 @@
 #include <config.h>
 #include <time.h>
-#include <glib/poppler.h>
+#include <poppler.h>
 #include "epdfview.h"