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

[Michal Hruby]

Fixes marshaling of ZeitgeistSubject.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Merged - I also added a new unit test that catches this error

review: Approve

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

112. By Mikkel Kamstrup Erlandsen <kamstrup@hardback> on 2010-05-04

Merge Michal Hruby's branch lp:~mhr3/libzeitgeist/various-fixes which fixes dbus marshalling of events with empty subjects.

Added a unit test that catches this case.

=== modified file 'src/zeitgeist-eggdbusconversions.c'
--- src/zeitgeist-eggdbusconversions.c	2010-04-19 14:58:18 +0000
+++ src/zeitgeist-eggdbusconversions.c	2010-05-04 16:38:20 +0000
@@ -154,26 +154,33 @@
       subject_data = g_new0 (gchar*,
                              EGG_ZEITGEIST_SUBJECT_DATA_OFFSET_STORAGE + 2);
 
+      val = zeitgeist_subject_get_uri (subject);
       subject_data[EGG_ZEITGEIST_SUBJECT_DATA_OFFSET_URI] =
-        g_strdup (zeitgeist_subject_get_uri (subject));
+        g_strdup (val ? val : "");
 
+      val = zeitgeist_subject_get_interpretation (subject);
       subject_data[EGG_ZEITGEIST_SUBJECT_DATA_OFFSET_INTERPRETATION] =
-        g_strdup (zeitgeist_subject_get_interpretation (subject));
+        g_strdup (val ? val : "");
 
+      val = zeitgeist_subject_get_manifestation (subject);
       subject_data[EGG_ZEITGEIST_SUBJECT_DATA_OFFSET_MANIFESTATION] =
-        g_strdup (zeitgeist_subject_get_manifestation (subject));
+        g_strdup (val ? val : "");
 
+      val = zeitgeist_subject_get_mimetype (subject);
       subject_data[EGG_ZEITGEIST_SUBJECT_DATA_OFFSET_MIMETYPE] =
-        g_strdup (zeitgeist_subject_get_mimetype (subject));
+        g_strdup (val ? val : "");
 
+      val = zeitgeist_subject_get_origin (subject);
       subject_data[EGG_ZEITGEIST_SUBJECT_DATA_OFFSET_ORIGIN] =
-        g_strdup (zeitgeist_subject_get_origin (subject));
+        g_strdup (val ? val : "");
 
+      val = zeitgeist_subject_get_text (subject);
       subject_data[EGG_ZEITGEIST_SUBJECT_DATA_OFFSET_TEXT] =
-        g_strdup (zeitgeist_subject_get_text (subject));
+        g_strdup (val ? val : "");
 
+      val = zeitgeist_subject_get_storage (subject);
       subject_data[EGG_ZEITGEIST_SUBJECT_DATA_OFFSET_STORAGE] =
-        g_strdup (zeitgeist_subject_get_storage (subject));
+        g_strdup (val ? val : "");
 
       /* The array takes ownership of subject_data */
       egg_dbus_array_seq_add (subjects_data, subject_data);
@@ -283,4 +290,4 @@
                                      egg_zeitgeist_time_range_get_end (time_range));
 
   return result;
-}
\ No newline at end of file
+}