diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2012-02-23 12:25:39 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2012-02-23 12:25:39 +0100 |
| commit | 164055c3977ab7c8bc2b4d9a8ac590e545f992c9 (patch) | |
| tree | c46079a6eeb3c53e6b3958c428ef9e6579ed25d3 /libindicator | |
| parent | 55ae52666c1c85127ba6d710ad2e02e0205e736c (diff) | |
| parent | e305ff2f29589a9c16ea2ca9ecb52ea16b3bf1cb (diff) | |
| download | libayatana-indicator-164055c3977ab7c8bc2b4d9a8ac590e545f992c9.tar.gz libayatana-indicator-164055c3977ab7c8bc2b4d9a8ac590e545f992c9.tar.bz2 libayatana-indicator-164055c3977ab7c8bc2b4d9a8ac590e545f992c9.zip | |
Merging shared upstream rev into target branch.
Diffstat (limited to 'libindicator')
| -rw-r--r-- | libindicator/indicator-object.c | 4 | ||||
| -rw-r--r-- | libindicator/indicator-object.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index a348d9a..17a6d1d 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -795,7 +795,7 @@ indicator_object_entry_was_added (IndicatorObject * io, IndicatorObjectEntry * e in different hosts if need be. */ void -indicator_object_set_environment (IndicatorObject * io, const GStrv env) +indicator_object_set_environment (IndicatorObject * io, GStrv env) { /* FIXME: should this be a property? */ g_return_if_fail(INDICATOR_IS_OBJECT(io)); @@ -820,7 +820,7 @@ indicator_object_set_environment (IndicatorObject * io, const GStrv env) Return value: (transfer none): Gets the list of strings that represent the environment or NULL if none were given. */ -const GStrv +GStrv indicator_object_get_environment (IndicatorObject * io) { g_return_val_if_fail(INDICATOR_IS_OBJECT(io), NULL); diff --git a/libindicator/indicator-object.h b/libindicator/indicator-object.h index 2d69b1b..d8551f9 100644 --- a/libindicator/indicator-object.h +++ b/libindicator/indicator-object.h @@ -203,8 +203,8 @@ void indicator_object_entry_activate (IndicatorObject * io, IndicatorObjectEn void indicator_object_entry_activate_window (IndicatorObject * io, IndicatorObjectEntry * entry, guint windowid, guint timestamp); void indicator_object_entry_close (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp); -void indicator_object_set_environment (IndicatorObject * io, const GStrv env); -const GStrv indicator_object_get_environment (IndicatorObject * io); +void indicator_object_set_environment (IndicatorObject * io, GStrv env); +GStrv indicator_object_get_environment (IndicatorObject * io); gboolean indicator_object_check_environment (IndicatorObject * io, const gchar * env); G_END_DECLS |