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

Proposed by Michal Hruby
Status: Merged
Merged at revision: 112
Proposed branch: lp:~mhr3/libzeitgeist/various-fixes
Merge into: lp:libzeitgeist
Diff against target: 51 lines (+15/-8)
1 file modified
src/zeitgeist-eggdbusconversions.c (+15/-8)
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+24692@code.launchpad.net

Description of the change

Fixes marshaling of ZeitgeistSubject.

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

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

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

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
154 subject_data = g_new0 (gchar*,154 subject_data = g_new0 (gchar*,
155 EGG_ZEITGEIST_SUBJECT_DATA_OFFSET_STORAGE + 2);155 EGG_ZEITGEIST_SUBJECT_DATA_OFFSET_STORAGE + 2);
156156
157 val = zeitgeist_subject_get_uri (subject);
157 subject_data[EGG_ZEITGEIST_SUBJECT_DATA_OFFSET_URI] =158 subject_data[EGG_ZEITGEIST_SUBJECT_DATA_OFFSET_URI] =
158 g_strdup (zeitgeist_subject_get_uri (subject));159 g_strdup (val ? val : "");
159160
161 val = zeitgeist_subject_get_interpretation (subject);
160 subject_data[EGG_ZEITGEIST_SUBJECT_DATA_OFFSET_INTERPRETATION] =162 subject_data[EGG_ZEITGEIST_SUBJECT_DATA_OFFSET_INTERPRETATION] =
161 g_strdup (zeitgeist_subject_get_interpretation (subject));163 g_strdup (val ? val : "");
162164
165 val = zeitgeist_subject_get_manifestation (subject);
163 subject_data[EGG_ZEITGEIST_SUBJECT_DATA_OFFSET_MANIFESTATION] =166 subject_data[EGG_ZEITGEIST_SUBJECT_DATA_OFFSET_MANIFESTATION] =
164 g_strdup (zeitgeist_subject_get_manifestation (subject));167 g_strdup (val ? val : "");
165168
169 val = zeitgeist_subject_get_mimetype (subject);
166 subject_data[EGG_ZEITGEIST_SUBJECT_DATA_OFFSET_MIMETYPE] =170 subject_data[EGG_ZEITGEIST_SUBJECT_DATA_OFFSET_MIMETYPE] =
167 g_strdup (zeitgeist_subject_get_mimetype (subject));171 g_strdup (val ? val : "");
168172
173 val = zeitgeist_subject_get_origin (subject);
169 subject_data[EGG_ZEITGEIST_SUBJECT_DATA_OFFSET_ORIGIN] =174 subject_data[EGG_ZEITGEIST_SUBJECT_DATA_OFFSET_ORIGIN] =
170 g_strdup (zeitgeist_subject_get_origin (subject));175 g_strdup (val ? val : "");
171176
177 val = zeitgeist_subject_get_text (subject);
172 subject_data[EGG_ZEITGEIST_SUBJECT_DATA_OFFSET_TEXT] =178 subject_data[EGG_ZEITGEIST_SUBJECT_DATA_OFFSET_TEXT] =
173 g_strdup (zeitgeist_subject_get_text (subject));179 g_strdup (val ? val : "");
174180
181 val = zeitgeist_subject_get_storage (subject);
175 subject_data[EGG_ZEITGEIST_SUBJECT_DATA_OFFSET_STORAGE] =182 subject_data[EGG_ZEITGEIST_SUBJECT_DATA_OFFSET_STORAGE] =
176 g_strdup (zeitgeist_subject_get_storage (subject));183 g_strdup (val ? val : "");
177184
178 /* The array takes ownership of subject_data */185 /* The array takes ownership of subject_data */
179 egg_dbus_array_seq_add (subjects_data, subject_data);186 egg_dbus_array_seq_add (subjects_data, subject_data);
@@ -283,4 +290,4 @@
283 egg_zeitgeist_time_range_get_end (time_range));290 egg_zeitgeist_time_range_get_end (time_range));
284291
285 return result;292 return result;
286}
287\ No newline at end of file293\ No newline at end of file
294}

Subscribers

People subscribed via source and target branches