install: all
mkdir -p $(DESTDIR)$(PREFIX)/bin
mkdir -p $(DESTDIR)$(PREFIX)/share/dbus-1/services
+ mkdir -p $(DESTDIR)$(PREFIX)/share/applications/hildon
install -c -m 0755 browser-switchboard $(DESTDIR)$(PREFIX)/bin
install -c -m 0644 com.nokia.osso_browser.service $(DESTDIR)$(PREFIX)/share/dbus-1/services
install -c -m 0755 browser $(DESTDIR)$(PREFIX)/bin
+ install -c -m 0755 microb $(DESTDIR)$(PREFIX)/bin
+ install -c -m 0644 microb.desktop $(DESTDIR)$(PREFIX)/share/applications/hildon
clean:
rm -f $(APP) *.o dbus-server-glue.h
;;
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
+dbus-send --session --type=method_call --print-reply --dest="com.nokia.osso_browser" /com/nokia/osso_browser/request com.nokia.osso_browser.open_new_window string:${url:-"new_window"} > /dev/null 2>&1
exit 0
GError **error) {
if (!ctx.continuous_mode)
ignore_reconfig_requests();
- launch_microb(&ctx, "new_window");
+ launch_browser(&ctx, "new_window");
return TRUE;
}
/* This is a "undocumented", non-standard extension to the API, ONLY
- for use by /usr/bin/browser wrapper to implement --url */
+ for use by /usr/bin/microb wrapper */
gboolean osso_browser_switchboard_launch_microb(OssoBrowser *obj,
const char *uri, GError **error) {
if (!ctx.continuous_mode)
--- /dev/null
+#!/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
--- /dev/null
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Name=MicroB
+GenericName=Browser
+Comment=weba_ap_web_browser_thumb
+Exec=/usr/bin/microb
+Icon=qgn_list_browser
+Terminal=false
+Type=Application
+Categories=Application;Internet;
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable