Merge lp:~ted/libindicator/lp937387 into lp:libindicator/0.5

[Ted Gould]

Fixing unenforcable consts

=== modified file 'libindicator/indicator-object.c'
--- libindicator/indicator-object.c	2012-02-13 18:38:10 +0000
+++ libindicator/indicator-object.c	2012-02-22 18:21:31 +0000
@@ -795,7 +795,7 @@
 	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 @@
 	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);

=== modified file 'libindicator/indicator-object.h'
--- libindicator/indicator-object.h	2012-01-23 23:00:29 +0000
+++ libindicator/indicator-object.h	2012-02-22 18:21:31 +0000
@@ -203,8 +203,8 @@
 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