Merge commit 'diablo-package-3.3-2' into fremantle-package

diff --git a/dbus-server-bindings.c b/dbus-server-bindings.c
index 748f557..1660110 100644 (file)
--- a/dbus-server-bindings.c
+++ b/dbus-server-bindings.c
@@ -107,6 +107,15 @@ gboolean osso_browser_load_url(OssoBrowser *obj,
        return TRUE;
 }
 
+gboolean osso_browser_load_url_sb(OssoBrowser *obj,
+               const char *uri, gboolean fullscreen, GError **error) {
+       /* XXX don't ignore fullscreen requests */
+       if (!ctx.continuous_mode)
+               ignore_reconfig_requests();
+       open_address(uri);
+       return TRUE;
+}
+
 gboolean osso_browser_mime_open(OssoBrowser *obj,
                const char *uri, GError **error) {
        if (!ctx.continuous_mode)
@@ -123,6 +132,15 @@ gboolean osso_browser_open_new_window(OssoBrowser *obj,
        return TRUE;
 }
 
+gboolean osso_browser_open_new_window_sb(OssoBrowser *obj,
+               const char *uri, gboolean fullscreen, GError **error) {
+       /* XXX don't ignore fullscreen requests */
+       if (!ctx.continuous_mode)
+               ignore_reconfig_requests();
+       open_address(uri);
+       return TRUE;
+}
+
 gboolean osso_browser_top_application(OssoBrowser *obj,
                GError **error) {
        if (!ctx.continuous_mode)

diff --git a/dbus-server-bindings.h b/dbus-server-bindings.h
index 232ac5d..0cae50d 100644 (file)
--- a/dbus-server-bindings.h
+++ b/dbus-server-bindings.h
@@ -37,10 +37,14 @@ typedef struct _OssoBrowserClass {
 /* The com.nokia.osso_browser D-Bus interface */
 gboolean osso_browser_load_url(OssoBrowser *obj,
                 const char *uri, GError **error);
+gboolean osso_browser_load_url_sb(OssoBrowser *obj,
+                const char *uri, gboolean fullscreen, GError **error);
 gboolean osso_browser_mime_open(OssoBrowser *obj,
                 const char *uri, GError **error);
 gboolean osso_browser_open_new_window(OssoBrowser *obj,
                 const char *uri, GError **error);
+gboolean osso_browser_open_new_window_sb(OssoBrowser *obj,
+                const char *uri, gboolean fullscreen, GError **error);
 gboolean osso_browser_top_application(OssoBrowser *obj, GError **error);
 /* This is an "undocumented", non-standard extension; DO NOT USE */
 gboolean osso_browser_switchboard_launch_microb(OssoBrowser *obj,

diff --git a/dbus-server-glue.xml b/dbus-server-glue.xml
index 1fd3062..b7212e7 100644 (file)
--- a/dbus-server-glue.xml
+++ b/dbus-server-glue.xml
@@ -6,12 +6,22 @@
     <method name="load_url">
       <arg type="s" name="uri" direction="in" />
     </method>
+    <method name="load_url">
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="osso_browser_load_url_sb" />
+      <arg type="s" name="uri" direction="in" />
+      <arg type="b" name="fullscreen" direction="in" />
+    </method>
     <method name="mime_open">
       <arg type="s" name="uri" direction="in" />
     </method>
     <method name="open_new_window">
       <arg type="s" name="uri" direction="in" />
     </method>
+    <method name="open_new_window">
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="osso_browser_open_new_window_sb" />
+      <arg type="s" name="uri" direction="in" />
+      <arg type="b" name="fullscreen" direction="in" />
+    </method>
     <method name="top_application" />
     <method name="switchboard_launch_microb">
       <arg type="s" name="uri" direction="in" />

diff --git a/debian/changelog b/debian/changelog
index 902e8d3..758e6d9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+browser-switchboard (3.3-2) extras-devel; urgency=low
+
+  * Cherry-pick cdd1081d... ("Provide open_new_window and load_url methods with
+    boolean fullscreen argument"); fix for compatibility with MicroB
+    com.nokia.osso_browser interface.
+
+ -- Steven Luo <steven+maemo@steven676.net>  Sat, 09 Oct 2010 18:38:16 -0700
+
 browser-switchboard (3.3-1fremantle2) extras-devel; urgency=low
 
   * Beta release for Fremantle.