Changeset 55997 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

May 21, 2015 9:52:17 AM (10 years ago)

Author:

vboxsync

Message:

DnD: Logging.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp

@@ -899 +899 @@
             if (e.xselectionrequest.target == xAtom(XA_TARGETS))
             {
-                LogFlowThisFunc(("wnd=%#x '%s' asking for target list\n",
-                                 e.xselectionrequest.requestor, propName.value));
+                LogFlowThisFunc(("wnd=%#x ('%s') asking for target list\n",
+                                 e.xselectionrequest.requestor, propName.value ? (const char *)propName.value : "<No name>"));
 
                 /* If so, set the window property with the formats on the requestor
@@ -916 +916 @@
             else if (m_lstFormats.contains(e.xselectionrequest.target))
             {
-                LogFlowThisFunc(("wnd=%#x '%s' asking for data, format=%s\n",
-                                 e.xselectionrequest.requestor, propName.value,
+                LogFlowThisFunc(("wnd=%#x ('%s') asking for data, format=%s\n",
+                                 e.xselectionrequest.requestor, propName.value ? (const char *)propName.value : "<No name>",
                                  xAtomToString(e.xselectionrequest.target).c_str()));
 
@@ -933 +933 @@
                 else
                 {
-                    LogFlowThisFunc(("Saving selection notify message of wnd=%#x '%s'\n",
-                                     e.xselectionrequest.requestor, propName.value));
+                    LogFlowThisFunc(("Saving selection notify message of wnd=%#x ('%s')\n",
+                                     e.xselectionrequest.requestor, propName.value ? (const char *)propName.value : "<No name>"));
 
                     memcpy(&m_eventHgSelection, &e, sizeof(XEvent));
@@ -948 +948 @@
             else
             {
-                LogFlowThisFunc(("Refusing unknown command of wnd=%#x '%s'\n", e.xselectionrequest.requestor, propName.value));
+                LogFlowThisFunc(("Refusing unknown command of wnd=%#x ('%s')\n", e.xselectionrequest.requestor, 
+                                 propName.value ? (const char *)propName.value : "<No name>"));
 
                 /* We don't understand this request message and therefore answer with an
@@ -1422 +1423 @@
 int DragInstance::hgDrop(void)
 {
-    LogFlowThisFunc(("wndCur=%#x, wndProxy=%#x, mode=%RU32, state=%RU32\n", m_wndProxy, m_wndCur, m_enmMode, m_enmState));
+    LogFlowThisFunc(("wndCur=%#x, wndProxy=%#x, mode=%RU32, state=%RU32\n", m_wndCur, m_wndProxy, m_enmMode, m_enmState));
 
     if (   m_enmMode  != HG
@@ -1447 +1448 @@
     int xRc = XSendEvent(m_pDisplay, m_wndCur, False, NoEventMask, reinterpret_cast<XEvent*>(&m));
     if (RT_UNLIKELY(xRc == 0))
-        logError("Error sending XA_XdndDrop event to current window=%#x: %s\n", m_wndCur, gX11->xErrorToString(xRc).c_str());
+        logError("Error sending XA_XdndDrop event to wndCur=%#x: %s\n", m_wndCur, gX11->xErrorToString(xRc).c_str());
 
     m_wndCur = None;