Merge lp:~mhr3/libzeitgeist/new-result-types into lp:libzeitgeist

Proposed by Michal Hruby
Status: Merged
Merged at revision: 232
Proposed branch: lp:~mhr3/libzeitgeist/new-result-types
Merge into: lp:libzeitgeist
Diff against target: 675 lines (+265/-214)
8 files modified
bindings/zeitgeist-1.0.gi (+8/-0)
bindings/zeitgeist-1.0.vapi (+8/-0)
configure.ac (+1/-1)
doc/reference/zeitgeist-1.0-sections.txt (+228/-209)
src/zeitgeist-enums.h (+16/-0)
src/zeitgeist-event.c (+2/-2)
src/zeitgeist-subject.c (+1/-1)
src/zeitgeist-timerange.c (+1/-1)
To merge this branch: bzr merge lp:~mhr3/libzeitgeist/new-result-types
Reviewer Review Type Date Requested Status
Siegfried Gevatter Approve
Review via email: mp+100593@code.launchpad.net

Description of the change

Added missing result types, re-generated vapi, refreshed documentation.

To post a comment you must log in.
Revision history for this message
Siegfried Gevatter (rainct) wrote :

Nice.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bindings/zeitgeist-1.0.gi'
2--- bindings/zeitgeist-1.0.gi 2012-02-13 11:07:20 +0000
3+++ bindings/zeitgeist-1.0.gi 2012-04-03 12:42:19 +0000
4@@ -174,6 +174,14 @@
5 <member name="ZEITGEIST_RESULT_TYPE_LEAST_RECENT_MIMETYPE" value="20"/>
6 <member name="ZEITGEIST_RESULT_TYPE_MOST_POPULAR_MIMETYPE" value="21"/>
7 <member name="ZEITGEIST_RESULT_TYPE_LEAST_POPULAR_MIMETYPE" value="22"/>
8+ <member name="ZEITGEIST_RESULT_TYPE_MOST_RECENT_CURRENT_URI" value="23"/>
9+ <member name="ZEITGEIST_RESULT_TYPE_LEAST_RECENT_CURRENT_URI" value="24"/>
10+ <member name="ZEITGEIST_RESULT_TYPE_MOST_POPULAR_CURRENT_URI" value="25"/>
11+ <member name="ZEITGEIST_RESULT_TYPE_LEAST_POPULAR_CURRENT_URI" value="26"/>
12+ <member name="ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENT_ORIGIN" value="27"/>
13+ <member name="ZEITGEIST_RESULT_TYPE_LEAST_RECENT_EVENT_ORIGIN" value="28"/>
14+ <member name="ZEITGEIST_RESULT_TYPE_MOST_POPULAR_EVENT_ORIGIN" value="29"/>
15+ <member name="ZEITGEIST_RESULT_TYPE_LEAST_POPULAR_EVENT_ORIGIN" value="30"/>
16 <member name="ZEITGEIST_RESULT_TYPE_RELEVANCY" value="100"/>
17 </enum>
18 <enum name="ZeitgeistStorageState" type-name="ZeitgeistStorageState" get-type="zeitgeist_storage_state_get_type">
19
20=== modified file 'bindings/zeitgeist-1.0.vapi'
21--- bindings/zeitgeist-1.0.vapi 2012-02-13 11:07:20 +0000
22+++ bindings/zeitgeist-1.0.vapi 2012-04-03 12:42:19 +0000
23@@ -238,6 +238,14 @@
24 LEAST_RECENT_MIMETYPE,
25 MOST_POPULAR_MIMETYPE,
26 LEAST_POPULAR_MIMETYPE,
27+ MOST_RECENT_CURRENT_URI,
28+ LEAST_RECENT_CURRENT_URI,
29+ MOST_POPULAR_CURRENT_URI,
30+ LEAST_POPULAR_CURRENT_URI,
31+ MOST_RECENT_EVENT_ORIGIN,
32+ LEAST_RECENT_EVENT_ORIGIN,
33+ MOST_POPULAR_EVENT_ORIGIN,
34+ LEAST_POPULAR_EVENT_ORIGIN,
35 RELEVANCY
36 }
37 [CCode (cheader_filename = "zeitgeist.h", cprefix = "ZEITGEIST_STORAGE_STATE_")]
38
39=== modified file 'configure.ac'
40--- configure.ac 2012-03-20 16:56:35 +0000
41+++ configure.ac 2012-04-03 12:42:19 +0000
42@@ -1,5 +1,5 @@
43 # When releasing also remember to update the soname as instructed below
44-AC_INIT(libzeitgeist, 0.3.16)
45+AC_INIT(libzeitgeist, 0.3.17)
46
47 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
48 AM_CONFIG_HEADER(config.h)
49
50=== modified file 'doc/reference/zeitgeist-1.0-sections.txt'
51--- doc/reference/zeitgeist-1.0-sections.txt 2010-11-16 12:59:30 +0000
52+++ doc/reference/zeitgeist-1.0-sections.txt 2012-04-03 12:42:19 +0000
53@@ -3,94 +3,119 @@
54 <TITLE>ZeitgeistDataSource</TITLE>
55 ZeitgeistDataSource
56 ZeitgeistDataSourceClass
57+zeitgeist_data_source_get_description
58+zeitgeist_data_source_get_event_templates
59+zeitgeist_data_source_get_name
60+zeitgeist_data_source_get_timestamp
61+zeitgeist_data_source_get_unique_id
62+zeitgeist_data_source_is_enabled
63+zeitgeist_data_source_is_running
64 zeitgeist_data_source_new
65+zeitgeist_data_source_new_from_variant
66 zeitgeist_data_source_new_full
67-zeitgeist_data_source_new_from_variant
68-zeitgeist_data_source_get_unique_id
69-zeitgeist_data_source_set_unique_id
70-zeitgeist_data_source_get_name
71-zeitgeist_data_source_set_name
72-zeitgeist_data_source_get_description
73 zeitgeist_data_source_set_description
74-zeitgeist_data_source_get_event_templates
75+zeitgeist_data_source_set_enabled
76 zeitgeist_data_source_set_event_templates
77-zeitgeist_data_source_is_running
78+zeitgeist_data_source_set_name
79 zeitgeist_data_source_set_running
80-zeitgeist_data_source_get_timestamp
81 zeitgeist_data_source_set_timestamp
82-zeitgeist_data_source_is_enabled
83-zeitgeist_data_source_set_enabled
84+zeitgeist_data_source_set_unique_id
85 zeitgeist_data_source_to_variant
86+zeitgeist_data_source_to_variant_full
87+zeitgeist_data_sources_from_variant
88 zeitgeist_data_sources_to_variant
89-zeitgeist_data_sources_from_variant
90-ZEITGEIST_DATA_SOURCE_VARIANT_SIGNATURE
91-ZEITGEIST_DATA_SOURCE_VARIANT_TYPE
92 <SUBSECTION Standard>
93 ZEITGEIST_DATA_SOURCE
94+ZEITGEIST_DATA_SOURCE_CLASS
95+ZEITGEIST_DATA_SOURCE_GET_CLASS
96 ZEITGEIST_IS_DATA_SOURCE
97+ZEITGEIST_IS_DATA_SOURCE_CLASS
98 ZEITGEIST_TYPE_DATA_SOURCE
99 zeitgeist_data_source_get_type
100-ZEITGEIST_DATA_SOURCE_CLASS
101-ZEITGEIST_IS_DATA_SOURCE_CLASS
102-ZEITGEIST_DATA_SOURCE_GET_CLASS
103-</SECTION>
104-
105-<SECTION>
106-<FILE>zeitgeist-subject</FILE>
107-<TITLE>ZeitgeistSubject</TITLE>
108-ZeitgeistSubject
109-ZeitgeistSubjectClass
110-zeitgeist_subject_new
111-zeitgeist_subject_new_full
112-zeitgeist_subject_get_uri
113-zeitgeist_subject_set_uri
114-zeitgeist_subject_get_interpretation
115-zeitgeist_subject_set_interpretation
116-zeitgeist_subject_get_manifestation
117-zeitgeist_subject_set_manifestation
118-zeitgeist_subject_get_mimetype
119-zeitgeist_subject_set_mimetype
120-zeitgeist_subject_get_origin
121-zeitgeist_subject_set_origin
122-zeitgeist_subject_get_text
123-zeitgeist_subject_set_text
124-zeitgeist_subject_get_storage
125-zeitgeist_subject_set_storage
126-<SUBSECTION Standard>
127-ZEITGEIST_SUBJECT
128-ZEITGEIST_IS_SUBJECT
129-ZEITGEIST_TYPE_SUBJECT
130-zeitgeist_subject_get_type
131-ZEITGEIST_SUBJECT_CLASS
132-ZEITGEIST_IS_SUBJECT_CLASS
133-ZEITGEIST_SUBJECT_GET_CLASS
134-</SECTION>
135-
136-<SECTION>
137-<FILE>zeitgeist-timerange</FILE>
138-<TITLE>ZeitgeistTimeRange</TITLE>
139-ZeitgeistTimeRange
140-ZeitgeistTimeRangeClass
141-zeitgeist_time_range_new
142-zeitgeist_time_range_new_from_variant
143-zeitgeist_time_range_new_from_now
144-zeitgeist_time_range_new_to_now
145-zeitgeist_time_range_new_anytime
146-zeitgeist_time_range_get_start
147-zeitgeist_time_range_get_end
148-zeitgeist_time_range_get_start_iso8601
149-zeitgeist_time_range_get_end_iso8601
150-zeitgeist_time_range_to_variant
151-ZEITGEIST_TIME_RANGE_VARIANT_SIGNATURE
152-ZEITGEIST_TIME_RANGE_VARIANT_TYPE
153-<SUBSECTION Standard>
154-ZEITGEIST_TIME_RANGE
155-ZEITGEIST_IS_TIME_RANGE
156-ZEITGEIST_TYPE_TIME_RANGE
157-zeitgeist_time_range_get_type
158-ZEITGEIST_TIME_RANGE_CLASS
159-ZEITGEIST_IS_TIME_RANGE_CLASS
160-ZEITGEIST_TIME_RANGE_GET_CLASS
161+</SECTION>
162+
163+<SECTION>
164+<FILE>zeitgeist-data-source-registry</FILE>
165+<TITLE>ZeitgeistDataSourceRegistry</TITLE>
166+ZeitgeistDataSourceRegistry
167+ZeitgeistDataSourceRegistryClass
168+zeitgeist_data_source_registry_get_data_sources
169+zeitgeist_data_source_registry_get_data_sources_finish
170+zeitgeist_data_source_registry_new
171+zeitgeist_data_source_registry_register_data_source
172+zeitgeist_data_source_registry_register_data_source_finish
173+zeitgeist_data_source_registry_set_data_source_enabled
174+zeitgeist_data_source_registry_set_data_source_enabled_finish
175+<SUBSECTION Standard>
176+ZEITGEIST_DATA_SOURCE_REGISTRY
177+ZEITGEIST_DATA_SOURCE_REGISTRY_CLASS
178+ZEITGEIST_DATA_SOURCE_REGISTRY_GET_CLASS
179+ZEITGEIST_IS_DATA_SOURCE_REGISTRY
180+ZEITGEIST_IS_DATA_SOURCE_REGISTRY_CLASS
181+ZEITGEIST_TYPE_DATA_SOURCE_REGISTRY
182+zeitgeist_data_source_registry_get_type
183+</SECTION>
184+
185+<SECTION>
186+<FILE>zeitgeist-enums</FILE>
187+<TITLE>Enumerations</TITLE>
188+zeitgeist_result_type_get_type
189+ZEITGEIST_TYPE_RESULT_TYPE
190+ZeitgeistResultType
191+zeitgeist_storage_state_get_type
192+ZEITGEIST_TYPE_STORAGE_STATE
193+ZeitgeistStorageState
194+</SECTION>
195+
196+
197+<SECTION>
198+<FILE>zeitgeist-enumtypes</FILE>
199+<SUBSECTION Standard>
200+ZEITGEIST_TYPE_RESULT_TYPE
201+ZEITGEIST_TYPE_STORAGE_STATE
202+zeitgeist_result_type_get_type
203+zeitgeist_storage_state_get_type
204+</SECTION>
205+
206+<SECTION>
207+<FILE>zeitgeist-event</FILE>
208+<TITLE>ZeitgeistEvent</TITLE>
209+ZeitgeistEvent
210+ZeitgeistEventClass
211+zeitgeist_event_add_subject
212+zeitgeist_event_get_actor
213+zeitgeist_event_get_id
214+zeitgeist_event_get_interpretation
215+zeitgeist_event_get_manifestation
216+zeitgeist_event_get_origin
217+zeitgeist_event_get_payload
218+zeitgeist_event_get_subject
219+zeitgeist_event_get_timestamp
220+zeitgeist_event_new
221+zeitgeist_event_new_from_variant
222+zeitgeist_event_new_full
223+zeitgeist_event_new_full_valist
224+zeitgeist_event_num_subjects
225+zeitgeist_event_set_actor
226+zeitgeist_event_set_actor_from_app_info
227+zeitgeist_event_set_id
228+zeitgeist_event_set_interpretation
229+zeitgeist_event_set_manifestation
230+zeitgeist_event_set_origin
231+zeitgeist_event_set_payload
232+zeitgeist_event_set_timestamp
233+zeitgeist_event_to_variant
234+zeitgeist_events_from_valist
235+zeitgeist_events_from_variant
236+zeitgeist_events_to_variant
237+<SUBSECTION Standard>
238+ZEITGEIST_EVENT
239+ZEITGEIST_EVENT_CLASS
240+ZEITGEIST_EVENT_GET_CLASS
241+ZEITGEIST_IS_EVENT
242+ZEITGEIST_IS_EVENT_CLASS
243+ZEITGEIST_TYPE_EVENT
244+zeitgeist_event_get_type
245 </SECTION>
246
247 <SECTION>
248@@ -101,14 +126,56 @@
249 zeitgeist_index_new
250 zeitgeist_index_search
251 zeitgeist_index_search_finish
252+zeitgeist_index_search_with_relevancies
253+zeitgeist_index_search_with_relevancies_finish
254 <SUBSECTION Standard>
255 ZEITGEIST_INDEX
256+ZEITGEIST_INDEX_CLASS
257+ZEITGEIST_INDEX_GET_CLASS
258 ZEITGEIST_IS_INDEX
259+ZEITGEIST_IS_INDEX_CLASS
260 ZEITGEIST_TYPE_INDEX
261 zeitgeist_index_get_type
262-ZEITGEIST_INDEX_CLASS
263-ZEITGEIST_IS_INDEX_CLASS
264-ZEITGEIST_INDEX_GET_CLASS
265+</SECTION>
266+
267+<SECTION>
268+<FILE>zeitgeist-log</FILE>
269+<TITLE>ZeitgeistLog</TITLE>
270+ZeitgeistLog
271+ZeitgeistLogClass
272+zeitgeist_log_delete_events
273+zeitgeist_log_delete_events_finish
274+zeitgeist_log_delete_log
275+zeitgeist_log_delete_log_finish
276+zeitgeist_log_find_event_ids
277+zeitgeist_log_find_event_ids_finish
278+zeitgeist_log_find_events
279+zeitgeist_log_find_events_finish
280+zeitgeist_log_find_related_uris
281+zeitgeist_log_find_related_uris_finish
282+zeitgeist_log_get_default
283+zeitgeist_log_get_events
284+zeitgeist_log_get_events_finish
285+zeitgeist_log_get_version
286+zeitgeist_log_insert_events
287+zeitgeist_log_insert_events_finish
288+zeitgeist_log_insert_events_from_ptrarray
289+zeitgeist_log_insert_events_no_reply
290+zeitgeist_log_insert_events_valist
291+zeitgeist_log_install_monitor
292+zeitgeist_log_is_connected
293+zeitgeist_log_new
294+zeitgeist_log_quit
295+zeitgeist_log_quit_finish
296+zeitgeist_log_remove_monitor
297+<SUBSECTION Standard>
298+ZEITGEIST_IS_LOG
299+ZEITGEIST_IS_LOG_CLASS
300+ZEITGEIST_LOG
301+ZEITGEIST_LOG_CLASS
302+ZEITGEIST_LOG_GET_CLASS
303+ZEITGEIST_TYPE_LOG
304+zeitgeist_log_get_type
305 </SECTION>
306
307 <SECTION>
308@@ -132,67 +199,6 @@
309 </SECTION>
310
311 <SECTION>
312-<FILE>zeitgeist-event</FILE>
313-<TITLE>ZeitgeistEvent</TITLE>
314-ZeitgeistEvent
315-ZeitgeistEventClass
316-zeitgeist_event_new
317-zeitgeist_event_new_full
318-zeitgeist_event_new_full_valist
319-zeitgeist_event_new_from_variant
320-zeitgeist_event_get_id
321-zeitgeist_event_set_id
322-zeitgeist_event_get_timestamp
323-zeitgeist_event_set_timestamp
324-zeitgeist_event_get_interpretation
325-zeitgeist_event_set_interpretation
326-zeitgeist_event_get_manifestation
327-zeitgeist_event_set_manifestation
328-zeitgeist_event_get_actor
329-zeitgeist_event_set_actor
330-zeitgeist_event_set_actor_from_app_info
331-zeitgeist_event_get_subject
332-zeitgeist_event_num_subjects
333-zeitgeist_event_add_subject
334-zeitgeist_event_get_payload
335-zeitgeist_event_set_payload
336-zeitgeist_events_from_variant
337-zeitgeist_events_to_variant
338-ZEITGEIST_EVENT_VARIANT_SIGNATURE
339-ZEITGEIST_EVENT_VARIANT_TYPE
340-<SUBSECTION Standard>
341-ZEITGEIST_EVENT
342-ZEITGEIST_IS_EVENT
343-ZEITGEIST_TYPE_EVENT
344-zeitgeist_event_get_type
345-ZEITGEIST_EVENT_CLASS
346-ZEITGEIST_IS_EVENT_CLASS
347-ZEITGEIST_EVENT_GET_CLASS
348-</SECTION>
349-
350-<SECTION>
351-<FILE>zeitgeist-data-source-registry</FILE>
352-<TITLE>ZeitgeistDataSourceRegistry</TITLE>
353-ZeitgeistDataSourceRegistry
354-ZeitgeistDataSourceRegistryClass
355-zeitgeist_data_source_registry_new
356-zeitgeist_data_source_registry_get_data_sources
357-zeitgeist_data_source_registry_get_data_sources_finish
358-zeitgeist_data_source_registry_register_data_source
359-zeitgeist_data_source_registry_register_data_source_finish
360-zeitgeist_data_source_registry_set_data_source_enabled
361-zeitgeist_data_source_registry_set_data_source_enabled_finish
362-<SUBSECTION Standard>
363-ZEITGEIST_DATA_SOURCE_REGISTRY
364-ZEITGEIST_IS_DATA_SOURCE_REGISTRY
365-ZEITGEIST_TYPE_DATA_SOURCE_REGISTRY
366-zeitgeist_data_source_registry_get_type
367-ZEITGEIST_DATA_SOURCE_REGISTRY_CLASS
368-ZEITGEIST_IS_DATA_SOURCE_REGISTRY_CLASS
369-ZEITGEIST_DATA_SOURCE_REGISTRY_GET_CLASS
370-</SECTION>
371-
372-<SECTION>
373 <FILE>zeitgeist-monitor</FILE>
374 <TITLE>ZeitgeistMonitor</TITLE>
375 ZeitgeistMonitor
376@@ -212,62 +218,6 @@
377 </SECTION>
378
379 <SECTION>
380-<FILE>zeitgeist-log</FILE>
381-<TITLE>ZeitgeistLog</TITLE>
382-ZeitgeistLog
383-ZeitgeistLogClass
384-zeitgeist_log_new
385-zeitgeist_log_insert_events
386-zeitgeist_log_insert_events_no_reply
387-zeitgeist_log_insert_events_valist
388-zeitgeist_log_insert_events_from_ptrarray
389-zeitgeist_log_insert_events_finish
390-zeitgeist_log_find_events
391-zeitgeist_log_find_events_finish
392-zeitgeist_log_find_event_ids
393-zeitgeist_log_find_event_ids_finish
394-zeitgeist_log_get_events
395-zeitgeist_log_get_events_finish
396-zeitgeist_log_find_related_uris
397-zeitgeist_log_find_related_uris_finish
398-zeitgeist_log_delete_events
399-zeitgeist_log_delete_events_finish
400-zeitgeist_log_delete_log
401-zeitgeist_log_delete_log_finish
402-zeitgeist_log_quit
403-zeitgeist_log_quit_finish
404-zeitgeist_log_install_monitor
405-zeitgeist_log_remove_monitor
406-<SUBSECTION Standard>
407-ZEITGEIST_LOG
408-ZEITGEIST_IS_LOG
409-ZEITGEIST_TYPE_LOG
410-zeitgeist_log_get_type
411-ZEITGEIST_LOG_CLASS
412-ZEITGEIST_IS_LOG_CLASS
413-ZEITGEIST_LOG_GET_CLASS
414-</SECTION>
415-
416-<SECTION>
417-<FILE>zeitgeist-enumtypes</FILE>
418-zeitgeist_result_type_get_type
419-ZEITGEIST_TYPE_RESULT_TYPE
420-zeitgeist_storage_state_get_type
421-ZEITGEIST_TYPE_STORAGE_STATE
422-</SECTION>
423-
424-<SECTION>
425-<FILE>zeitgeist-enums</FILE>
426-<TITLE>Enumerations</TITLE>
427-zeitgeist_result_type_get_type
428-ZEITGEIST_TYPE_RESULT_TYPE
429-ZeitgeistResultType
430-zeitgeist_storage_state_get_type
431-ZEITGEIST_TYPE_STORAGE_STATE
432-ZeitgeistStorageState
433-</SECTION>
434-
435-<SECTION>
436 <FILE>zeitgeist-mimetypes</FILE>
437 <TITLE>Mimetype mapping and URI comprehension</TITLE>
438 zeitgeist_register_mimetype
439@@ -278,15 +228,6 @@
440 </SECTION>
441
442 <SECTION>
443-<FILE>zeitgeist-symbols</FILE>
444-<TITLE>Symbol comprehension</TITLE>
445-zeitgeist_symbol_get_parents
446-zeitgeist_symbol_get_children
447-zeitgeist_symbol_get_all_children
448-zeitgeist_symbol_is_a
449-</SECTION>
450-
451-<SECTION>
452 <FILE>zeitgeist-ontology-interpretations</FILE>
453 <TITLE>Interpretation Ontology</TITLE>
454 ZEITGEIST_NCAL_ALARM
455@@ -296,6 +237,11 @@
456 ZEITGEIST_NCAL_JOURNAL
457 ZEITGEIST_NCAL_TIMEZONE
458 ZEITGEIST_NCAL_TODO
459+ZEITGEIST_NCO_CONTACT
460+ZEITGEIST_NCO_CONTACT_GROUP
461+ZEITGEIST_NCO_CONTACT_LIST
462+ZEITGEIST_NCO_ORGANIZATION_CONTACT
463+ZEITGEIST_NCO_PERSON_CONTACT
464 ZEITGEIST_NFO_APPLICATION
465 ZEITGEIST_NFO_ARCHIVE
466 ZEITGEIST_NFO_AUDIO
467@@ -339,12 +285,16 @@
468 ZEITGEIST_NMO_MAILBOX
469 ZEITGEIST_NMO_MESSAGE
470 ZEITGEIST_NMO_MIME_ENTITY
471+ZEITGEIST_ZG_ACCEPT_EVENT
472 ZEITGEIST_ZG_ACCESS_EVENT
473 ZEITGEIST_ZG_CREATE_EVENT
474 ZEITGEIST_ZG_DELETE_EVENT
475+ZEITGEIST_ZG_DENY_EVENT
476 ZEITGEIST_ZG_EVENT_INTERPRETATION
477+ZEITGEIST_ZG_EXPIRE_EVENT
478 ZEITGEIST_ZG_LEAVE_EVENT
479 ZEITGEIST_ZG_MODIFY_EVENT
480+ZEITGEIST_ZG_MOVE_EVENT
481 ZEITGEIST_ZG_RECEIVE_EVENT
482 ZEITGEIST_ZG_SEND_EVENT
483 </SECTION>
484@@ -354,6 +304,7 @@
485 <TITLE>Manifestation Ontology</TITLE>
486 ZEITGEIST_NCAL_ATTACHMENT
487 ZEITGEIST_NCAL_CALENDAR_DATA_OBJECT
488+ZEITGEIST_NCO_CONTACT_LIST_DATA_OBJECT
489 ZEITGEIST_NFO_ARCHIVE_ITEM
490 ZEITGEIST_NFO_ATTACHMENT
491 ZEITGEIST_NFO_DELETED_RESOURCE
492@@ -365,6 +316,7 @@
493 ZEITGEIST_NFO_REMOTE_PORT_ADDRESS
494 ZEITGEIST_NFO_SOFTWARE_ITEM
495 ZEITGEIST_NFO_SOFTWARE_SERVICE
496+ZEITGEIST_NFO_WEB_DATA_OBJECT
497 ZEITGEIST_NMO_MAILBOX_DATA_OBJECT
498 ZEITGEIST_ZG_EVENT_MANIFESTATION
499 ZEITGEIST_ZG_HEURISTIC_ACTIVITY
500@@ -375,6 +327,73 @@
501 </SECTION>
502
503 <SECTION>
504+<FILE>zeitgeist-subject</FILE>
505+<TITLE>ZeitgeistSubject</TITLE>
506+ZeitgeistSubject
507+ZeitgeistSubjectClass
508+zeitgeist_subject_get_current_uri
509+zeitgeist_subject_get_interpretation
510+zeitgeist_subject_get_manifestation
511+zeitgeist_subject_get_mimetype
512+zeitgeist_subject_get_origin
513+zeitgeist_subject_get_storage
514+zeitgeist_subject_get_text
515+zeitgeist_subject_get_uri
516+zeitgeist_subject_new
517+zeitgeist_subject_new_full
518+zeitgeist_subject_set_current_uri
519+zeitgeist_subject_set_interpretation
520+zeitgeist_subject_set_manifestation
521+zeitgeist_subject_set_mimetype
522+zeitgeist_subject_set_origin
523+zeitgeist_subject_set_storage
524+zeitgeist_subject_set_text
525+zeitgeist_subject_set_uri
526+<SUBSECTION Standard>
527+ZEITGEIST_IS_SUBJECT
528+ZEITGEIST_IS_SUBJECT_CLASS
529+ZEITGEIST_SUBJECT
530+ZEITGEIST_SUBJECT_CLASS
531+ZEITGEIST_SUBJECT_GET_CLASS
532+ZEITGEIST_TYPE_SUBJECT
533+zeitgeist_subject_get_type
534+</SECTION>
535+
536+<SECTION>
537+<FILE>zeitgeist-symbols</FILE>
538+<TITLE>Symbol comprehension</TITLE>
539+zeitgeist_symbol_get_all_children
540+zeitgeist_symbol_get_children
541+zeitgeist_symbol_get_parents
542+zeitgeist_symbol_is_a
543+</SECTION>
544+
545+<SECTION>
546+<FILE>zeitgeist-timerange</FILE>
547+<TITLE>ZeitgeistTimeRange</TITLE>
548+ZeitgeistTimeRange
549+ZeitgeistTimeRangeClass
550+zeitgeist_time_range_get_end
551+zeitgeist_time_range_get_end_iso8601
552+zeitgeist_time_range_get_start
553+zeitgeist_time_range_get_start_iso8601
554+zeitgeist_time_range_new
555+zeitgeist_time_range_new_anytime
556+zeitgeist_time_range_new_from_now
557+zeitgeist_time_range_new_from_variant
558+zeitgeist_time_range_new_to_now
559+zeitgeist_time_range_to_variant
560+<SUBSECTION Standard>
561+ZEITGEIST_IS_TIME_RANGE
562+ZEITGEIST_IS_TIME_RANGE_CLASS
563+ZEITGEIST_TIME_RANGE
564+ZEITGEIST_TIME_RANGE_CLASS
565+ZEITGEIST_TIME_RANGE_GET_CLASS
566+ZEITGEIST_TYPE_TIME_RANGE
567+zeitgeist_time_range_get_type
568+</SECTION>
569+
570+<SECTION>
571 <FILE>zeitgeist-timestamp</FILE>
572 <TITLE>Timestamp handling</TITLE>
573 ZEITGEIST_TIMESTAMP_SECOND
574@@ -384,14 +403,14 @@
575 ZEITGEIST_TIMESTAMP_WEEK
576 ZEITGEIST_TIMESTAMP_YEAR
577 zeitgeist_timestamp_for_now
578-zeitgeist_timestamp_from_timeval
579-zeitgeist_timestamp_to_timeval
580-zeitgeist_timestamp_from_iso8601
581-zeitgeist_timestamp_to_iso8601
582 zeitgeist_timestamp_from_date
583 zeitgeist_timestamp_from_dmy
584-zeitgeist_timestamp_to_date
585+zeitgeist_timestamp_from_iso8601
586+zeitgeist_timestamp_from_timeval
587 zeitgeist_timestamp_next_midnight
588 zeitgeist_timestamp_prev_midnight
589+zeitgeist_timestamp_to_date
590+zeitgeist_timestamp_to_iso8601
591+zeitgeist_timestamp_to_timeval
592 </SECTION>
593
594
595=== modified file 'src/zeitgeist-enums.h'
596--- src/zeitgeist-enums.h 2011-03-07 14:19:39 +0000
597+++ src/zeitgeist-enums.h 2012-04-03 12:42:19 +0000
598@@ -63,6 +63,14 @@
599 * @ZEITGEIST_RESULT_TYPE_LEAST_RECENT_MIMETYPE: One event for each mimetype only, ordered with the least recent events first
600 * @ZEITGEIST_RESULT_TYPE_MOST_POPULAR_MIMETYPE: One event for each mimetype only, ordered by the popularity of the mimetype
601 * @ZEITGEIST_RESULT_TYPE_LEAST_POPULAR_MIMETYPE: One event for each mimetype only, ordered ascendingly by popularity of the mimetype
602+ * @ZEITGEIST_RESULT_TYPE_MOST_RECENT_CURRENT_URI: One event for each current uri only, ordered with the most recent events first
603+ * @ZEITGEIST_RESULT_TYPE_LEAST_RECENT_CURRENT_URI: One event for each current uri only, ordered with oldest events first
604+ * @ZEITGEIST_RESULT_TYPE_MOST_POPULAR_CURRENT_URI: One event for each current uri only, ordered by the popularity of the current uri
605+ * @ZEITGEIST_RESULT_TYPE_LEAST_POPULAR_CURRENT_URI: One event for each current uri only, ordered ascendingly by popularity
606+ * @ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENT_ORIGIN: One event for each event origin only, ordered with the most recent events first
607+ * @ZEITGEIST_RESULT_TYPE_LEAST_RECENT_EVENT_ORIGIN: One event for each event origin only, ordered with the least recent events first
608+ * @ZEITGEIST_RESULT_TYPE_MOST_POPULAR_EVENT_ORIGIN: One event for each event origin only, ordered by the popularity of the event origin
609+ * @ZEITGEIST_RESULT_TYPE_LEAST_POPULAR_EVENT_ORIGIN: One event for each event origin only, ordered ascendingly by popularity of the event origin
610 * @ZEITGEIST_RESULT_TYPE_RELEVANCY: Only allowed on zeitgeist_index_search(). Events are sorted by query relevancy
611 *
612 * Used to control how the query results are grouped and sorted.
613@@ -94,6 +102,14 @@
614 ZEITGEIST_RESULT_TYPE_LEAST_RECENT_MIMETYPE = 20,
615 ZEITGEIST_RESULT_TYPE_MOST_POPULAR_MIMETYPE = 21,
616 ZEITGEIST_RESULT_TYPE_LEAST_POPULAR_MIMETYPE = 22,
617+ ZEITGEIST_RESULT_TYPE_MOST_RECENT_CURRENT_URI = 23,
618+ ZEITGEIST_RESULT_TYPE_LEAST_RECENT_CURRENT_URI = 24,
619+ ZEITGEIST_RESULT_TYPE_MOST_POPULAR_CURRENT_URI = 25,
620+ ZEITGEIST_RESULT_TYPE_LEAST_POPULAR_CURRENT_URI = 26,
621+ ZEITGEIST_RESULT_TYPE_MOST_RECENT_EVENT_ORIGIN = 27,
622+ ZEITGEIST_RESULT_TYPE_LEAST_RECENT_EVENT_ORIGIN = 28,
623+ ZEITGEIST_RESULT_TYPE_MOST_POPULAR_EVENT_ORIGIN = 29,
624+ ZEITGEIST_RESULT_TYPE_LEAST_POPULAR_EVENT_ORIGIN = 30,
625 ZEITGEIST_RESULT_TYPE_RELEVANCY = 100,
626 } ZeitgeistResultType;
627
628
629=== modified file 'src/zeitgeist-event.c'
630--- src/zeitgeist-event.c 2012-02-02 14:46:00 +0000
631+++ src/zeitgeist-event.c 2012-04-03 12:42:19 +0000
632@@ -22,7 +22,7 @@
633
634 /**
635 * SECTION:zeitgeist-event
636- * @short_description: #ZetigeistEvent objects abstract events returned from Zeitgeist queries
637+ * @short_description: #ZeitgeistEvent objects abstract events returned from Zeitgeist queries
638 * @include: zeitgeist.h
639 *
640 * The #ZeitgeistEvent class is one of the primary elements for communicating
641@@ -121,7 +121,7 @@
642 * @event_id: The event id to assign to @event
643 *
644 * Set the event id of an event. Note that it is an error to send an event
645- * with a pre set event id to zeitgest_log_insert_events().
646+ * with a pre set event id to zeitgeist_log_insert_events().
647 */
648 void
649 zeitgeist_event_set_id (ZeitgeistEvent *event, guint32 id)
650
651=== modified file 'src/zeitgeist-subject.c'
652--- src/zeitgeist-subject.c 2012-02-03 21:46:05 +0000
653+++ src/zeitgeist-subject.c 2012-04-03 12:42:19 +0000
654@@ -20,7 +20,7 @@
655
656 /**
657 * SECTION:zeitgeist-subject
658- * @short_description: #ZetigeistSubject
659+ * @short_description: #ZeitgeistSubject
660 * @include: zeitgeist-subject.h
661 *
662 * #ZeitgeistSubject.
663
664=== modified file 'src/zeitgeist-timerange.c'
665--- src/zeitgeist-timerange.c 2011-03-07 14:19:39 +0000
666+++ src/zeitgeist-timerange.c 2012-04-03 12:42:19 +0000
667@@ -107,7 +107,7 @@
668 * #ZEITGEIST_TIME_RANGE_VARIANT_SIGNATURE. If @time_range is
669 * a floating reference this method will assume ownership of it
670 *
671- * Create a #ZeitgeistTimeRane from a #GVariant
672+ * Create a #ZeitgeistTimeRange from a #GVariant
673 *
674 * Returns: A floating reference to a newly created #ZeitgeistTimeRange
675 */

Subscribers

People subscribed via source and target branches