From 915f4e91707f8da59a8ffa8011ea1d59a5e87bac Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Fri, 9 Mar 2018 15:47:44 +0100 Subject: [PATCH] Use m_xConnection member we already have --- gmenu-dbusmenu-proxy/menuproxy.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gmenu-dbusmenu-proxy/menuproxy.cpp b/gmenu-dbusmenu-proxy/menuproxy.cpp index e4ff53488..faef40a9d 100644 --- a/gmenu-dbusmenu-proxy/menuproxy.cpp +++ b/gmenu-dbusmenu-proxy/menuproxy.cpp @@ -227,8 +227,6 @@ void MenuProxy::onWindowRemoved(WId id) QByteArray MenuProxy::getWindowPropertyString(WId id, const QByteArray &name) { - auto *c = QX11Info::connection(); // FIXME cache - QByteArray value; auto atom = getAtom(name); @@ -240,8 +238,8 @@ QByteArray MenuProxy::getWindowPropertyString(WId id, const QByteArray &name) auto utf8StringAtom = getAtom(QByteArrayLiteral("UTF8_STRING")); static const long MAX_PROP_SIZE = 10000; - auto propertyCookie = xcb_get_property(c, false, id, atom, utf8StringAtom, 0, MAX_PROP_SIZE); - QScopedPointer propertyReply(xcb_get_property_reply(c, propertyCookie, NULL)); + auto propertyCookie = xcb_get_property(m_xConnection, false, id, atom, utf8StringAtom, 0, MAX_PROP_SIZE); + QScopedPointer propertyReply(xcb_get_property_reply(m_xConnection, propertyCookie, NULL)); if (propertyReply.isNull()) { qCWarning(DBUSMENUPROXY) << "XCB property reply for atom" << name << "on" << id << "was null"; return value;