ports/www/firefox/files/patch-bug1097592
Beat Gaetzi 0ccec1792b - Update Thunderbird to 31.3.0
- Update gmp-api to 35.0
- Update openh264 to 1.2
- Update NSS to 3.17.3
- Update Firefox to 34.0.5
- Update Firefox ESR 31.3.0
- Update libxul to 31.3.0
- Improve CONFIGURE_TARGET handling
- Always build using client.mk
- Switch to clang by default on systems without libc++
  (/stable/8 and /stable/9)
- Drop lang/python2 dependency, only lang/python27 is required
  to build
- Use DuckDuckGo searchplugin from upstream (has suggestions
  and purposes)
- Backport a few about:memory fixes
- Backport Web Notifications libnotify integration
- Add GTK3 option for www/firefox. Adwaita is a bit broken
  since Gtk 3.14, see:
  https://bugzilla.mozilla.org/show_bug.cgi?id=1073117

PR:		195559
Submitted by:	Jan Beich
MFH:		2014Q4
Security:	http://vuxml.org/freebsd/7ae61870-9dd2-4884-a2f2-f19bb5784d09.html
2014-12-03 14:55:25 +00:00

41 lines
1.5 KiB
Text

commit a822f9a
Author: Martin Stransky <stransky@redhat.com>
Date: Fri Nov 14 06:32:00 2014 +0100
Bug 1097592 - Don't use PR_FindFunctionSymbolAndLibrary to avoid app freeze, r=karlt
---
widget/gtk/mozgtk/mozgtk.c | 1 +
widget/gtk/nsWindow.cpp | 8 +-------
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git widget/gtk/mozgtk/mozgtk.c widget/gtk/mozgtk/mozgtk.c
index 11829d7..3b46759 100644
--- widget/gtk/mozgtk/mozgtk.c
+++ widget/gtk/mozgtk/mozgtk.c
@@ -121,6 +121,7 @@ STUB(gdk_x11_lookup_xdisplay)
STUB(gdk_x11_screen_get_xscreen)
STUB(gdk_x11_visual_get_xvisual)
STUB(gdk_x11_window_lookup_for_display)
+STUB(gdk_x11_window_set_user_time)
STUB(gdk_x11_xatom_to_atom)
STUB(gtk_accel_label_new)
STUB(gtk_alignment_get_type)
diff --git widget/gtk/nsWindow.cpp widget/gtk/nsWindow.cpp
index 26c333b..d462f13 100644
--- widget/gtk/nsWindow.cpp
+++ widget/gtk/nsWindow.cpp
@@ -1295,13 +1295,7 @@ SetUserTimeAndStartupIDForActivatedWindow(GtkWidget* aWindow)
}
if (sn_launchee_context_get_id_has_timestamp(ctx)) {
- PRLibrary* gtkLibrary;
- SetUserTimeFunc setUserTimeFunc = (SetUserTimeFunc)
- PR_FindFunctionSymbolAndLibrary("gdk_x11_window_set_user_time", &gtkLibrary);
- if (setUserTimeFunc) {
- setUserTimeFunc(gdkWindow, sn_launchee_context_get_timestamp(ctx));
- PR_UnloadLibrary(gtkLibrary);
- }
+ gdk_x11_window_set_user_time(gdkWindow, sn_launchee_context_get_timestamp(ctx));
}
sn_launchee_context_setup_window(ctx, gdk_x11_window_get_xid(gdkWindow));