Merge lp:~rainct/libzeitgeist/typos into lp:libzeitgeist

Proposed by Siegfried Gevatter
Status: Merged
Approved by: Mikkel Kamstrup Erlandsen
Approved revision: 214
Merged at revision: 214
Proposed branch: lp:~rainct/libzeitgeist/typos
Merge into: lp:libzeitgeist
Diff against target: 33 lines (+4/-4)
1 file modified
src/zeitgeist-log.c (+4/-4)
To merge this branch: bzr merge lp:~rainct/libzeitgeist/typos
Reviewer Review Type Date Requested Status
Mikkel Kamstrup Erlandsen Approve
Review via email: mp+90683@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

Uhhhh... highly contentious patch! i'll only approve it because you're such a nice guy!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/zeitgeist-log.c'
--- src/zeitgeist-log.c 2011-10-13 15:03:20 +0000
+++ src/zeitgeist-log.c 2012-01-30 12:35:26 +0000
@@ -334,7 +334,7 @@
334 * @user_data: Any user data to pass back to @callback334 * @user_data: Any user data to pass back to @callback
335 * @VarArgs: A list of #ZeitgeistEvent<!-- -->s terminated by a %NULL335 * @VarArgs: A list of #ZeitgeistEvent<!-- -->s terminated by a %NULL
336 *336 *
337 * Asynchrnously send a set of events to the Zeitgeist daemon, requesting they337 * Asynchronously send a set of events to the Zeitgeist daemon, requesting they
338 * be inserted into the log.338 * be inserted into the log.
339 */339 */
340void340void
@@ -357,9 +357,9 @@
357 * @self: The log logging the events357 * @self: The log logging the events
358 * @VarArgs: A list of #ZeitgeistEvent<!-- -->s terminated by a %NULL358 * @VarArgs: A list of #ZeitgeistEvent<!-- -->s terminated by a %NULL
359 *359 *
360 * Asynchrnously send a set of events to the Zeitgeist daemon, requesting they360 * Asynchronously send a set of events to the Zeitgeist daemon, requesting they
361 * be inserted into the log. This method is &quot;fire and forget&quot; and the361 * be inserted into the log. This method is &quot;fire and forget&quot; and the
362 * caller will never know whether the events was succesfully inserted or not.362 * caller will never know whether the events was successfully inserted or not.
363 *363 *
364 * This method is exactly equivalent to calling zeitgeist_log_insert_events()364 * This method is exactly equivalent to calling zeitgeist_log_insert_events()
365 * with %NULL set as @cancellable, @callback, and @user_data.365 * with %NULL set as @cancellable, @callback, and @user_data.
@@ -392,7 +392,7 @@
392 * from C code it's generally more handy to use zeitgeist_log_insert_events()392 * from C code it's generally more handy to use zeitgeist_log_insert_events()
393 * or zeitgeist_log_insert_events_from_ptrarray().393 * or zeitgeist_log_insert_events_from_ptrarray().
394 * 394 *
395 * Asynchrnously send a set of events to the Zeitgeist daemon, requesting they395 * Asynchronously send a set of events to the Zeitgeist daemon, requesting they
396 * be inserted into the log.396 * be inserted into the log.
397 */397 */
398void398void

Subscribers

People subscribed via source and target branches