From 7fd614ec157acf5dab43ee5b1cedfe301589dd12 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 31 Jan 2009 16:33:09 -0800
Subject: [PATCH] Fix #1745 (Task details windows)

---
 src/calibre/gui2/dialogs/job_view.ui | 28 ++++++++++++++++++++++++++--
 src/calibre/linux.py                 |  4 ++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/calibre/gui2/dialogs/job_view.ui b/src/calibre/gui2/dialogs/job_view.ui
index ffd4419da9..f4b0086497 100644
--- a/src/calibre/gui2/dialogs/job_view.ui
+++ b/src/calibre/gui2/dialogs/job_view.ui
@@ -16,7 +16,7 @@
    <iconset resource="../images.qrc" >
     <normaloff>:/images/view.svg</normaloff>:/images/view.svg</iconset>
   </property>
-  <layout class="QGridLayout" >
+  <layout class="QGridLayout" name="gridLayout" >
    <item row="0" column="0" >
     <widget class="QPlainTextEdit" name="log" >
      <property name="undoRedoEnabled" >
@@ -30,10 +30,34 @@
      </property>
     </widget>
    </item>
+   <item row="1" column="0" >
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources>
   <include location="../images.qrc" />
  </resources>
- <connections/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>Dialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>617</x>
+     <y>442</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>206</x>
+     <y>-5</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>
diff --git a/src/calibre/linux.py b/src/calibre/linux.py
index ffd4c46d7f..edcfa99342 100644
--- a/src/calibre/linux.py
+++ b/src/calibre/linux.py
@@ -485,14 +485,14 @@ def post_install():
                 os.unlink(f)
 
 def binary_install():
-    manifest = os.path.join(sys.frozen_path, 'manifest')
+    manifest = os.path.join(getattr(sys, 'frozen_path'), 'manifest')
     exes = [x.strip() for x in open(manifest).readlines()]
     print 'Creating symlinks...'
     for exe in exes:
         dest = os.path.join('/usr', 'bin', exe)
         if os.path.exists(dest):
             os.remove(dest)
-        os.symlink(os.path.join(sys.frozen_path, exe), dest)
+        os.symlink(os.path.join(getattr(sys, 'frozen_path'), exe), dest)
     post_install()
     return 0