Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bye bye gtk1 and xlib (part 1 of 2). b=326152 r+sr=roc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@225306 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mats.palmgren%bredband.net
2007-04-30 23:52:44 +00:00
parent 5988367130
commit 5162274ddd
71 changed files with 97 additions and 1471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
View File

@@ -174,12 +174,10 @@
#include "nsContentErrors.h"
#ifdef XP_UNIX
#if defined(MOZ_WIDGET_GTK) || defined (MOZ_WIDGET_GTK2)
#if defined (MOZ_WIDGET_GTK2)
#include <gdk/gdkx.h> // for GDK_DISPLAY()
#elif defined(MOZ_WIDGET_QT)
#include <qwindowdefs.h> // for qt_xdisplay()
#elif defined(MOZ_WIDGET_XLIB)
#include "xlibrgb.h" // for xlib_rgb_get_display()
#endif
#endif
@@ -2635,12 +2633,10 @@ NS_IMETHODIMP nsPluginHostImpl::GetValue(nsPluginManagerVariable aVariable, void
#if defined(XP_UNIX) && !defined(XP_MACOSX) && defined(MOZ_X11)
if (nsPluginManagerVariable_XDisplay == aVariable) {
Display** value = NS_REINTERPRET_CAST(Display**, aValue);
#if defined(MOZ_WIDGET_GTK) || defined (MOZ_WIDGET_GTK2)
#if defined (MOZ_WIDGET_GTK2)
*value = GDK_DISPLAY();
#elif defined(MOZ_WIDGET_QT)
*value = qt_xdisplay();
#elif defined(MOZ_WIDGET_XLIB)
*value = xxlib_rgb_get_display(xxlib_find_handle(XXLIBRGB_DEFAULT_HANDLE));
#endif
if (!(*value)) {
return NS_ERROR_FAILURE;
@@ -6800,7 +6796,7 @@ nsresult nsPluginStreamListenerPeer::ServeStreamAsFile(nsIRequest *request,
if (owner) {
nsPluginWindow *window = nsnull;
owner->GetWindow(window);
#if defined (MOZ_WIDGET_GTK) || defined (MOZ_WIDGET_GTK2)
#if defined (MOZ_WIDGET_GTK2)
// Should call GetPluginPort() here.
// This part is copied from nsPluginInstanceOwner::GetPluginPort().
nsCOMPtr<nsIWidget> widget;