aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--ChangeLog68
-rwxr-xr-xconfigure20
-rw-r--r--configure.ac4
-rw-r--r--debian/changelog15
-rw-r--r--src/gen-application-service.xml.c4
6 files changed, 90 insertions, 22 deletions
diff --git a/AUTHORS b/AUTHORS
index 54219b0..88c4f9d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -13,6 +13,7 @@
Ken Vandine
Ken VanDine
Krzysztof Klimonda
+ Luke Yelavich
Marco Trevisan (TreviƱo)
Michael Terry
Neil Jagdish Patel
diff --git a/ChangeLog b/ChangeLog
index e4ee331..632461a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,73 @@
# Generated by Makefile. Do not edit.
+2011-02-24 Ted Gould <ted@gould.cx>
+
+ 0.2.94
+
+2011-02-24 Ted Gould <ted@gould.cx>
+
+ Making sure we have a description for the variant world
+
+2011-02-24 Ted Gould <ted@gould.cx>
+
+ Adding support for accessible descriptions
+
+2011-02-24 Ted Gould <ted@gould.cx>
+
+ Switching things around so the icon switches with the description all the way up the stack
+
+2011-02-23 Ted Gould <ted@gould.cx>
+
+ Adding a missing brace
+
+2011-02-11 Luke Yelavich <luke.yelavich@canonical.com>
+
+ Use the ACCESSIBLE_DESC_UPDATE signal to refresh the accessible description.
+
+2011-02-08 Luke Yelavich <luke.yelavich@canonical.com>
+
+ accessible_name -> accessible_desc
+
+2011-02-08 Luke Yelavich <luke.yelavich@canonical.com>
+
+ Merge from trunk
+
+2011-02-07 Luke Yelavich <luke.yelavich@canonical.com>
+
+ Add accessible name support
+
+2011-02-21 Ted Gould <ted@gould.cx>
+
+ Make sure to NULL out the structure
+
+2011-02-18 Ted Gould <ted@gould.cx>
+
+ Ensures the accessible description is NULL
+
+2011-02-16 Ted Gould <ted@gould.cx>
+
+ Remove g_error's to stop abortion.
+
+2011-02-11 Michael Terry <mike@mterry.name>
+
+ don't abort on various unexpected situations; just spit out critical warning
+
+2011-02-16 Ted Gould <ted@gould.cx>
+
+ On status change update the label as well
+
+2011-02-11 Michael Terry <mike@mterry.name>
+
+ update label too in update_status
+
+2011-02-07 Ted Gould <ted@gould.cx>
+
+ Build fix to get libindicator header
+
+2011-02-07 Luke Yelavich <luke.yelavich@canonical.com>
+
+ Include indicator-object.h to reference INDICATOR_OBJECT_SCROLL_UP
+
2011-02-03 Ted Gould <ted@gould.cx>
0.2.93
diff --git a/configure b/configure
index a539c4d..8b55bec 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for indicator-application 0.2.93.
+# Generated by GNU Autoconf 2.67 for indicator-application 0.2.94.
#
# Report bugs to <ted@canonical.com>.
#
@@ -703,8 +703,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='indicator-application'
PACKAGE_TARNAME='indicator-application'
-PACKAGE_VERSION='0.2.93'
-PACKAGE_STRING='indicator-application 0.2.93'
+PACKAGE_VERSION='0.2.94'
+PACKAGE_STRING='indicator-application 0.2.94'
PACKAGE_BUGREPORT='ted@canonical.com'
PACKAGE_URL=''
@@ -1446,7 +1446,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.2.93 to adapt to many kinds of systems.
+\`configure' configures indicator-application 0.2.94 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1517,7 +1517,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of indicator-application 0.2.93:";;
+ short | recursive ) echo "Configuration of indicator-application 0.2.94:";;
esac
cat <<\_ACEOF
@@ -1634,7 +1634,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-indicator-application configure 0.2.93
+indicator-application configure 0.2.94
generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1914,7 +1914,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.2.93, which was
+It was created by indicator-application $as_me 0.2.94, which was
generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -2735,7 +2735,7 @@ fi
# Define the identity of the package.
PACKAGE=indicator-application
- VERSION=0.2.93
+ VERSION=0.2.94
cat >>confdefs.h <<_ACEOF
@@ -12462,7 +12462,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.2.93, which was
+This file was extended by indicator-application $as_me 0.2.94, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12528,7 +12528,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.2.93
+indicator-application config.status 0.2.94
configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index fa8d252..fe010cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
-AC_INIT(indicator-application, 0.2.93, ted@canonical.com)
+AC_INIT(indicator-application, 0.2.94, ted@canonical.com)
AC_COPYRIGHT([Copyright 2009, 2010 Canonical])
AC_PREREQ(2.53)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-application, 0.2.93)
+AM_INIT_AUTOMAKE(indicator-application, 0.2.94)
AM_MAINTAINER_MODE
diff --git a/debian/changelog b/debian/changelog
index 6320cf0..2c67e7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,12 @@
-indicator-application (0.2.93-0ubuntu5~ppa2) natty; urgency=low
+indicator-application (0.2.94-0ubuntu1~ppa1) UNRELEASED; urgency=low
- * Fix, let's not talk about it.
-
- -- Ted Gould <ted@ubuntu.com> Thu, 24 Feb 2011 22:03:08 -0600
-
-indicator-application (0.2.93-0ubuntu5~ppa1) natty; urgency=low
-
- * Upstream Merge
+ * New upstream release.
* Adding in support for Accssible Descriptions
+ * Make the accessible description NULL so that indicator-applet doesn't
+ crash (LP: #721533)
+ * emit LabelChanged signal along with the IconChanged signal (LP: #712581)
- -- Ted Gould <ted@ubuntu.com> Thu, 24 Feb 2011 21:57:35 -0600
+ -- Ted Gould <ted@ubuntu.com> Thu, 24 Feb 2011 22:12:10 -0600
indicator-application (0.2.93-0ubuntu4) natty; urgency=low
diff --git a/src/gen-application-service.xml.c b/src/gen-application-service.xml.c
index 292cb62..cae1819 100644
--- a/src/gen-application-service.xml.c
+++ b/src/gen-application-service.xml.c
@@ -27,7 +27,7 @@ const char * _application_service =
"\n"
"<!-- Methods -->\n"
" <method name=\"GetApplications\">\n"
-" <arg type=\"a(sisosss)\" name=\"applications\" direction=\"out\" />\n"
+" <arg type=\"a(sisossss)\" name=\"applications\" direction=\"out\" />\n"
" </method>\n"
" <method name=\"ApplicationScrollEvent\">\n"
" <arg type=\"s\" name=\"dbusaddress\" direction=\"in\" />\n"
@@ -45,6 +45,7 @@ const char * _application_service =
" <arg type=\"s\" name=\"iconpath\" direction=\"out\" />\n"
" <arg type=\"s\" name=\"label\" direction=\"out\" />\n"
" <arg type=\"s\" name=\"labelguide\" direction=\"out\" />\n"
+" <arg type=\"s\" name=\"accessibledesc\" direction=\"out\" />\n"
" </signal>\n"
" <signal name=\"ApplicationRemoved\">\n"
" <arg type=\"i\" name=\"position\" direction=\"out\" />\n"
@@ -52,6 +53,7 @@ const char * _application_service =
" <signal name=\"ApplicationIconChanged\">\n"
" <arg type=\"i\" name=\"position\" direction=\"out\" />\n"
" <arg type=\"s\" name=\"icon_name\" direction=\"out\" />\n"
+" <arg type=\"s\" name=\"icon_desc\" direction=\"out\" />\n"
" </signal>\n"
" <signal name=\"ApplicationIconThemePathChanged\">\n"
" <arg type=\"i\" name=\"position\" direction=\"out\" />\n"