corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 627699 - Port GTK2 to GTK3, dom patch. r=karlt

Browse Source
This commit is contained in:
Martin Stransky
2012-06-21 20:44:38 -04:00
parent f00a2f8a34
commit a378b97cdb
11 changed files with 66 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dom/plugins/base/nsNPAPIPlugin.cpp
View File

@@ -56,11 +56,13 @@
#endif
// needed for nppdf plugin
#ifdef MOZ_WIDGET_GTK2
#if (MOZ_WIDGET_GTK)
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
#if (MOZ_WIDGET_GTK == 2)
#include "gtk2xtbin.h"
#endif
#endif
#ifdef XP_OS2
#define INCL_DOS
@@ -2013,7 +2015,7 @@ _getvalue(NPP npp, NPNVariable variable, void *result)
}
case NPNVToolkit: {
#ifdef MOZ_WIDGET_GTK2
#ifdef MOZ_WIDGET_GTK
*((NPNToolkitType*)result) = NPNVGtk2;
#endif
@@ -2028,7 +2030,7 @@ _getvalue(NPP npp, NPNVariable variable, void *result)
}
case NPNVSupportsXEmbedBool: {
#ifdef MOZ_WIDGET_GTK2
#ifdef MOZ_WIDGET_GTK
*(NPBool*)result = true;
#elif defined(MOZ_WIDGET_QT)
// Desktop Flash fail to initialize if browser does not support NPNVSupportsXEmbedBool
@@ -2055,7 +2057,7 @@ _getvalue(NPP npp, NPNVariable variable, void *result)
case NPNVSupportsWindowless: {
#if defined(XP_WIN) || defined(XP_MACOSX) || \
(defined(MOZ_X11) && (defined(MOZ_WIDGET_GTK2) || defined(MOZ_WIDGET_QT)))
(defined(MOZ_X11) && (defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT)))
*(NPBool*)result = true;
#else
*(NPBool*)result = false;