diff options
-rwxr-xr-x | bin-arm/m4 | bin | 0 -> 164836 bytes | |||
-rwxr-xr-x | bin-arm/mozplugger-controller | bin | 0 -> 14296 bytes | |||
-rwxr-xr-x | bin-arm/mozplugger-helper | bin | 0 -> 21092 bytes | |||
-rwxr-xr-x | bin-arm/mozplugger-linker | bin | 0 -> 11956 bytes | |||
-rwxr-xr-x | bin-arm/sugar-pdf-viewer (copied from bin/sugar-pdf-viewer) | 0 | ||||
-rwxr-xr-x | bin-x86/m4 (renamed from bin/m4) | bin | 194656 -> 194656 bytes | |||
-rwxr-xr-x | bin-x86/mozplugger-controller (renamed from bin/mozplugger-controller) | bin | 17116 -> 17116 bytes | |||
-rwxr-xr-x | bin-x86/mozplugger-helper (renamed from bin/mozplugger-helper) | bin | 25437 -> 25437 bytes | |||
-rwxr-xr-x | bin-x86/mozplugger-linker (renamed from bin/mozplugger-linker) | bin | 15986 -> 15986 bytes | |||
-rwxr-xr-x | bin-x86/sugar-pdf-viewer (renamed from bin/sugar-pdf-viewer) | 0 | ||||
-rw-r--r-- | plugins-arm/conf/mozpluggerrc (copied from plugins/conf/mozpluggerrc) | 0 | ||||
-rwxr-xr-x | plugins-arm/mozplugger.so | bin | 0 -> 39080 bytes | |||
-rw-r--r-- | plugins-x86/conf/mozpluggerrc (renamed from plugins/conf/mozpluggerrc) | 0 | ||||
-rw-r--r-- | plugins-x86/mozplugger.so (renamed from plugins/mozplugger.so) | bin | 118017 -> 118017 bytes | |||
-rw-r--r-- | webactivity.py | 18 |
15 files changed, 14 insertions, 4 deletions
diff --git a/bin-arm/m4 b/bin-arm/m4 Binary files differnew file mode 100755 index 0000000..f20732a --- /dev/null +++ b/bin-arm/m4 diff --git a/bin-arm/mozplugger-controller b/bin-arm/mozplugger-controller Binary files differnew file mode 100755 index 0000000..3e11ece --- /dev/null +++ b/bin-arm/mozplugger-controller diff --git a/bin-arm/mozplugger-helper b/bin-arm/mozplugger-helper Binary files differnew file mode 100755 index 0000000..422c9e9 --- /dev/null +++ b/bin-arm/mozplugger-helper diff --git a/bin-arm/mozplugger-linker b/bin-arm/mozplugger-linker Binary files differnew file mode 100755 index 0000000..5c063e8 --- /dev/null +++ b/bin-arm/mozplugger-linker diff --git a/bin/sugar-pdf-viewer b/bin-arm/sugar-pdf-viewer Binary files differindex b9719ec..b9719ec 100755 --- a/bin/sugar-pdf-viewer +++ b/bin-arm/sugar-pdf-viewer diff --git a/bin/mozplugger-controller b/bin-x86/mozplugger-controller Binary files differindex b764962..b764962 100755 --- a/bin/mozplugger-controller +++ b/bin-x86/mozplugger-controller diff --git a/bin/mozplugger-helper b/bin-x86/mozplugger-helper Binary files differindex 471db8f..471db8f 100755 --- a/bin/mozplugger-helper +++ b/bin-x86/mozplugger-helper diff --git a/bin/mozplugger-linker b/bin-x86/mozplugger-linker Binary files differindex 9021249..9021249 100755 --- a/bin/mozplugger-linker +++ b/bin-x86/mozplugger-linker diff --git a/bin/sugar-pdf-viewer b/bin-x86/sugar-pdf-viewer index b9719ec..b9719ec 100755 --- a/bin/sugar-pdf-viewer +++ b/bin-x86/sugar-pdf-viewer diff --git a/plugins/conf/mozpluggerrc b/plugins-arm/conf/mozpluggerrc index e2c90cd..e2c90cd 100644 --- a/plugins/conf/mozpluggerrc +++ b/plugins-arm/conf/mozpluggerrc diff --git a/plugins-arm/mozplugger.so b/plugins-arm/mozplugger.so Binary files differnew file mode 100755 index 0000000..d5d2f65 --- /dev/null +++ b/plugins-arm/mozplugger.so diff --git a/plugins/conf/mozpluggerrc b/plugins-x86/conf/mozpluggerrc index e2c90cd..e2c90cd 100644 --- a/plugins/conf/mozpluggerrc +++ b/plugins-x86/conf/mozpluggerrc diff --git a/plugins/mozplugger.so b/plugins-x86/mozplugger.so Binary files differindex fd9c1a7..fd9c1a7 100644 --- a/plugins/mozplugger.so +++ b/plugins-x86/mozplugger.so diff --git a/webactivity.py b/webactivity.py index 1e9280e..b703c5e 100644 --- a/webactivity.py +++ b/webactivity.py @@ -20,6 +20,7 @@ import logging from gettext import gettext as _ from gettext import ngettext import os +import platform import gobject gobject.threads_init() @@ -68,11 +69,20 @@ if not NEW_TOOLBARS: _TOOLBAR_EDIT = 1 _TOOLBAR_BROWSE = 2 -# Setup some env variables for the embedded PDF viewer +# Setup some files and env variables for the embedded PDF viewer +if platform.machine().startswith("arm"): + arch="arm" +else: + arch="x86" + +bindir = os.path.join(os.environ['SUGAR_BUNDLE_PATH'], 'bin') +if not os.path.exists(bindir): + archbindir = os.path.join(os.environ['SUGAR_BUNDLE_PATH'], 'bin-%s' % arch) + os.symlink(archbindir, bindir) + os.environ['MOZ_PLUGIN_PATH'] = os.path.join(os.environ['SUGAR_BUNDLE_PATH'], - 'plugins') -os.environ['OPERA_DIR'] = os.path.join(os.environ['SUGAR_BUNDLE_PATH'], - 'plugins', 'conf') + 'plugins-%s' % arch) +os.environ['OPERA_DIR'] = os.path.join(os.environ['MOZ_PLUGIN_PATH'], 'conf') if os.path.exists(_version_file): f = open(_version_file) |