diff options
| author | Ted Gould <ted@gould.cx> | 2011-07-12 10:54:18 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-07-12 10:54:18 -0500 |
| commit | 3d6738fd9d121eb66fcaa1fd57f78dd9b4db378b (patch) | |
| tree | 8bebcbd55e330d2a0e0fb75864939dbaa5d90d08 /libindicator | |
| parent | 8b9fa1810e3eece7da088e8246d182d7cadab495 (diff) | |
| parent | 0c3a68569683c34c08ae9bf8183bcd360c175fb7 (diff) | |
| download | libayatana-indicator-3d6738fd9d121eb66fcaa1fd57f78dd9b4db378b.tar.gz libayatana-indicator-3d6738fd9d121eb66fcaa1fd57f78dd9b4db378b.tar.bz2 libayatana-indicator-3d6738fd9d121eb66fcaa1fd57f78dd9b4db378b.zip | |
* Upstream Merge
* Fix signals with NULL entries in the loader
* Adding a comment for setting up debugging options
* Adding annotations for GIR files
Diffstat (limited to 'libindicator')
| -rw-r--r-- | libindicator/Makefile.am | 2 | ||||
| -rw-r--r-- | libindicator/indicator-object.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index 4433655..f9fb011 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -22,7 +22,7 @@ INDICATOR_API_VERSION = 4 -e "s|\@indicator_abi_version\@|$(INDICATOR_ABI_VERSION)|" \ $< > $@ -CLEANFILES = indicator$(VER)-0.$(INDICATOR_API_VERSION).pc +CLEANFILES += indicator$(VER)-0.$(INDICATOR_API_VERSION).pc include $(top_srcdir)/Makefile.am.marshal diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index 2fe8dd1..a563ebe 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -447,15 +447,15 @@ get_entries_default (IndicatorObject * io) } /** - indicator_object_get_entires: + indicator_object_get_entries: @io: #IndicatorObject to query This function looks on the class for the object and calls it's #IndicatorObjectClass::get_entries function. The list should be owned by the caller, but the individual - enteries should not be. + entries should not be. - Return value: A list if #IndicatorObjectEntry structures or + Return value: (element-type IndicatorObjectEntry) (transfer container): A list if #IndicatorObjectEntry structures or NULL if there is an error. */ GList * |