diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | ChangeLog | 24 | ||||
| -rwxr-xr-x | configure | 20 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | src/application-service-appstore.c | 11 |
6 files changed, 55 insertions, 13 deletions
@@ -20,6 +20,7 @@ Michael Terry Neil Jagdish Patel Neil J. Patel + Ryan Lortie Sebastien Bacher Sense Egbert Hofstede Sense Hofstede @@ -1,5 +1,29 @@ # Generated by Makefile. Do not edit. +2012-03-09 Ted Gould <ted@gould.cx> + + 0.4.92 + +2012-03-05 Charles Kerr <charles.kerr@canonical.com> + + merge lp:~ted/indicator-application/lp944236 to fix the warning that Coverity reported in bug #944236 + +2012-03-02 Ted Gould <ted@gould.cx> + + Cleaning up switch statement to be more readable + +2012-03-02 Ted Gould <ted@gould.cx> + + Add full type to GVariantBuilder + +2012-03-02 Ryan Lortie <desrt@desrt.ca> + + make proper use of g_variant_builder_init() + + GVariantBuilder can only infer the proper type for non-empty arrays. If + an array may be empty, the full definite type must be given to + g_variant_builder_init(). + 2012-02-15 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 indicator-application 0.4.91. +# Generated by GNU Autoconf 2.68 for indicator-application 0.4.92. # # Report bugs to <ted@canonical.com>. # @@ -572,8 +572,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='indicator-application' PACKAGE_TARNAME='indicator-application' -PACKAGE_VERSION='0.4.91' -PACKAGE_STRING='indicator-application 0.4.91' +PACKAGE_VERSION='0.4.92' +PACKAGE_STRING='indicator-application 0.4.92' PACKAGE_BUGREPORT='ted@canonical.com' PACKAGE_URL='' @@ -1328,7 +1328,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 indicator-application 0.4.91 to adapt to many kinds of systems. +\`configure' configures indicator-application 0.4.92 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1399,7 +1399,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of indicator-application 0.4.91:";; + short | recursive ) echo "Configuration of indicator-application 0.4.92:";; esac cat <<\_ACEOF @@ -1521,7 +1521,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -indicator-application configure 0.4.91 +indicator-application configure 0.4.92 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1801,7 +1801,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 indicator-application $as_me 0.4.91, which was +It was created by indicator-application $as_me 0.4.92, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2622,7 +2622,7 @@ fi # Define the identity of the package. PACKAGE=indicator-application - VERSION=0.4.91 + VERSION=0.4.92 cat >>confdefs.h <<_ACEOF @@ -13713,7 +13713,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 indicator-application $as_me 0.4.91, which was +This file was extended by indicator-application $as_me 0.4.92, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13779,7 +13779,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="\\ -indicator-application config.status 0.4.91 +indicator-application 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 d32c95f..3e714eb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(indicator-application, 0.4.91, ted@canonical.com) +AC_INIT(indicator-application, 0.4.92, ted@canonical.com) AC_COPYRIGHT([Copyright 2009, 2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-application, 0.4.91) +AM_INIT_AUTOMAKE(indicator-application, 0.4.92) AM_MAINTAINER_MODE diff --git a/debian/changelog b/debian/changelog index aa076d1..5ac0fbb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +indicator-application (0.4.92-0ubuntu1~ppa1) UNRELEASED; urgency=low + + * New upstream release. + * Explicitly specifying GVariant Builder types + * Cleaning up a switch statement (LP: #944236) + + -- Ted Gould <ted@ubuntu.com> Fri, 09 Mar 2012 15:13:33 -0600 + indicator-application (0.4.91-0ubuntu2) precise; urgency=low * Backport an upstream fix for a gvariant misuse, thanks desrt for it! diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c index 5d4296d..2663003 100644 --- a/src/application-service-appstore.c +++ b/src/application-service-appstore.c @@ -284,14 +284,23 @@ bus_method_call (GDBusConnection * connection, const gchar * sender, switch (direction) { case INDICATOR_OBJECT_SCROLL_UP: delta = -delta; + orientation = "vertical"; + break; case INDICATOR_OBJECT_SCROLL_DOWN: + /* delta unchanged */ orientation = "vertical"; break; - case INDICATOR_OBJECT_SCROLL_LEFT: delta = -delta; + orientation = "horizontal"; + break; case INDICATOR_OBJECT_SCROLL_RIGHT: + /* delta unchanged */ orientation = "horizontal"; + break; + default: + g_assert_not_reached(); + break; } app = find_application_by_menu(service, dbusaddress, dbusmenuobject); |