Merge lp:~oif-team/geis/remove-newline-from-diagnostics into lp:geis

[Stephen M. Webb]

Removed extra newlines from diagnostic messages.

Removed extra newlines from diagnostic messages.

[Duncan McGreggor (oubiwann)]

Looks good :-)

review: Approve

[Henrik Rydberg (rydberg)]

Yep :-)

=== modified file 'libutouch-geis-xcb/geis_xcb.c'
--- libutouch-geis-xcb/geis_xcb.c	2010-10-08 12:30:19 +0000
+++ libutouch-geis-xcb/geis_xcb.c	2010-10-12 12:43:41 +0000
@@ -659,14 +659,14 @@
                                                     &error);
     if (!version_reply)
     {
-      geis_error("failed to receive gesture version reply\n");
+      geis_error("failed to receive gesture version reply.");
       goto error_exit;
     }
 
     if (version_reply->major_version != XCB_GESTURE_MAJOR_VERSION
      && version_reply->minor_version != XCB_GESTURE_MINOR_VERSION)
     {
-      geis_error("server supports unrecognized version: %d.%d\n",
+      geis_error("server supports unrecognized version: %d.%d",
                  version_reply->major_version, version_reply->minor_version);
     }
 
@@ -739,7 +739,7 @@
     {
       xcb_gesture_notify_event_t *gesture_event = NULL;
       if (event->response_type != GenericEvent) {
-	geis_warning("received non-generic event type: %d\n",
+	geis_warning("received non-generic event type: %d",
 	             event->response_type);
 	continue;
       }
@@ -747,14 +747,14 @@
       gesture_event = (xcb_gesture_notify_event_t*)event;
       if (gesture_event->extension != extension_info->major_opcode)
       {
-	geis_warning("received non-gesture extension event: %d\n",
+	geis_warning("received non-gesture extension event: %d",
 	             gesture_event->extension);
 	continue;
       }
 
       if (gesture_event->event_type != XCB_GESTURE_NOTIFY)
       {
-	geis_warning("received unrecognized gesture event type: %d\n",
+	geis_warning("received unrecognized gesture event type: %d",
 	             gesture_event->event_type);
 	continue;
       }
@@ -763,7 +763,7 @@
                                                       gesture_event->event);
       if (!instance)
       {
-	geis_error("no instance found for window_id 0x%08x\n",
+	geis_error("no instance found for window_id 0x%08x",
 	           gesture_event->event);
       }
       else
@@ -844,7 +844,7 @@
                                                        &error);
   if (!events_reply)
   {
-    geis_error("failed to receive selected events reply\n");
+    geis_error("failed to receive selected events reply");
     goto really_done;
   }
 
@@ -858,7 +858,7 @@
       mask_len_reply = xcb_gesture_event_mask_mask_data_length(event_mask);
       if (mask_len_reply != mask_len)
       {
-	geis_error("incorrect mask length returned by server - expected %d, got %d\n",
+	geis_error("incorrect mask length returned by server - expected %d, got %d",
 	           mask_len, mask_len_reply);
 	goto done;
       }
@@ -866,7 +866,7 @@
       mask_reply = xcb_gesture_event_mask_mask_data(event_mask);
       if (memcmp(mask, mask_reply, mask_len * 4) != 0)
       {
-	geis_error("incorrect mask returned by server\n");
+	geis_error("incorrect mask returned by server");
 	goto done;
       }
 
@@ -876,7 +876,7 @@
 
   if (!device_is_found)
   {
-    geis_error("gesture mask for device %d not returned by server\n", device_id);
+    geis_error("gesture mask for device %d not returned by server", device_id);
     goto done;
   }
 
@@ -904,11 +904,11 @@
 
   if (gesture_list == GEIS_ALL_GESTURES)
   {
-    geis_debug("subscribing device %d for the all gestures\n", device_id);
+    geis_debug("subscribing device %d for all gestures", device_id);
   }
   else
   {
-    geis_debug("subscribing device %d for the following gestures:\n", device_id);
+    geis_debug("subscribing device %d for the following gestures:", device_id);
     for (g = gesture_list; *g; ++g)
     {
       geis_debug("\t\"%s\"\n", *g);
@@ -918,7 +918,7 @@
   geis_xcb_map_gestures_to_mask(gesture_list, &mask, &mask_len);
   if (!mask)
   {
-    geis_error("failed to allocate mask\n");
+    geis_error("failed to allocate mask");
     goto really_done;
   }
 
@@ -930,7 +930,7 @@
   error = xcb_request_check(xcb->connection, select_cookie);
   if (error)
   {
-    geis_error("failed to select events for window 0x%08x\n", window_id);
+    geis_error("failed to select events for window 0x%08x", window_id);
     goto done;
   }