ooo-build r13140 - trunk/patches/dev300

[brosenk svn gnome org]

Author: brosenk
Date: Thu Jul 10 08:08:11 2008
New Revision: 13140
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13140&view=rev

Log:
Add missing chunk (qt_xdisplay -> QX11Info::display)


Modified:
   trunk/patches/dev300/kde4-fpicker.diff

Modified: trunk/patches/dev300/kde4-fpicker.diff
==============================================================================
--- trunk/patches/dev300/kde4-fpicker.diff	(original)
+++ trunk/patches/dev300/kde4-fpicker.diff	Thu Jul 10 08:08:11 2008
@@ -689,16 +689,16 @@
      qCommandThread.start();
 --- fpicker/source/unx/kde/kdemodalityfilter.cxx.kde4fpicker~	2008-07-10 00:23:50.992695019 +0200
 +++ fpicker/source/unx/kde/kdemodalityfilter.cxx	2008-07-10 00:23:50.994695273 +0200
-@@ -62,7 +62,7 @@
+@@ -62,6 +62,7 @@
  #include <kdemodalityfilter.hxx>
  
  #include <kapplication.h>
 -#include <kdialogbase.h>
 +#include <kdialog.h>
- #include <QX11Info>
++#include <QX11Info>
  
  #include <netwm.h>
-@@ -88,7 +88,7 @@ bool ModalityFilter::eventFilter( QObjec
+@@ -88,10 +88,10 @@ bool ModalityFilter::eventFilter( QObjec
  {
      if ( pObject->isWidgetType() && pEvent->type() == QEvent::Show )
      {
@@ -706,7 +706,11 @@
 +        KDialog* pDlg = qobject_cast< KDialog* >( pObject );
          if ( pDlg != NULL && m_nWinId != 0 )
          {
-             XSetTransientForHint( QX11Info::display(), pDlg->winId(), m_nWinId );
+-            XSetTransientForHint( qt_xdisplay(), pDlg->winId(), m_nWinId );
++            XSetTransientForHint( QX11Info::display(), pDlg->winId(), m_nWinId );
+             m_nWinId = 0;
+         }
+     }
 --- fpicker/source/unx/kde/kdemodalityfilter.hxx.kde4fpicker~	2008-07-10 00:11:18.435695037 +0200
 +++ fpicker/source/unx/kde/kdemodalityfilter.hxx	2008-07-10 00:23:50.992695019 +0200
 @@ -62,7 +62,7 @@