Browse Source

Fix some inappropriate format specifiers

A "0x" prefix suggest hexadecimal values, not decimal.
tags/v1.10.90
Pierre Ossman 4 years ago
parent
commit
575b232844
2 changed files with 7 additions and 7 deletions
  1. 3
    3
      vncviewer/XInputTouchHandler.cxx
  2. 4
    4
      vncviewer/touch.cxx

+ 3
- 3
vncviewer/XInputTouchHandler.cxx View File

@@ -99,9 +99,9 @@ bool XInputTouchHandler::grabPointer()
curmasks = XIGetSelectedEvents(fl_display, wnd, &num_masks);
if (curmasks == NULL) {
if (num_masks == -1)
vlog.error(_("Unable to get X Input 2 event mask for window 0x%08lu"), wnd);
vlog.error(_("Unable to get X Input 2 event mask for window 0x%08lx"), wnd);
else
vlog.error(_("Window 0x%08lu has no X Input 2 event mask"), wnd);
vlog.error(_("Window 0x%08lx has no X Input 2 event mask"), wnd);

return false;
}
@@ -109,7 +109,7 @@ bool XInputTouchHandler::grabPointer()
// Our windows should only have a single mask, which allows us to
// simplify all the code handling the masks
if (num_masks > 1) {
vlog.error(_("Window 0x%08lu has more than one X Input 2 event mask"), wnd);
vlog.error(_("Window 0x%08lx has more than one X Input 2 event mask"), wnd);
return false;
}


+ 4
- 4
vncviewer/touch.cxx View File

@@ -104,14 +104,14 @@ static void x11_change_touch_ownership(bool enable)
curmasks = XIGetSelectedEvents(fl_display, iter->first, &num_masks);
if (curmasks == NULL) {
if (num_masks == -1)
vlog.error(_("Unable to get X Input 2 event mask for window 0x%08lu"), iter->first);
vlog.error(_("Unable to get X Input 2 event mask for window 0x%08lx"), iter->first);
continue;
}

// Our windows should only have a single mask, which allows us to
// simplify all the code handling the masks
if (num_masks > 1) {
vlog.error(_("Window 0x%08lu has more than one X Input 2 event mask"), iter->first);
vlog.error(_("Window 0x%08lx has more than one X Input 2 event mask"), iter->first);
continue;
}

@@ -135,7 +135,7 @@ bool x11_grab_pointer(Window window)
bool ret;

if (handlers.count(window) == 0) {
vlog.error(_("Invalid window 0x%08lu specified for pointer grab"), window);
vlog.error(_("Invalid window 0x%08lx specified for pointer grab"), window);
return BadWindow;
}

@@ -157,7 +157,7 @@ bool x11_grab_pointer(Window window)
void x11_ungrab_pointer(Window window)
{
if (handlers.count(window) == 0) {
vlog.error(_("Invalid window 0x%08lu specified for pointer grab"), window);
vlog.error(_("Invalid window 0x%08lx specified for pointer grab"), window);
return;
}


Loading…
Cancel
Save