From 705b848e92de09f2adcad0c8d075634ca4909ac9 Mon Sep 17 00:00:00 2001 From: Steven Luo Date: Thu, 10 Dec 2009 16:18:38 -0800 Subject: [PATCH] Initial commit. --- Changelog | 21 +++ LICENSE | 339 ++++++++++++++++++++++++++++++++++++++++ README | 29 ++++ browser | 19 +++ browser-proxy | 210 +++++++++++++++++++++++++ com.nokia.osso_browser.service | 3 + 6 files changed, 621 insertions(+) create mode 100644 Changelog create mode 100644 LICENSE create mode 100644 README create mode 100755 browser create mode 100755 browser-proxy create mode 100644 com.nokia.osso_browser.service diff --git a/Changelog b/Changelog new file mode 100644 index 0000000..5bffce5 --- /dev/null +++ b/Changelog @@ -0,0 +1,21 @@ +2.1 -> steven676 is now the primary maintainer + -- use a config file, /home/user/.config/browser-proxy, if available + -- add support for launching Fennec and Midori out of the box + -- introduce a config option default_browser for selecting the default browser ("tear", "microb", "fennec", "midori", "other") + -- add support for launching an arbitrary browser using the other_browser_cmd config option + -- run maemo-invoker directly instead of /usr/bin/browser to avoid a loop when /usr/bin/browser is a wrapper invoking this script + -- add a new, private D-Bus method for a /usr/bin/browser wrapper to use to launch MicroB with a URI +2.0 -> several patches contributed by steven676: + -- only launch one window if Tear isn't already running + -- use gobject instead of gtk+ for main loop, uses less memory + -- use python dbus interface instead of shelling out for dbus-send + -- add 'continuous mode' option to keep proxy running (faster response) + -- kill browserd on exit if launched from the script + -- add option to use MicroB by default +1.5 -> added mime_open method used by File manager to open .html files +1.4 -> can now manually launch MicroB/browser -- while open, it will be used instead + -- without --print-reply, the initial launching message seems to get lost +1.3 -> sniff for local paths, prefix with file:// (fixes feedcircuit) +1.2 -> removed return values, added osso_browser/request namespace (fixes Pidgin) +1.1 -> fixed wrong capitalization in dbus message +1.0 diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d511905 --- /dev/null +++ b/LICENSE @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/README b/README new file mode 100644 index 0000000..77eefc4 --- /dev/null +++ b/README @@ -0,0 +1,29 @@ +# browser-proxy.py +# version 2.2 by steven676 and xiojason +# (see http://browser-switch.garage.maemo.org/) + +# simple python-dbus service that proxies osso_browser events to Tear +# based on code from http://paste.lisp.org/display/45824 + +# installation: +# 0. ensure the needed python packages are installed: +# python2.5, python2.5-dbus, and python2.5-gtk2 +# 1. place this file in /home/user as browser-proxy.py +# 2. make executable (chmod +x browser-proxy.py) +# 3. change /usr/share/dbus-1/services/com.nokia.osso_browser.service to read: +# [D-BUS Service] +# Name=com.nokia.osso_browser +# Exec=/home/user/browser-proxy.py +# 4. disable tablet-browser-service (aka browserd) (optional, saves memory) +# 5. you may wish to reboot. + +# notes: +# - opening urls will be a bit slow. it takes some time to relay the messages to Tear +# - modifications to the script may require the killing of an already-running +# browser-proxy.py process -- just use 'kill' to stop it. +# - modifying the osso_browser.service file prevents MicroB/browserd from working. +# if you wish to restore MicroB/browserd, change the service file's contents back to: +# [D-BUS Service] +# Name=com.nokia.osso_browser +# Exec=/usr/bin/browser +# and re-enable tablet-browser-service again. diff --git a/browser b/browser new file mode 100755 index 0000000..334523f --- /dev/null +++ b/browser @@ -0,0 +1,19 @@ +#!/bin/sh + +case "$1" in + --url=* ) + url="${1#--url=}" + ;; + --url ) + url="$2" + ;; +esac + +if pidof browser > /dev/null 2>&1; then + method=open_new_window +else + method=switchboard_launch_microb +fi + +dbus-send --session --type=method_call --print-reply --dest="com.nokia.osso_browser" /com/nokia/osso_browser/request com.nokia.osso_browser.$method string:${url:-"new_window"} > /dev/null 2>&1 +exit 0 diff --git a/browser-proxy b/browser-proxy new file mode 100755 index 0000000..80d405b --- /dev/null +++ b/browser-proxy @@ -0,0 +1,210 @@ +#!/usr/bin/python +# browser-proxy.py +# version 2.2 by steven676 and xiojason + +# simple python-dbus service that proxies osso_browser events to Tear +# based on code from http://paste.lisp.org/display/45824 + +# Copyright (C) 2009 Jason Simpson +# Copyright (C) 2009 Steven Luo + +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +# On Maemo systems, a copy of the GPL can be found in +# /usr/share/common-licenses/GPL . + + +import os +import gobject +import dbus +import dbus.service +import dbus.glib + +# Set default configuration values +# These can be overriden by the config file $HOME/.config/browser-proxy +def setconfigdefaults(): + global continuous_mode, default_browser, other_browser_cmd + + # continuous_mode: 0 -- close after handling a request; 1 -- run + # continuously in the background + continuous_mode = 0 + # default_browser: "tear", "microb", "fennec", "midori", or "other" + default_browser = "tear" + # If default browser is "other", what program to run (%s will be replaced + # by URI) + other_browser_cmd = "" + +class BrowserLauncher: + def LaunchTear(self, uri): + # We should be able to just call the D-Bus service to open Tear ... + # but if Tear's not open, that causes D-Bus to start Tear and then + # pass it the OpenAddress call, which results in two browser windows. + # Properly fixing this probably requires Tear to provide a D-Bus method + # that opens an address in an existing window, but for now work around + # by just opening Tear via the command line if it's not running. + if os.system("pidof tear > /dev/null") == 0: + dbus.SessionBus().get_object('com.nokia.tear', '/com/nokia/tear').OpenAddress(uri, dbus_interface='com.nokia.Tear') + if continuous_mode == 0: + quit() + else: + if continuous_mode: + if os.fork() != 0: + # parent process doesn't need to do anything + return + # child process + os.setsid() + os.execl('/usr/bin/tear', '/usr/bin/tear', uri) + + def LaunchMicroB(self, uri): + if os.system("pidof /usr/sbin/browserd > /dev/null") != 0: + kill_browserd = 1 + os.system("/usr/sbin/browserd -d") + else: + kill_browserd = 0 + dbus.SessionBus().release_name("com.nokia.osso_browser") + if uri == "new_window": + # exec maemo-invoker directly instead of relying on the + # /usr/bin/browser symlink, since /usr/bin/browser may have been + # replaced with a shell script calling us via D-Bus + os.spawnl(os.P_WAIT, '/usr/bin/maemo-invoker', '/usr/bin/browser') + else: + os.spawnl(os.P_WAIT, '/usr/bin/maemo-invoker', '/usr/bin/browser', '--url', uri) + if kill_browserd: + os.system("kill `pidof /usr/sbin/browserd`") + if continuous_mode: + dbus.SessionBus().request_name("com.nokia.osso_browser") + else: + quit() + + def LaunchOtherBrowser(self, uri): + if uri == "new_window": + uri = "" + try: + # URI must be quoted and quotes in the URI must be URL-escaped + # to prevent the shell from interpreting any part of the URI + command = other_browser_cmd % "'%s'" % uri.replace("'", "%27") + except TypeError: + # Couldn't substitute URI in, just launch the browser + print "other_browser_cmd should have a %s placeholder for the URI" + command = other_browser_cmd + import subprocess + subprocess.Popen(command, shell=True) + if continuous_mode == 0: + quit() + + def UpdateDefaultBrowser(self): + global other_browser_cmd + if default_browser == "tear": + self.LaunchBrowser = self.LaunchTear + elif default_browser == "microb": + self.LaunchBrowser = self.LaunchMicroB + elif default_browser == "fennec": + # Cheat and reuse LaunchOtherBrowser, since we don't appear to + # need to do anything special + # TODO: does Fennec have a D-Bus API or signaling mechanism? + # Invoking the fennec binary appears to be somewhat expensive + other_browser_cmd = "fennec '%s'" + self.LaunchBrowser = self.LaunchOtherBrowser + elif default_browser == "midori": + other_browser_cmd = "midori '%s'" + self.LaunchBrowser = self.LaunchOtherBrowser + elif default_browser == "other": + if other_browser_cmd != "": + self.LaunchBrowser = self.LaunchOtherBrowser + else: + print "default_browser is 'other', but no other_browser_cmd set -- using default" + self.LaunchBrowser = self.LaunchTear + else: + print "Unknown default_browser %s, using default" % default_browser + self.LaunchBrowser = self.LaunchTear + + def __init__(self): + self.UpdateDefaultBrowser() + +class ProxyBrowserService(dbus.service.Object): + def __init__(self): + bus_name = dbus.service.BusName('com.nokia.osso_browser', bus=dbus.SessionBus()) + dbus.service.Object.__init__(self, bus_name, '/com/nokia/osso_browser') + dbus.service.Object.__init__(self, bus_name, '/com/nokia/osso_browser/request') + + def OpenAddress(self, uri): + print uri + + if uri[0] == '/': + print "prefixing apparent local path with file://" + uri = "file://" + uri + + launcher.LaunchBrowser(uri) + + @dbus.service.method(dbus_interface='com.nokia.osso_browser', in_signature='s') + def load_url(self, uri): + print "load_url" + self.OpenAddress(uri) + + @dbus.service.method(dbus_interface='com.nokia.osso_browser', in_signature='s') + def mime_open(self, uri): + print "mime_open" + self.OpenAddress(uri) + + @dbus.service.method(dbus_interface='com.nokia.osso_browser', in_signature='s') + def open_new_window(self, uri): + print "open_new_window" + self.OpenAddress(uri) + + @dbus.service.method(dbus_interface='com.nokia.osso_browser') + def top_application(self): + print "top_application" + launcher.LaunchMicroB("new_window") + + # This method is an "undocumented", non-standard extension to the + # osso_browser D-Bus API, intended solely to allow a wrapper script + # replacing /usr/bin/browser to implement --url + @dbus.service.method(dbus_interface='com.nokia.osso_browser') + def switchboard_launch_microb(self, uri="new_window"): + print "switchboard_launch_microb" + launcher.LaunchMicroB(uri) + +def readconfigfile(signalnum=None, frame=None): + # reset configuration to defaults + setconfigdefaults() + + # read configuration from the config file, if available + try: + execfile(os.getenv("HOME", "/home/user") + "/.config/browser-proxy", globals()) + launcher.UpdateDefaultBrowser() + except: + # No valid config file available + pass + +setconfigdefaults() + +launcher = BrowserLauncher() +pbrowser = ProxyBrowserService() + +readconfigfile() + +if continuous_mode: + import signal + def waitforzombies(signalnum, frame): + try: + while os.waitpid(-1, os.WNOHANG) != (0, 0): + continue + except OSError: + pass + signal.signal(signal.SIGCHLD, waitforzombies) + signal.signal(signal.SIGHUP, readconfigfile) + +loop = gobject.MainLoop() +loop.run() diff --git a/com.nokia.osso_browser.service b/com.nokia.osso_browser.service new file mode 100644 index 0000000..bcd7a5b --- /dev/null +++ b/com.nokia.osso_browser.service @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=com.nokia.osso_browser +Exec=/usr/bin/browser-proxy -- 1.7.9.5