diff options
-rw-r--r-- | ChangeLog | 28 | ||||
-rwxr-xr-x | configure | 38 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | libindicator/indicator-object.c | 4 | ||||
-rw-r--r-- | libindicator/indicator-object.h | 4 | ||||
-rw-r--r-- | tests/service-manager-connect-service.c | 2 |
6 files changed, 64 insertions, 16 deletions
@@ -1,5 +1,33 @@ # Generated by Makefile. Do not edit. +2012-02-23 Ted Gould <ted@gould.cx> + + 0.4.92 + +2012-02-22 Ted Gould <ted@gould.cx> + + Remove unenforcable consts + +2012-02-22 Ted Gould <ted@gould.cx> + + Attaching bug + +2012-02-22 Ted Gould <ted@gould.cx> + + Removing unenforcable consts + +2012-02-14 Ted Gould <ted@gould.cx> + + Adjusting timeout so it'll build on the buildds too + +2012-02-14 Ted Gould <ted@gould.cx> + + Explicitly listing gmodule as a library we're using + +2012-02-14 Ted Gould <ted@gould.cx> + + Explicity add gmodule in the list of required libraries + 2012-02-14 Ted Gould <ted@gould.cx> 0.4.91 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for libindicator 0.4.91. +# Generated by GNU Autoconf 2.68 for libindicator 0.4.92. # # Report bugs to <http://bugs.launchpad.net/libindicator>. # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libindicator' PACKAGE_TARNAME='libindicator' -PACKAGE_VERSION='0.4.91' -PACKAGE_STRING='libindicator 0.4.91' +PACKAGE_VERSION='0.4.92' +PACKAGE_STRING='libindicator 0.4.92' PACKAGE_BUGREPORT='http://bugs.launchpad.net/libindicator' PACKAGE_URL='http://launchpad.net/libindicator' @@ -1330,7 +1330,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libindicator 0.4.91 to adapt to many kinds of systems. +\`configure' configures libindicator 0.4.92 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1400,7 +1400,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libindicator 0.4.91:";; + short | recursive ) echo "Configuration of libindicator 0.4.92:";; esac cat <<\_ACEOF @@ -1520,7 +1520,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libindicator configure 0.4.91 +libindicator configure 0.4.92 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1798,7 +1798,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libindicator $as_me 0.4.91, which was +It was created by libindicator $as_me 0.4.92, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2620,7 +2620,7 @@ fi # Define the identity of the package. PACKAGE='libindicator' - VERSION='0.4.91' + VERSION='0.4.92' cat >>confdefs.h <<_ACEOF @@ -11757,13 +11757,16 @@ if test -n "$LIBINDICATOR_CFLAGS"; then elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK3_REQUIRED_VERSION + gmodule-2.0 gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION + gmodule-2.0 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBINDICATOR_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK3_REQUIRED_VERSION + gmodule-2.0 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else @@ -11777,13 +11780,16 @@ if test -n "$LIBINDICATOR_LIBS"; then elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK3_REQUIRED_VERSION + gmodule-2.0 gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK3_REQUIRED_VERSION + gmodule-2.0 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBINDICATOR_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK3_REQUIRED_VERSION + gmodule-2.0 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else @@ -11806,15 +11812,18 @@ else fi if test $_pkg_short_errors_supported = yes; then LIBINDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= $GTK3_REQUIRED_VERSION + gmodule-2.0 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>&1` else LIBINDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= $GTK3_REQUIRED_VERSION + gmodule-2.0 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBINDICATOR_PKG_ERRORS" >&5 as_fn_error $? "Package requirements (gtk+-3.0 >= $GTK3_REQUIRED_VERSION + gmodule-2.0 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) were not met: $LIBINDICATOR_PKG_ERRORS @@ -11859,13 +11868,16 @@ if test -n "$LIBINDICATOR_CFLAGS"; then elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION + gmodule-2.0 gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION + gmodule-2.0 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBINDICATOR_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION + gmodule-2.0 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else @@ -11879,13 +11891,16 @@ if test -n "$LIBINDICATOR_LIBS"; then elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION + gmodule-2.0 gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION\""; } >&5 ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION + gmodule-2.0 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBINDICATOR_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION + gmodule-2.0 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else @@ -11908,15 +11923,18 @@ else fi if test $_pkg_short_errors_supported = yes; then LIBINDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION + gmodule-2.0 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>&1` else LIBINDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION + gmodule-2.0 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBINDICATOR_PKG_ERRORS" >&5 as_fn_error $? "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION + gmodule-2.0 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) were not met: $LIBINDICATOR_PKG_ERRORS @@ -13022,7 +13040,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libindicator $as_me 0.4.91, which was +This file was extended by libindicator $as_me 0.4.92, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13089,7 +13107,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libindicator config.status 0.4.91 +libindicator config.status 0.4.92 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 38dd416..a3963c4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_INIT([libindicator], - [0.4.91], + [0.4.92], [http://bugs.launchpad.net/libindicator], [libindicator], [http://launchpad.net/libindicator]) @@ -52,10 +52,12 @@ AC_ARG_WITH([gtk], [with_gtk=3]) AS_IF([test "x$with_gtk" = x3], [PKG_CHECK_MODULES(LIBINDICATOR, gtk+-3.0 >= $GTK3_REQUIRED_VERSION + gmodule-2.0 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) ], [test "x$with_gtk" = x2], [PKG_CHECK_MODULES(LIBINDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION + gmodule-2.0 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) ], [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] 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 diff --git a/tests/service-manager-connect-service.c b/tests/service-manager-connect-service.c index 7f57f96..09a7ba1 100644 --- a/tests/service-manager-connect-service.c +++ b/tests/service-manager-connect-service.c @@ -55,7 +55,7 @@ main (int argc, char ** argv) IndicatorService * is = indicator_service_new("org.ayatana.test"); g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, shutdown, NULL); - g_timeout_add_seconds(1, timeout, NULL); + g_timeout_add_seconds(5, timeout, NULL); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); |