Skip to content

ensure flash plugin inits gtk on desktop #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ssravan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ensure flash plugin inits gtk on desktop #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Source/WebCore/plugins/qt/PluginPackageQt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ static void initializeGtk(QLibrary* module = 0)
if (gtkInit) {
// Prevent gtk_init() from replacing the X error handlers, since the Gtk
// handlers abort when they receive an X error, thus killing the viewer.
#if !PLATFORM(WEBOS)
#if !PLATFORM(WEBOS) || defined(MACHINE_DESKTOP)
#ifdef Q_WS_X11
int (*old_error_handler)(Display*, XErrorEvent*) = XSetErrorHandler(0);
int (*old_io_error_handler)(Display*) = XSetIOErrorHandler(0);
Expand Down