Archives
Archives
| From: | "Markos Chandras (hwoarang)" <hwoarang@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in x11-misc/rednotebook/files: rednotebook-1.1.1-disable-webkit.patch |
| Date: | Sun, 22 Aug 2010 12:42:53 |
| Message-Id: | 20100822124249.F11442004E@flycatcher.gentoo.org |
| 1 | hwoarang 10/08/22 12:42:49 |
| 2 | |
| 3 | Added: rednotebook-1.1.1-disable-webkit.patch |
| 4 | Log: |
| 5 | Version bump |
| 6 | (Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 | |
| 8 | Revision Changes Path |
| 9 | 1.1 x11-misc/rednotebook/files/rednotebook-1.1.1-disable-webkit.patch |
| 10 | |
| 11 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/rednotebook/files/rednotebook-1.1.1-disable-webkit.patch?rev=1.1&view=markup |
| 12 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/rednotebook/files/rednotebook-1.1.1-disable-webkit.patch?rev=1.1&content-type=text/plain |
| 13 | |
| 14 | Index: rednotebook-1.1.1-disable-webkit.patch |
| 15 | =================================================================== |
| 16 | Index: rednotebook-1.1.1/rednotebook/gui/browser.py |
| 17 | =================================================================== |
| 18 | --- rednotebook-1.1.1.orig/rednotebook/gui/browser.py |
| 19 | +++ rednotebook-1.1.1/rednotebook/gui/browser.py |
| 20 | @@ -40,40 +40,6 @@ from rednotebook.util import filesystem |
| 21 | |
| 22 | webkit = None |
| 23 | |
| 24 | -def windows_webkit_import(): |
| 25 | - global webkit |
| 26 | - |
| 27 | - cwd = os.getcwd() |
| 28 | - |
| 29 | - if filesystem.main_is_frozen(): |
| 30 | - gtk_bin_dir = filesystem.app_dir |
| 31 | - else: |
| 32 | - gtk_bin_dir = r'C:\GTK' |
| 33 | - |
| 34 | - try: |
| 35 | - # It seems the dlls are only found if we are in the bin dir |
| 36 | - # during import |
| 37 | - os.chdir(gtk_bin_dir) |
| 38 | - except WindowsError: |
| 39 | - logging.error('Changing dir to "%s" failed' % gtk_bin_dir) |
| 40 | - return |
| 41 | - |
| 42 | - try: |
| 43 | - import webkit |
| 44 | - except ImportError: |
| 45 | - logging.info('webkit not found. For a nicer preview install python-webkit or pywebkitgtk') |
| 46 | - os.chdir(cwd) |
| 47 | - |
| 48 | -if False and sys.platform == 'win32': |
| 49 | - windows_webkit_import() |
| 50 | -else: |
| 51 | - try: |
| 52 | - import webkit |
| 53 | - except ImportError: |
| 54 | - logging.info('webkit not found. For a nicer preview install python-webkit or pywebkitgtk') |
| 55 | - |
| 56 | - |
| 57 | - |
| 58 | def can_print_pdf(): |
| 59 | if not webkit: |
| 60 | return False |