[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 3ef71c90eeeef0e60f1b664e1616d4e32ec9e9d1
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 28 03:22:37 2010 +0000

    2010-01-27  Martin Robinson  <mrobinson at webkit.org>
    
            Reviewed by Gustavo Noronha Silva.
    
            [GTK] Expose the IM context via the API
            https://bugs.webkit.org/show_bug.cgi?id=33327
    
            Expose the GtkIMMultiContext as a property of WebKitWebView. This will
            allow embedders to generate the input method context menu entries and
            make testing certain IM context behavior possible.
    
            * webkit/webkitwebview.cpp:
            (webkit_web_view_get_property):
            (DNDContentsRequest::webkit_web_view_get_im_context):
            (DNDContentsRequest::webkit_web_view_class_init):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53967 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index b596a8f..3cd90de 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,19 @@
+2010-01-27  Martin Robinson  <mrobinson at webkit.org>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] Expose the IM context via the API
+        https://bugs.webkit.org/show_bug.cgi?id=33327
+
+        Expose the GtkIMMultiContext as a property of WebKitWebView. This will
+        allow embedders to generate the input method context menu entries and
+        make testing certain IM context behavior possible.
+
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_get_property):
+        (DNDContentsRequest::webkit_web_view_get_im_context):
+        (DNDContentsRequest::webkit_web_view_class_init):
+
 2010-01-19  Joanmarie Diggs  <joanmarie.diggs at gmail.com>
 
         Reviewed by Xan Lopez.
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index a41191d..ad13895 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -179,7 +179,8 @@ enum {
     PROP_PROGRESS,
     PROP_ENCODING,
     PROP_CUSTOM_ENCODING,
-    PROP_ICON_URI
+    PROP_ICON_URI,
+    PROP_IM_CONTEXT
 };
 
 static guint webkit_web_view_signals[LAST_SIGNAL] = { 0, };
@@ -189,6 +190,8 @@ G_DEFINE_TYPE(WebKitWebView, webkit_web_view, GTK_TYPE_CONTAINER)
 static void webkit_web_view_settings_notify(WebKitWebSettings* webSettings, GParamSpec* pspec, WebKitWebView* webView);
 static void webkit_web_view_set_window_features(WebKitWebView* webView, WebKitWebWindowFeatures* webWindowFeatures);
 
+static GtkIMContext* webkit_web_view_get_im_context(WebKitWebView*);
+
 static void destroy_menu_cb(GtkObject* object, gpointer data)
 {
     WebKitWebView* webView = WEBKIT_WEB_VIEW(data);
@@ -384,6 +387,9 @@ static void webkit_web_view_get_property(GObject* object, guint prop_id, GValue*
     case PROP_ICON_URI:
         g_value_set_string(value, webkit_web_view_get_icon_uri(webView));
         break;
+    case PROP_IM_CONTEXT:
+        g_value_set_object(value, webkit_web_view_get_im_context(webView));
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
     }
@@ -1299,6 +1305,12 @@ static gboolean webkit_web_view_query_tooltip(GtkWidget *widget, gint x, gint y,
 }
 #endif
 
+static GtkIMContext* webkit_web_view_get_im_context(WebKitWebView* webView)
+{
+    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), 0);
+    return GTK_IM_CONTEXT(webView->priv->imContext);
+}
+
 static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass)
 {
     GtkBindingSet* binding_set;
@@ -2481,6 +2493,23 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass)
                                                         _("The URI for the favicon for the #WebKitWebView."),
                                                         NULL,
                                                         WEBKIT_PARAM_READABLE));
+    /**
+    * WebKitWebView:im-context:
+    *
+    * The GtkIMMulticontext for the #WebKitWebView.
+    *
+    * This is the input method context used for all text entry widgets inside
+    * the #WebKitWebView. It can be used to generate context menu items for
+    * controlling the active input method.
+    *
+    * Since: 1.1.20
+    */
+    g_object_class_install_property(objectClass, PROP_IM_CONTEXT,
+                                    g_param_spec_object("im-context",
+                                                        "IM Context",
+                                                        "The GtkIMMultiContext for the #WebKitWebView.",
+                                                        GTK_TYPE_IM_CONTEXT,
+                                                        WEBKIT_PARAM_READABLE));
 
     g_type_class_add_private(webViewClass, sizeof(WebKitWebViewPrivate));
 }

-- 
WebKit Debian packaging