diff options
Diffstat (limited to 'www/firefox/files/patch-bug1097592')
| -rw-r--r-- | www/firefox/files/patch-bug1097592 | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/www/firefox/files/patch-bug1097592 b/www/firefox/files/patch-bug1097592 deleted file mode 100644 index 5c1833b60688..000000000000 --- a/www/firefox/files/patch-bug1097592 +++ /dev/null @@ -1,41 +0,0 @@ -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", >kLibrary); -- 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)); |