From ab195723c83bb4884d883ccaca43f1962b2237ea Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 27 Apr 2010 17:59:24 -0600
Subject: [PATCH] ...

---
 src/calibre/constants.py                     | 15 ++++++++++++---
 src/calibre/gui2/pictureflow/pictureflow.cpp |  4 ++--
 src/calibre/startup.py                       |  3 ++-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 932a955a65..7632dec1e1 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -56,9 +56,18 @@ if plugins is None:
         plugin_path = sys.extensions_location
         sys.path.insert(0, plugin_path)
 
-        for plugin in ['pictureflow', 'lzx', 'msdes', 'podofo', 'cPalmdoc',
-            'fontconfig', 'pdfreflow', 'progress_indicator', 'chmlib',
-            'chm_extra'] + \
+        for plugin in [
+                'pictureflow',
+                'lzx',
+                'msdes',
+                'podofo',
+                'cPalmdoc',
+                'fontconfig',
+                'pdfreflow',
+                'progress_indicator',
+                'chmlib',
+                'chm_extra'
+            ] + \
                     (['winutil'] if iswindows else []) + \
                     (['usbobserver'] if isosx else []):
             try:
diff --git a/src/calibre/gui2/pictureflow/pictureflow.cpp b/src/calibre/gui2/pictureflow/pictureflow.cpp
index 3d2b0286c0..1b8d3300f4 100644
--- a/src/calibre/gui2/pictureflow/pictureflow.cpp
+++ b/src/calibre/gui2/pictureflow/pictureflow.cpp
@@ -1379,5 +1379,5 @@ void PictureFlow::dataChanged() { d->dataChanged(); }
 void PictureFlow::emitcurrentChanged(int index) { emit currentChanged(index); }
 
 int FlowImages::count() { return 0; }
-QImage FlowImages::image(int index) { return QImage(); }
-QString FlowImages::caption(int index) {return QString(); }
+QImage FlowImages::image(int index) { index=0; return QImage(); }
+QString FlowImages::caption(int index) {index=0; return QString(); }
diff --git a/src/calibre/startup.py b/src/calibre/startup.py
index 3e33757f92..75aac7c277 100644
--- a/src/calibre/startup.py
+++ b/src/calibre/startup.py
@@ -19,12 +19,13 @@ __builtin__.__dict__['__'] = lambda s: s
 from calibre.constants import iswindows, preferred_encoding, plugins
 
 _run_once = False
+winutil = winutilerror = None
+
 if not _run_once:
     _run_once = True
 
     ################################################################################
     # Platform specific modules
-    winutil = winutilerror = None
     if iswindows:
         winutil, winutilerror = plugins['winutil']
         if not winutil: