← Back to branch summary

~unity-2d-team/unity-2d/natty

« back to all changes in this revision

Viewing changes to panel/applets/legacytray/x11embedcontainer.cpp

  • Committer: Tarmac
  • Author(s): Aurelien Gateau
  • Date: 2011-07-04 14:01:42 UTC
  • mfrom: (611.2.3 qt-no-keywords)
  • Revision ID: ubuntu.builder@gmail.com-20110704140142-wlhw9cqp6l4615hb
[panel] Build with QT_NO_KEYWORDS. Needed to be able to use UnityCore.

Show diffs side-by-side

added added

removed removed

Lines of Context:
panel/applets/legacytray/x11embedcontainer.cpp
92
92
    Display *display = QX11Info::display();
93
93
 
94
94
    if (!XGetWindowAttributes(display, clientId, &d->attr)) {
95
 
        emit error(QX11EmbedContainer::Unknown);
 
95
        error(QX11EmbedContainer::Unknown);
96
96
        return;
97
97
    }
98
98
 
108
108
 
109
109
    XWindowAttributes attr;
110
110
    if (!XGetWindowAttributes(display, winId, &attr)) {
111
 
        emit error(QX11EmbedContainer::Unknown);
 
111
        error(QX11EmbedContainer::Unknown);
112
112
        return;
113
113
    }
114
114
 
157
157
    // if the close happens after this point? Should checks happen on a timer
158
158
    // until embedding completes perhaps?
159
159
    if (!XGetWindowAttributes(QX11Info::display(), clientId, &d->attr)) {
160
 
        emit error(QX11EmbedContainer::Unknown);
 
160
        error(QX11EmbedContainer::Unknown);
161
161
        return;
162
162
    }
163
163
}