Merge lp:~mhr3/libzeitgeist/various-fixes into lp:libzeitgeist

Proposed by Michal Hruby
Status: Merged
Merge reported by: Mikkel Kamstrup Erlandsen
Merged at revision: not available
Proposed branch: lp:~mhr3/libzeitgeist/various-fixes
Merge into: lp:libzeitgeist
Diff against target: 19 lines (+2/-2)
1 file modified
src/zeitgeist-log.c (+2/-2)
To merge this branch: bzr merge lp:~mhr3/libzeitgeist/various-fixes
Reviewer Review Type Date Requested Status
Mikkel Kamstrup Erlandsen Approve
Review via email: mp+28592@code.launchpad.net

Description of the change

Fixes a typo causing a crash.

To post a comment you must log in.
Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

Thanks!

review: Approve
lp:~mhr3/libzeitgeist/various-fixes updated
145. By Mikkel Kamstrup Erlandsen <kamstrup@hardback>

Merge patch from Michal Hruby, lp:~mhr3/libzeitgeist/various-fixes, that fixes a crasher when finalizing a ZeitgeistLog with active monitors installed

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 2010-06-10 09:29:53 +0000
+++ src/zeitgeist-log.c 2010-06-27 16:30:45 +0000
@@ -971,7 +971,7 @@
971 g_object_weak_ref (G_OBJECT (monitor),971 g_object_weak_ref (G_OBJECT (monitor),
972 (GWeakNotify) _zeitgeist_log_on_monitor_destroyed,972 (GWeakNotify) _zeitgeist_log_on_monitor_destroyed,
973 self);973 self);
974 g_hash_table_insert (priv->monitors, monitor, monitor);974 g_hash_table_insert (priv->monitors, monitor, self);
975975
976 _zeitgeist_log_install_monitor (self, monitor,976 _zeitgeist_log_install_monitor (self, monitor,
977 cancellable, callback, user_data);977 cancellable, callback, user_data);
@@ -1082,4 +1082,4 @@
1082 }1082 }
1083 g_free (name_owner);1083 g_free (name_owner);
1084 } 1084 }
1085}
1086\ No newline at end of file1085\ No newline at end of file
1086}

Subscribers

People subscribed via source and target branches