Ticket #10623: mozilla-533245-2.patch

mozilla-1.9.2/embedding/browser/gtk/src/EmbedWindow.cpp

@@ -341 +341 @@
   // Work around the problem that sometimes the window
   // is already visible even though mVisibility isn't true
   // yet.
+
+   // Try solution to bug 533245, comment 13
+   NS_ENSURE_ARG_POINTER(aVisibility);
+   *aVisibility = PR_TRUE;
+   /*
   *aVisibility = mVisibility ||
                  (!mOwner->mIsChrome &&
                   mOwner->mOwningWidget &&
                   GTK_WIDGET_MAPPED(mOwner->mOwningWidget));
+   */
   return NS_OK;
 }
 

mozilla-1.9.2/embedding/browser/gtk/src/gtkmozembed2.cpp

@@ -90 +90 @@
 #endif
 
 static gint
+handle_child_button_press(GtkWidget  *aWidget,
+                      GdkEventButton *aGdkButtonEvent,
+                      GtkMozEmbed    *aEmbed);
+
+static gint
 handle_child_focus_in(GtkWidget     *aWidget,
                       GdkEventFocus *aGdkFocusEvent,
                       GtkMozEmbed   *aEmbed);
@@ -509 +514 @@
                           G_CALLBACK(handle_child_focus_in),
                           embed,
                           G_CONNECT_AFTER);
+  g_signal_connect_object(G_OBJECT(child_widget),
+                          "button_press_event",
+                          G_CALLBACK(handle_child_button_press),
+                          embed,
+                          G_CONNECT_AFTER);
 }
 
 static void
@@ -622 +632 @@
 }
 
 static gint
+handle_child_button_press(GtkWidget     *aWidget,
+                      GdkEventButton *aGdkButtonEvent,
+                      GtkMozEmbed   *aEmbed)
+{
+  EmbedPrivate *embedPrivate;
+
+  embedPrivate = (EmbedPrivate *)aEmbed->data;
+
+  embedPrivate->ChildFocusIn();
+
+  return FALSE;
+}
+
+static gint
 handle_child_focus_out(GtkWidget     *aWidget,
                        GdkEventFocus *aGdkFocusEvent,
                        GtkMozEmbed   *aEmbed)

mozilla-1.9.2/widget/src/gtk2/nsWindow.cpp

@@ -5965 +5965 @@
 
     window->OnButtonPressEvent(widget, event);
 
-    return TRUE;
+    return FALSE;
 }
 
 /* static */