[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit fef99af7ae3d6dae3ebbea2c4e0a89b30a2cc87d
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 9 10:28:20 2010 +0000

    2010-10-09  Carlos Garcia Campos  <cgarcia at igalia.com>
    
            Reviewed by Xan Lopez.
    
            [GTK] Removed unused callback in webkitwebview
            https://bugs.webkit.org/show_bug.cgi?id=47092
    
            In webkit_web_view_forward_context_menu_event() a callback is
            connected for the destroy signal of the popup menu, however we
            reuse the same menu always, holding a ref to it, so it's not
            destroyed when withdrawn by the user.
    
            * webkit/webkitwebview.cpp:
            (webkit_web_view_forward_context_menu_event):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69444 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 69f5009..92ebce6 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-09  Carlos Garcia Campos  <cgarcia at igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Removed unused callback in webkitwebview
+        https://bugs.webkit.org/show_bug.cgi?id=47092
+
+        In webkit_web_view_forward_context_menu_event() a callback is
+        connected for the destroy signal of the popup menu, however we
+        reuse the same menu always, holding a ref to it, so it's not
+        destroyed when withdrawn by the user.
+
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_forward_context_menu_event):
+
 2010-10-08  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index 20c9b16..446b3b7 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -208,11 +208,6 @@ static void webkit_web_view_set_window_features(WebKitWebView* webView, WebKitWe
 
 static GtkIMContext* webkit_web_view_get_im_context(WebKitWebView*);
 
-static void destroy_menu_cb(GtkObject* object, gpointer data)
-{
-    WEBKIT_WEB_VIEW(data)->priv->currentMenu = 0;
-}
-
 static void PopupMenuPositionFunc(GtkMenu* menu, gint *x, gint *y, gboolean *pushIn, gpointer userData)
 {
     WebKitWebView* view = WEBKIT_WEB_VIEW(userData);
@@ -308,10 +303,6 @@ static gboolean webkit_web_view_forward_context_menu_event(WebKitWebView* webVie
     priv->lastPopupXPosition = event.globalX();
     priv->lastPopupYPosition = event.globalY();
 
-    g_signal_connect(menu, "destroy",
-                     G_CALLBACK(destroy_menu_cb),
-                     NULL);
-
     gtk_menu_popup(menu, NULL, NULL,
                    &PopupMenuPositionFunc,
                    webView, event.button() + 1, gtk_get_current_event_time());

-- 
WebKit Debian packaging