From: Steven Luo <steven+maemo@steven676.net>
Date: Fri, 27 Aug 2010 14:01:43 +0000 (-0700)
Subject: Fix /usr/bin/microb script to work with new Fremantle MicroB launching code
X-Git-Tag: v3.3b2~8
X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=commitdiff_plain;h=74a6732ecf36c1e32bda26fee8cc6da888e21a6a;ds=sidebyside

Fix /usr/bin/microb script to work with new Fremantle MicroB launching code

The new Fremantle MicroB launching code breaks the assumption in the
microb script that the existence of the MicroB browser process implies
that MicroB is handling com.nokia.osso_browser.  Revise the script to
check directly whether Browser Switchboard is handling that name, by
comparing its owner to that of org.maemo.garage.browser-switchboard
(using the org.freedesktop.DBus.GetNameOwner method).
---

diff --git a/microb b/microb
index 334523f..ed7c006 100755
--- a/microb
+++ b/microb
@@ -1,5 +1,15 @@
 #!/bin/sh
 
+get_name_owner() {
+	output=$(dbus-send --session --type=method_call --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:"$1" 2>/dev/null)
+	RETVAL=$?
+	if [ $RETVAL -ne 0 ]; then
+		return $RETVAL
+	fi
+	echo "$output" | tail -1
+	return 0
+}
+
 case "$1" in
 	--url=* )
 		url="${1#--url=}"
@@ -9,10 +19,24 @@ case "$1" in
 		;;
 esac
 
-if pidof browser > /dev/null 2>&1; then
-	method=open_new_window
-else
+# Check whether Browser Switchboard owns the com.nokia.osso_browser name or not
+osso_browser_owner=$(get_name_owner com.nokia.osso_browser)
+if [ $? -ne 0 ]; then
+	# No one owns com.nokia.osso_browser -- let D-Bus start
+	# browser-switchboard to handle this request
 	method=switchboard_launch_microb
+else
+	# If com.nokia.osso_browser is owned by the owner of
+	# org.maemo.garage.browser-switchboard, then Browser Switchboard must
+	# be the owner
+	browser_switchboard_owner=$(get_name_owner org.maemo.garage.browser-switchboard)
+	if [ "$osso_browser_owner" = "$browser_switchboard_owner" ]; then
+		# Browser Switchboard owns com.nokia.osso_browser
+		method=switchboard_launch_microb
+	else
+		# Assume MicroB owns com.nokia.osso_browser
+		method=open_new_window
+	fi
 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