Changeset 274

Timestamp:

05/04/07 07:24:59 (18 months ago)

Author:

jordi

Message:

Applied a patch by Igor Vagulin that defers the loading of a file specified from the command line until Gtk+ is idle, so the page view doesn't try to resize before the page is loaded. This closes bug #66.

Location:

trunk

Files:

• THANKS (modified) (1 diff)
• src/main.cxx (modified) (2 diffs)

trunk/THANKS

@@ -3 +3 @@
 
     - Enrico Tröger <enrico.troeger@uvena.de>, for his full screen patch.
-    - Igor Vagulin <igor_vagulin@mail.ru>, for his Russian translation.
+    - Igor Vagulin <igor_vagulin@mail.ru>, for his Russian translation and patches.
     - LoneFox <>, for his patches.
     - Moritz Heiber <moe@xfce.org>, for his German translation.

trunk/src/main.cxx

@@ -25 +25 @@
 
 using namespace ePDFView;
+
+struct LoadFileInfo
+{
+    gchar *fileName;
+    MainPter *mainPter;
+    PDFDocument *document;
+};
+
+static int
+loadFileFromCommandLine (gpointer data)
+{
+    LoadFileInfo *info = static_cast<LoadFileInfo *> (data);
+
+    info->mainPter->setOpenState (info->fileName, FALSE);
+    info->document->load (info->fileName, NULL);
+
+    g_free (info->fileName);
+    delete info;
+
+    return FALSE;
+}
 
 int
@@ -57 +78 @@
     // Let know to the presenter which is its view.
     mainPter->setView (mainView);
-    // Enter the main loop and wait for user interaction. */
     // Now check if we have additional parameters. Any additional parameter
     // will be a file name to open.
     if ( argc > 1 )
     {
-        mainPter->setOpenState (argv[1], FALSE);
-        document->load (argv[1], NULL);
+        LoadFileInfo *info = new LoadFileInfo;
+        info->mainPter = mainPter;
+        info->document = document;
+        info->fileName = g_strdup (argv[1]);
+        g_idle_add (loadFileFromCommandLine, info);
     }