qt/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch

   1 diff -up qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp.glib_eventloop_nullcheck qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp
   2 --- qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp.glib_eventloop_nullcheck     2010-06-01 21:03:15.000000000 -0500
   3 +++ qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp      2010-06-29 14:58:12.299073784 -0500
   4 @@ -76,7 +76,7 @@ static gboolean x11EventSourcePrepare(GS
   5      GX11EventSource *source = reinterpret_cast<GX11EventSource *>(s);
   6      return (XEventsQueued(X11->display, QueuedAfterFlush)
   7              || (!(source->flags & QEventLoop::ExcludeUserInputEvents)
   8 -                && !source->d->queuedUserInputEvents.isEmpty()));
   9 +                && source->d && !source->d->queuedUserInputEvents.isEmpty()));
  10  }
  11
  12  static gboolean x11EventSourceCheck(GSource *s)
  13 @@ -84,7 +84,7 @@ static gboolean x11EventSourceCheck(GSou
  14      GX11EventSource *source = reinterpret_cast<GX11EventSource *>(s);
  15      return (XEventsQueued(X11->display, QueuedAfterFlush)
  16              || (!(source->flags & QEventLoop::ExcludeUserInputEvents)
  17 -                && !source->d->queuedUserInputEvents.isEmpty()));
  18 +                && source->d && !source->d->queuedUserInputEvents.isEmpty()));
  19  }
  20
  21  static gboolean x11EventSourceDispatch(GSource *s, GSourceFunc callback, gpointer user_data)