|
Lines 1-6
Link Here
|
| 1 |
--- src/calibre/linux.py.orig 2014-02-09 13:42:40.000000000 -0600 |
1 |
--- src/calibre/linux.py.orig 2014-08-07 22:21:35.000000000 -0500 |
| 2 |
+++ src/calibre/linux.py 2014-02-09 13:43:59.000000000 -0600 |
2 |
+++ src/calibre/linux.py 2015-01-16 22:21:29.366971954 -0600 |
| 3 |
@@ -712,6 +712,7 @@ |
3 |
@@ -831,6 +831,7 @@ |
| 4 |
f.close() |
4 |
f.close() |
| 5 |
des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop', |
5 |
des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop', |
| 6 |
'calibre-ebook-viewer.desktop', 'calibre-ebook-edit.desktop') |
6 |
'calibre-ebook-viewer.desktop', 'calibre-ebook-edit.desktop') |
|
Lines 8-14
Link Here
|
| 8 |
appdata = os.path.join(os.path.dirname(self.opts.staging_sharedir), 'appdata') |
8 |
appdata = os.path.join(os.path.dirname(self.opts.staging_sharedir), 'appdata') |
| 9 |
if not os.path.exists(appdata): |
9 |
if not os.path.exists(appdata): |
| 10 |
try: |
10 |
try: |
| 11 |
@@ -726,8 +727,10 @@ |
11 |
@@ -845,8 +846,10 @@ |
| 12 |
|
12 |
|
| 13 |
APPDATA = get_appdata() |
13 |
APPDATA = get_appdata() |
| 14 |
for x in des: |
14 |
for x in des: |
|
Lines 21-23
Link Here
|
| 21 |
self.menu_resources.append(x) |
21 |
self.menu_resources.append(x) |
| 22 |
ak = x.partition('.')[0] |
22 |
ak = x.partition('.')[0] |
| 23 |
if ak in APPDATA and os.access(appdata, os.W_OK): |
23 |
if ak in APPDATA and os.access(appdata, os.W_OK): |
|
|
24 |
@@ -992,7 +995,7 @@ |
| 25 |
GenericName=Viewer for E-books |
| 26 |
Comment=Viewer for E-books in all the major formats |
| 27 |
TryExec=ebook-viewer |
| 28 |
-Exec=ebook-viewer --detach %f |
| 29 |
+Exec=ebook-viewer %f |
| 30 |
Icon=calibre-viewer |
| 31 |
Categories=Graphics;Viewer; |
| 32 |
''' |
| 33 |
@@ -1005,7 +1008,7 @@ |
| 34 |
GenericName=Edit E-books |
| 35 |
Comment=Edit e-books in various formats |
| 36 |
TryExec=ebook-edit |
| 37 |
-Exec=ebook-edit --detach %f |
| 38 |
+Exec=ebook-edit %f |
| 39 |
Icon=calibre-ebook-edit |
| 40 |
Categories=Office; |
| 41 |
''' |
| 42 |
@@ -1018,7 +1021,7 @@ |
| 43 |
GenericName=E-book library management |
| 44 |
Comment=E-book library management: Convert, view, share, catalogue all your e-books |
| 45 |
TryExec=calibre |
| 46 |
-Exec=calibre --detach %F |
| 47 |
+Exec=calibre %F |
| 48 |
Icon=calibre-gui |
| 49 |
Categories=Office; |
| 50 |
''' |