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

[Michal Hruby]

Fixes memory leak in conversion from ZeitgeistEvent to EggZeitgeistEvent.

Another thing to consider is ref sinking the events created in call to ie find_events_finish, should this be done? Basically they can be considered as owned by the PtrArray, so I think it makes sense.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Good spot! Thanks a bunch!

review: Approve (make check, and code review)

[lp:~mhr3/libzeitgeist/various-fixes]

113. By Mikkel Kamstrup Erlandsen <kamstrup@hardback> on 2010-05-09

Merge Michal Hruby's branch, lp:~mhr3/libzeitgeist/various-fixes, fixing a memleak in _zeitgeist_event_to_egg_zeitgeist_event

=== modified file 'bindings/zeitgeist-1.0.metadata'
--- bindings/zeitgeist-1.0.metadata	2010-04-28 13:11:28 +0000
+++ bindings/zeitgeist-1.0.metadata	2010-05-09 12:36:28 +0000
@@ -26,6 +26,7 @@
 zeitgeist_log_install_monitor async="1"
 zeitgeist_log_remove_monitor async="1"
 zeitgeist_event_new_full ellipsis="1"
+zeitgeist_event_set_payload.payload transfer_ownership="1"
 zeitgeist_monitor_new.event_templates transfer_ownership="1"
 
 zeitgeist_log_*.cancellable nullable="1"
 
=== modified file 'src/zeitgeist-eggdbusconversions.c'
--- src/zeitgeist-eggdbusconversions.c	2010-04-30 15:12:17 +0000
+++ src/zeitgeist-eggdbusconversions.c	2010-05-09 12:36:28 +0000
@@ -112,12 +112,13 @@
 EggZeitgeistEvent*
 _zeitgeist_event_to_egg_zeitgeist_event (ZeitgeistEvent *event)
 {
+  EggZeitgeistEvent *result;
   ZeitgeistSubject  *subject;
   EggDBusArraySeq   *subjects_data, *payload_data;
   GByteArray        *payload;
   gchar            **event_data, **subject_data;
   const gchar       *val;
-  gint               num_subjects, i; 
+  gint               num_subjects, i;
 
   /* Event metadata */
   event_data = g_new0 (gchar*, EGG_ZEITGEIST_EVENT_DATA_OFFSET_ACTOR + 2);
@@ -197,8 +198,14 @@
           egg_dbus_array_seq_add_fixed (payload_data, payload->data[i]);
         }
     }
-  
-  return egg_zeitgeist_event_new (event_data, subjects_data, payload_data);
+
+  result = egg_zeitgeist_event_new (event_data, subjects_data, payload_data);
+
+  g_strfreev (event_data);
+  g_object_unref (subjects_data);
+  g_object_unref (payload_data);
+
+  return result;
 }
 
 GPtrArray*