Geis

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

  1. remove-newline-from-diagnostics
  2. Merge into trunk
Proposed by Stephen M. Webb
Status: Merged
Merged at revision: 82
Proposed branch: lp:~oif-team/geis/remove-newline-from-diagnostics
Merge into: lp:geis
Diff against target: 122 lines (+14/-14)
1 file modified
libutouch-geis-xcb/geis_xcb.c (+14/-14)
To merge this branch: bzr merge lp:~oif-team/geis/remove-newline-from-diagnostics
Reviewer Review Type Date Requested Status
Duncan McGreggor (community) Approve
Review via email: mp+38215@code.launchpad.net

Commit message

Removed extra newlines from diagnostic messages.

Description of the change

Removed extra newlines from diagnostic messages.

To post a comment you must log in.
Revision history for this message
Duncan McGreggor (oubiwann) wrote :

Looks good :-)

review: Approve
Revision history for this message
Henrik Rydberg (rydberg) wrote :

Yep :-)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libutouch-geis-xcb/geis_xcb.c'
2--- libutouch-geis-xcb/geis_xcb.c 2010-10-08 12:30:19 +0000
3+++ libutouch-geis-xcb/geis_xcb.c 2010-10-12 12:43:41 +0000
4@@ -659,14 +659,14 @@
5 &error);
6 if (!version_reply)
7 {
8- geis_error("failed to receive gesture version reply\n");
9+ geis_error("failed to receive gesture version reply.");
10 goto error_exit;
11 }
12
13 if (version_reply->major_version != XCB_GESTURE_MAJOR_VERSION
14 && version_reply->minor_version != XCB_GESTURE_MINOR_VERSION)
15 {
16- geis_error("server supports unrecognized version: %d.%d\n",
17+ geis_error("server supports unrecognized version: %d.%d",
18 version_reply->major_version, version_reply->minor_version);
19 }
20
21@@ -739,7 +739,7 @@
22 {
23 xcb_gesture_notify_event_t *gesture_event = NULL;
24 if (event->response_type != GenericEvent) {
25- geis_warning("received non-generic event type: %d\n",
26+ geis_warning("received non-generic event type: %d",
27 event->response_type);
28 continue;
29 }
30@@ -747,14 +747,14 @@
31 gesture_event = (xcb_gesture_notify_event_t*)event;
32 if (gesture_event->extension != extension_info->major_opcode)
33 {
34- geis_warning("received non-gesture extension event: %d\n",
35+ geis_warning("received non-gesture extension event: %d",
36 gesture_event->extension);
37 continue;
38 }
39
40 if (gesture_event->event_type != XCB_GESTURE_NOTIFY)
41 {
42- geis_warning("received unrecognized gesture event type: %d\n",
43+ geis_warning("received unrecognized gesture event type: %d",
44 gesture_event->event_type);
45 continue;
46 }
47@@ -763,7 +763,7 @@
48 gesture_event->event);
49 if (!instance)
50 {
51- geis_error("no instance found for window_id 0x%08x\n",
52+ geis_error("no instance found for window_id 0x%08x",
53 gesture_event->event);
54 }
55 else
56@@ -844,7 +844,7 @@
57 &error);
58 if (!events_reply)
59 {
60- geis_error("failed to receive selected events reply\n");
61+ geis_error("failed to receive selected events reply");
62 goto really_done;
63 }
64
65@@ -858,7 +858,7 @@
66 mask_len_reply = xcb_gesture_event_mask_mask_data_length(event_mask);
67 if (mask_len_reply != mask_len)
68 {
69- geis_error("incorrect mask length returned by server - expected %d, got %d\n",
70+ geis_error("incorrect mask length returned by server - expected %d, got %d",
71 mask_len, mask_len_reply);
72 goto done;
73 }
74@@ -866,7 +866,7 @@
75 mask_reply = xcb_gesture_event_mask_mask_data(event_mask);
76 if (memcmp(mask, mask_reply, mask_len * 4) != 0)
77 {
78- geis_error("incorrect mask returned by server\n");
79+ geis_error("incorrect mask returned by server");
80 goto done;
81 }
82
83@@ -876,7 +876,7 @@
84
85 if (!device_is_found)
86 {
87- geis_error("gesture mask for device %d not returned by server\n", device_id);
88+ geis_error("gesture mask for device %d not returned by server", device_id);
89 goto done;
90 }
91
92@@ -904,11 +904,11 @@
93
94 if (gesture_list == GEIS_ALL_GESTURES)
95 {
96- geis_debug("subscribing device %d for the all gestures\n", device_id);
97+ geis_debug("subscribing device %d for all gestures", device_id);
98 }
99 else
100 {
101- geis_debug("subscribing device %d for the following gestures:\n", device_id);
102+ geis_debug("subscribing device %d for the following gestures:", device_id);
103 for (g = gesture_list; *g; ++g)
104 {
105 geis_debug("\t\"%s\"\n", *g);
106@@ -918,7 +918,7 @@
107 geis_xcb_map_gestures_to_mask(gesture_list, &mask, &mask_len);
108 if (!mask)
109 {
110- geis_error("failed to allocate mask\n");
111+ geis_error("failed to allocate mask");
112 goto really_done;
113 }
114
115@@ -930,7 +930,7 @@
116 error = xcb_request_check(xcb->connection, select_cookie);
117 if (error)
118 {
119- geis_error("failed to select events for window 0x%08x\n", window_id);
120+ geis_error("failed to select events for window 0x%08x", window_id);
121 goto done;
122 }
123

Subscribers

People subscribed via source and target branches

to all changes: