Import upstream version 0.2.96

34 files changed, 851 insertions, 77 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 1d81fe3..1a68af6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,97 @@
 # Generated by Makefile. Do not edit.
 
+2011-02-24  Ted Gould  <ted@gould.cx>
+
+	0.2.96
+
+2011-02-24  Ted Gould  <ted@gould.cx>
+
+	Add the ability to set accessible descriptions for the icon and attention icon.
+
+2011-02-23  Ted Gould  <ted@gould.cx>
+
+	Cleaning up even more! 
+
+2011-02-23  Ted Gould  <ted@gould.cx>
+
+	Switching to proper properties
+
+2011-02-23  Ted Gould  <ted@gould.cx>
+
+	Matching prototypes to C file
+
+2011-02-23  Ted Gould  <ted@gould.cx>
+
+	Fixing the sections list
+
+2011-02-23  Ted Gould  <ted@gould.cx>
+
+	Dropping the accessible description tests.  I don't have time to rewrite them now.  They should be redone though.
+
+2011-02-23  Ted Gould  <ted@gould.cx>
+
+	Switching to the new style of setting the a11y label
+
+2011-02-23  Ted Gould  <ted@gould.cx>
+
+	Reconfigure properties to match.
+
+2011-02-23  Ted Gould  <ted@gould.cx>
+
+	Fixing up the get functions
+
+2011-02-23  Ted Gould  <ted@gould.cx>
+
+	Fixing up the set functions so we get some descriptions.
+
+2011-02-23  Ted Gould  <ted@gould.cx>
+
+	Switch around API so it makes sense for what we want to do.
+
+2011-02-23  Ted Gould  <ted@gould.cx>
+
+	Dropping the new accessible description signal
+
+2011-02-23  Ted Gould  <ted@gould.cx>
+
+	Drop signaling the accessible description changed on it's own.
+
+2011-02-23  Ted Gould  <ted@gould.cx>
+
+	Change the name of the accessible description and add the attention one.
+
+2011-02-23  Ted Gould  <ted@gould.cx>
+
+	Changing the signal to match what was discussed with the KDE folks
+
+2011-02-14  Luke Yelavich  <luke.yelavich@canonical.com>
+
+	Merge from trunk
+
+2011-02-11  Luke Yelavich  <luke.yelavich@canonical.com>
+
+	Merge from trunk
+
+2011-02-08  Luke Yelavich  <luke.yelavich@canonical.com>
+
+	accessible_name -> accessible_desc
+
+2011-02-04  Luke Yelavich  <luke.yelavich@canonical.com>
+
+	Merge from trunk
+
+2011-02-04  Luke Yelavich  <luke.yelavich@canonical.com>
+
+	Add accessible_name support
+
+2011-02-16  Ted Gould  <ted@gould.cx>
+
+	Remove registration of the object until after all possible signals are sent
+
+2011-02-11  Michael Terry  <mike@mterry.name>
+
+	don't unregister on dbus until after we hide appindicator
+
 2011-02-10  Ted Gould  <ted@gould.cx>
 
 	0.2.95
diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am
index dfaa41f..9a899e1 100644
--- a/bindings/mono/Makefile.am
+++ b/bindings/mono/Makefile.am
@@ -85,15 +85,22 @@ $(MIDDLE_API): $(METADATA) $(RAW_API)
 $(API): $(MIDDLE_API) Makefile.am
 	sed -e "s|PROP_ID_S|id|" \
 		-e "s|PROP_STATUS_S|status|" \
+		-e "s|PROP_CATEGORY_S|Category|" \
 		-e "s|PROP_CATEGORY_S|category|" \
 		-e "s|PROP_ICON_NAME_S|icon-name|" \
+		-e "s|PROP_ICON_DESC_S|IconDesc|" \
+		-e "s|PROP_ICON_DESC_S|icon-desc|" \
 		-e "s|PROP_ATTENTION_ICON_NAME_S|attention-icon-name|" \
+		-e "s|PROP_ATTENTION_ICON_DESC_S|AttentionIconDesc|" \
+		-e "s|PROP_ATTENTION_ICON_DESC_S|attention-icon-desc|" \
 		-e "s|PROP_ICON_THEME_PATH_S|icon-theme-path|" \
 		-e "s|PROP_MENU_S|menu|" \
 		-e "s|PROP_CONNECTED_S|connected|" \
 		-e "s|PROP_LABEL_S|label|" \
 		-e "s|PROP_LABEL_GUIDE_S|label-guide|" \
 		-e "s|PROP_ORDERING_INDEX_S|ordering-index|" \
+		-e "s|PROP_DBUS_MENU_SERVER_S|DbusMenuServer|" \
+		-e "s|PROP_DBUS_MENU_SERVER_S|dbus-menu-server|" \
 		$< > $@
 
 api_includes = $(GTK_SHARP_CFLAGS)
diff --git a/bindings/mono/Makefile.in b/bindings/mono/Makefile.in
index f336d0a..e8d4335 100644
--- a/bindings/mono/Makefile.in
+++ b/bindings/mono/Makefile.in
@@ -771,15 +771,22 @@ $(MIDDLE_API): $(METADATA) $(RAW_API)
 $(API): $(MIDDLE_API) Makefile.am
 	sed -e "s|PROP_ID_S|id|" \
 		-e "s|PROP_STATUS_S|status|" \
+		-e "s|PROP_CATEGORY_S|Category|" \
 		-e "s|PROP_CATEGORY_S|category|" \
 		-e "s|PROP_ICON_NAME_S|icon-name|" \
+		-e "s|PROP_ICON_DESC_S|IconDesc|" \
+		-e "s|PROP_ICON_DESC_S|icon-desc|" \
 		-e "s|PROP_ATTENTION_ICON_NAME_S|attention-icon-name|" \
+		-e "s|PROP_ATTENTION_ICON_DESC_S|AttentionIconDesc|" \
+		-e "s|PROP_ATTENTION_ICON_DESC_S|attention-icon-desc|" \
 		-e "s|PROP_ICON_THEME_PATH_S|icon-theme-path|" \
 		-e "s|PROP_MENU_S|menu|" \
 		-e "s|PROP_CONNECTED_S|connected|" \
 		-e "s|PROP_LABEL_S|label|" \
 		-e "s|PROP_LABEL_GUIDE_S|label-guide|" \
 		-e "s|PROP_ORDERING_INDEX_S|ordering-index|" \
+		-e "s|PROP_DBUS_MENU_SERVER_S|DbusMenuServer|" \
+		-e "s|PROP_DBUS_MENU_SERVER_S|dbus-menu-server|" \
 		$< > $@
 
 generated-stamp: $(API) $(build_customs)
diff --git a/bindings/mono/libappindicator-api.metadata b/bindings/mono/libappindicator-api.metadata
index e241ecf..e610c88 100644
--- a/bindings/mono/libappindicator-api.metadata
+++ b/bindings/mono/libappindicator-api.metadata
@@ -7,6 +7,8 @@
 	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_status']" name="cname">new-status</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_label']" name="name">NewLabel</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_label']" name="cname">new-label</attr>
+	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_accessible_desc']" name="name">NewAccessibleDesc</attr>
+	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_accessible_desc']" name="cname">new-accessible-desc</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='connection_changed']" name="name">ConnectionChanged</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='connection_changed']" name="cname">connection-changed</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='scroll_event']" name="name">ScrollEvent</attr>
@@ -26,6 +28,7 @@
     <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_CONNECTED_S']" name="name">Connected</attr>
     <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_LABEL_S']" name="name">Label</attr>
     <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_LABEL_GUIDE_S']" name="name">LabelGuide</attr>
+    <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_ACCESSIBLE_DESC_S']" name="name">AccessibleDesc</attr>
     <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_ORDERING_INDEX_S']" name="name">OrderingIndex</attr>
     <attr path="/api/namespace/object[@cname='AppIndicator']/method[@name='SetMenu']" name="name">SetMenu</attr>
 
@@ -40,6 +43,7 @@
     <remove-node path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_X_LABEL_S']" />
     <remove-node path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_X_LABEL_GUIDE_S']" />
     <remove-node path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_X_ORDERING_INDEX_S']" />
+    <remove-node path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_X_ACCESSIBLE_DESC_S']" />
 
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_id']" />
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_status']" />
@@ -50,6 +54,7 @@
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_label']" />
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_label_guide']" />
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_ordering_index']" />
+    <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_accessible_desc']" />
 
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_status']" />
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_icon']" />
@@ -57,4 +62,5 @@
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_attention_icon']" />
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_label']" />
     <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_ordering_index']" />
+    <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_accessible_desc']" />
 </metadata>
diff --git a/bindings/mono/libappindicator-api.raw b/bindings/mono/libappindicator-api.raw
index 90e5e84..37ddae3 100644
--- a/bindings/mono/libappindicator-api.raw
+++ b/bindings/mono/libappindicator-api.raw
@@ -24,8 +24,10 @@
       <property name="PROP_ID_S" cname="PROP_ID_S" type="gchar*" readable="true" writeable="true" construct-only="true" />
       <property name="PROP_CATEGORY_S" cname="PROP_CATEGORY_S" type="gchar*" readable="true" writeable="true" construct-only="true" />
       <property name="PROP_STATUS_S" cname="PROP_STATUS_S" type="gchar*" readable="true" writeable="true" />
-      <property name="PROP_ICON_NAME_S" cname="PROP_ICON_NAME_S" type="gchar*" readable="true" writeable="true" construct="true" />
+      <property name="PROP_ICON_NAME_S" cname="PROP_ICON_NAME_S" type="gchar*" readable="true" writeable="true" />
+      <property name="PROP_ICON_DESC_S" cname="PROP_ICON_DESC_S" type="gchar*" readable="true" writeable="true" />
       <property name="PROP_ATTENTION_ICON_NAME_S" cname="PROP_ATTENTION_ICON_NAME_S" type="gchar*" readable="true" writeable="true" />
+      <property name="PROP_ATTENTION_ICON_DESC_S" cname="PROP_ATTENTION_ICON_DESC_S" type="gchar*" readable="true" writeable="true" />
       <property name="PROP_ICON_THEME_PATH_S" cname="PROP_ICON_THEME_PATH_S" type="gchar*" readable="true" writeable="true" construct="true" />
       <property name="PROP_CONNECTED_S" cname="PROP_CONNECTED_S" type="gboolean" readable="true" />
       <property name="PROP_LABEL_S" cname="PROP_LABEL_S" type="gchar*" readable="true" writeable="true" />
@@ -111,12 +113,18 @@
       <method name="GetAttentionIcon" cname="app_indicator_get_attention_icon">
         <return-type type="const-gchar*" />
       </method>
+      <method name="GetAttentionIconDesc" cname="app_indicator_get_attention_icon_desc">
+        <return-type type="const-gchar*" />
+      </method>
       <method name="GetCategory" cname="app_indicator_get_category">
         <return-type type="AppIndicatorCategory" />
       </method>
       <method name="GetIcon" cname="app_indicator_get_icon">
         <return-type type="const-gchar*" />
       </method>
+      <method name="GetIconDesc" cname="app_indicator_get_icon_desc">
+        <return-type type="const-gchar*" />
+      </method>
       <method name="GetIconThemePath" cname="app_indicator_get_icon_theme_path">
         <return-type type="const-gchar*" />
       </method>
@@ -162,12 +170,26 @@
           <parameter type="const-gchar*" name="icon_name" />
         </parameters>
       </method>
+      <method name="SetAttentionIconFull" cname="app_indicator_set_attention_icon_full">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="const-gchar*" name="icon_name" />
+          <parameter type="const-gchar*" name="icon_desc" />
+        </parameters>
+      </method>
       <method name="SetIcon" cname="app_indicator_set_icon">
         <return-type type="void" />
         <parameters>
           <parameter type="const-gchar*" name="icon_name" />
         </parameters>
       </method>
+      <method name="SetIconFull" cname="app_indicator_set_icon_full">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="const-gchar*" name="icon_name" />
+          <parameter type="const-gchar*" name="icon_desc" />
+        </parameters>
+      </method>
       <method name="SetIconThemePath" cname="app_indicator_set_icon_theme_path">
         <return-type type="void" />
         <parameters>
diff --git a/bindings/python/appindicator.defs b/bindings/python/appindicator.defs
index 5027a6d..cc8ae75 100644
--- a/bindings/python/appindicator.defs
+++ b/bindings/python/appindicator.defs
@@ -72,6 +72,15 @@
   )
 )
 
+(define-method set_accessible_desc
+  (of-object "AppIndicator")
+  (c-name "app_indicator_set_accessible_desc")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "accessible_desc" (null-ok))
+  )
+)
+
 (define-method set_ordering_index
   (of-object "AppIndicator")
   (c-name "app_indicator_set_ordering_index")
@@ -146,6 +155,12 @@
   (return-type "const-gchar*")
 )
 
+(define-method get_accessible_desc
+  (of-object "AppIndicator")
+  (c-name "app_indicator_get_accessible_desc")
+  (return-type "const-gchar*")
+)
+
 (define-method get_ordering_index
   (of-object "AppIndicator")
   (c-name "app_indicator_get_ordering_index")
diff --git a/configure b/configure
index 6408bd2..f64d17a 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 libappindicator 0.2.95.
+# Generated by GNU Autoconf 2.67 for libappindicator 0.2.96.
 #
 # Report bugs to <ted@canonical.com>.
 #
@@ -763,8 +763,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libappindicator'
 PACKAGE_TARNAME='libappindicator'
-PACKAGE_VERSION='0.2.95'
-PACKAGE_STRING='libappindicator 0.2.95'
+PACKAGE_VERSION='0.2.96'
+PACKAGE_STRING='libappindicator 0.2.96'
 PACKAGE_BUGREPORT='ted@canonical.com'
 PACKAGE_URL=''
 
@@ -1581,7 +1581,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 libappindicator 0.2.95 to adapt to many kinds of systems.
+\`configure' configures libappindicator 0.2.96 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1651,7 +1651,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libappindicator 0.2.95:";;
+     short | recursive ) echo "Configuration of libappindicator 0.2.96:";;
    esac
   cat <<\_ACEOF
 
@@ -1793,7 +1793,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libappindicator configure 0.2.95
+libappindicator configure 0.2.96
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2073,7 +2073,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 libappindicator $as_me 0.2.95, which was
+It was created by libappindicator $as_me 0.2.96, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2894,7 +2894,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=libappindicator
- VERSION=0.2.95
+ VERSION=0.2.96
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14120,7 +14120,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 libappindicator $as_me 0.2.95, which was
+This file was extended by libappindicator $as_me 0.2.96, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14186,7 +14186,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="\\
-libappindicator config.status 0.2.95
+libappindicator config.status 0.2.96
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 597a5bc..248c28f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
 
-AC_INIT(libappindicator, 0.2.95, ted@canonical.com)
+AC_INIT(libappindicator, 0.2.96, ted@canonical.com)
 AC_COPYRIGHT([Copyright 2009, 2010 Canonical])
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libappindicator, 0.2.95)
+AM_INIT_AUTOMAKE(libappindicator, 0.2.96)
 
 AM_MAINTAINER_MODE
 
diff --git a/docs/reference/html/annotation-glossary.html b/docs/reference/html/annotation-glossary.html
new file mode 100644
index 0000000..fca069b
--- /dev/null
+++ b/docs/reference/html/annotation-glossary.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Annotation Glossary</title>
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<link rel="home" href="index.html" title="libappindicator Reference Manual">
+<link rel="up" href="index.html" title="libappindicator Reference Manual">
+<link rel="prev" href="api-index-deprecated.html" title="Deprecated API Index">
+<meta name="generator" content="GTK-Doc V1.16 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
+<td><a accesskey="p" href="api-index-deprecated.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
+<td> </td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
+<th width="100%" align="center">libappindicator Reference Manual</th>
+<td> </td>
+</tr>
+<tr><td colspan="5" class="shortcuts"><a class="shortcut" href="#glsT">T</a></td></tr>
+</table>
+<div class="glossary">
+<div class="titlepage"><div><div><h2 class="title">
+<a name="annotation-glossary"></a>Annotation Glossary</h2></div></div></div>
+<a name="glsT"></a><h3 class="title">T</h3>
+<dt>
+<a name="annotation-glossterm-transfer%20none"></a>transfer none</dt>
+<dd><p>Don't free data after the code is done.</p></dd>
+</div>
+<div class="footer">
+<hr>
+          Generated by GTK-Doc V1.16</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/reference/html/api-index-deprecated.html b/docs/reference/html/api-index-deprecated.html
index 9f719b9..000de6f 100644
--- a/docs/reference/html/api-index-deprecated.html
+++ b/docs/reference/html/api-index-deprecated.html
@@ -7,21 +7,33 @@
 <link rel="home" href="index.html" title="libappindicator Reference Manual">
 <link rel="up" href="index.html" title="libappindicator Reference Manual">
 <link rel="prev" href="api-index-full.html" title="API Index">
+<link rel="next" href="annotation-glossary.html" title="Annotation Glossary">
 <meta name="generator" content="GTK-Doc V1.16 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
+<tr valign="middle">
 <td><a accesskey="p" href="api-index-full.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
 <td> </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">libappindicator Reference Manual</th>
-<td> </td>
-</tr></table>
+<td><a accesskey="n" href="annotation-glossary.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
+</tr>
+<tr><td colspan="5" class="shortcuts"><a class="shortcut" href="#idxI">I</a></td></tr>
+</table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
 <a name="api-index-deprecated"></a>Deprecated API Index</h2></div></div></div>
-<a name="idx"></a>
+<a name="idx"></a><a name="idxI"></a><h3 class="title">I</h3>
+<dt>
+<a class="link" href="libappindicator-app-indicator.html#app-indicator-set-attention-icon" title="app_indicator_set_attention_icon ()">app_indicator_set_attention_icon</a>, function in <a class="link" href="libappindicator-app-indicator.html" title="AppIndicator">AppIndicator</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libappindicator-app-indicator.html#app-indicator-set-icon" title="app_indicator_set_icon ()">app_indicator_set_icon</a>, function in <a class="link" href="libappindicator-app-indicator.html" title="AppIndicator">AppIndicator</a>
+</dt>
+<dd></dd>
 </div>
 <div class="footer">
 <hr>
diff --git a/docs/reference/html/api-index-full.html b/docs/reference/html/api-index-full.html
index 69321b8..01647e6 100644
--- a/docs/reference/html/api-index-full.html
+++ b/docs/reference/html/api-index-full.html
@@ -63,6 +63,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libappindicator-app-indicator.html#AppIndicator--attention-icon-desc" title='The "attention-icon-desc" property'>AppIndicator:attention-icon-desc</a>, object property in <a class="link" href="libappindicator-app-indicator.html" title="AppIndicator">AppIndicator</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libappindicator-app-indicator.html#AppIndicator--attention-icon-name" title='The "attention-icon-name" property'>AppIndicator:attention-icon-name</a>, object property in <a class="link" href="libappindicator-app-indicator.html" title="AppIndicator">AppIndicator</a>
 </dt>
 <dd></dd>
@@ -79,6 +83,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libappindicator-app-indicator.html#AppIndicator--icon-desc" title='The "icon-desc" property'>AppIndicator:icon-desc</a>, object property in <a class="link" href="libappindicator-app-indicator.html" title="AppIndicator">AppIndicator</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libappindicator-app-indicator.html#AppIndicator--icon-name" title='The "icon-name" property'>AppIndicator:icon-name</a>, object property in <a class="link" href="libappindicator-app-indicator.html" title="AppIndicator">AppIndicator</a>
 </dt>
 <dd></dd>
@@ -135,6 +143,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libappindicator-app-indicator.html#app-indicator-get-attention-icon-desc" title="app_indicator_get_attention_icon_desc ()">app_indicator_get_attention_icon_desc</a>, function in <a class="link" href="libappindicator-app-indicator.html" title="AppIndicator">AppIndicator</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-category" title="app_indicator_get_category ()">app_indicator_get_category</a>, function in <a class="link" href="libappindicator-app-indicator.html" title="AppIndicator">AppIndicator</a>
 </dt>
 <dd></dd>
@@ -147,6 +159,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libappindicator-app-indicator.html#app-indicator-get-icon-desc" title="app_indicator_get_icon_desc ()">app_indicator_get_icon_desc</a>, function in <a class="link" href="libappindicator-app-indicator.html" title="AppIndicator">AppIndicator</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-icon-theme-path" title="app_indicator_get_icon_theme_path ()">app_indicator_get_icon_theme_path</a>, function in <a class="link" href="libappindicator-app-indicator.html" title="AppIndicator">AppIndicator</a>
 </dt>
 <dd></dd>
@@ -191,10 +207,18 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libappindicator-app-indicator.html#app-indicator-set-attention-icon-full" title="app_indicator_set_attention_icon_full ()">app_indicator_set_attention_icon_full</a>, function in <a class="link" href="libappindicator-app-indicator.html" title="AppIndicator">AppIndicator</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libappindicator-app-indicator.html#app-indicator-set-icon" title="app_indicator_set_icon ()">app_indicator_set_icon</a>, function in <a class="link" href="libappindicator-app-indicator.html" title="AppIndicator">AppIndicator</a>
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libappindicator-app-indicator.html#app-indicator-set-icon-full" title="app_indicator_set_icon_full ()">app_indicator_set_icon_full</a>, function in <a class="link" href="libappindicator-app-indicator.html" title="AppIndicator">AppIndicator</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libappindicator-app-indicator.html#app-indicator-set-icon-theme-path" title="app_indicator_set_icon_theme_path ()">app_indicator_set_icon_theme_path</a>, function in <a class="link" href="libappindicator-app-indicator.html" title="AppIndicator">AppIndicator</a>
 </dt>
 <dd></dd>
diff --git a/docs/reference/html/ch01.html b/docs/reference/html/ch01.html
index 43af9ab..fc7fd09 100644
--- a/docs/reference/html/ch01.html
+++ b/docs/reference/html/ch01.html
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id539114"></a>Base Classes for Applications</h2></div></div></div>
+<a name="id538329"></a>Base Classes for Applications</h2></div></div></div>
 <div class="toc"><dl><dt>
 <span class="refentrytitle"><a href="libappindicator-app-indicator.html">AppIndicator</a></span><span class="refpurpose"> — An object to put application information
 		into the panel.</span>
diff --git a/docs/reference/html/index.html b/docs/reference/html/index.html
index cd87fd4..ef6a0a0 100644
--- a/docs/reference/html/index.html
+++ b/docs/reference/html/index.html
@@ -29,6 +29,7 @@
 <dt><span class="chapter"><a href="object-tree.html">Object Hierarchy</a></span></dt>
 <dt><span class="index"><a href="api-index-full.html">API Index</a></span></dt>
 <dt><span class="index"><a href="api-index-deprecated.html">Deprecated API Index</a></span></dt>
+<dt><span class="glossary"><a href="annotation-glossary.html">Annotation Glossary</a></span></dt>
 </dl></div>
 </div>
 <div class="footer">
diff --git a/docs/reference/html/index.sgml b/docs/reference/html/index.sgml
index a2dc5a5..0875f4f 100644
--- a/docs/reference/html/index.sgml
+++ b/docs/reference/html/index.sgml
@@ -38,8 +38,10 @@
 <ANCHOR id="app-indicator-new-with-path" href="libappindicator/libappindicator-app-indicator.html#app-indicator-new-with-path">
 <ANCHOR id="app-indicator-set-status" href="libappindicator/libappindicator-app-indicator.html#app-indicator-set-status">
 <ANCHOR id="app-indicator-set-attention-icon" href="libappindicator/libappindicator-app-indicator.html#app-indicator-set-attention-icon">
+<ANCHOR id="app-indicator-set-attention-icon-full" href="libappindicator/libappindicator-app-indicator.html#app-indicator-set-attention-icon-full">
 <ANCHOR id="app-indicator-set-menu" href="libappindicator/libappindicator-app-indicator.html#app-indicator-set-menu">
 <ANCHOR id="app-indicator-set-icon" href="libappindicator/libappindicator-app-indicator.html#app-indicator-set-icon">
+<ANCHOR id="app-indicator-set-icon-full" href="libappindicator/libappindicator-app-indicator.html#app-indicator-set-icon-full">
 <ANCHOR id="app-indicator-set-icon-theme-path" href="libappindicator/libappindicator-app-indicator.html#app-indicator-set-icon-theme-path">
 <ANCHOR id="app-indicator-set-label" href="libappindicator/libappindicator-app-indicator.html#app-indicator-set-label">
 <ANCHOR id="app-indicator-set-ordering-index" href="libappindicator/libappindicator-app-indicator.html#app-indicator-set-ordering-index">
@@ -47,18 +49,22 @@
 <ANCHOR id="app-indicator-get-category" href="libappindicator/libappindicator-app-indicator.html#app-indicator-get-category">
 <ANCHOR id="app-indicator-get-status" href="libappindicator/libappindicator-app-indicator.html#app-indicator-get-status">
 <ANCHOR id="app-indicator-get-icon" href="libappindicator/libappindicator-app-indicator.html#app-indicator-get-icon">
+<ANCHOR id="app-indicator-get-icon-desc" href="libappindicator/libappindicator-app-indicator.html#app-indicator-get-icon-desc">
 <ANCHOR id="app-indicator-get-icon-theme-path" href="libappindicator/libappindicator-app-indicator.html#app-indicator-get-icon-theme-path">
 <ANCHOR id="app-indicator-get-attention-icon" href="libappindicator/libappindicator-app-indicator.html#app-indicator-get-attention-icon">
+<ANCHOR id="app-indicator-get-attention-icon-desc" href="libappindicator/libappindicator-app-indicator.html#app-indicator-get-attention-icon-desc">
 <ANCHOR id="app-indicator-get-menu" href="libappindicator/libappindicator-app-indicator.html#app-indicator-get-menu">
 <ANCHOR id="app-indicator-get-label" href="libappindicator/libappindicator-app-indicator.html#app-indicator-get-label">
 <ANCHOR id="app-indicator-get-label-guide" href="libappindicator/libappindicator-app-indicator.html#app-indicator-get-label-guide">
 <ANCHOR id="app-indicator-get-ordering-index" href="libappindicator/libappindicator-app-indicator.html#app-indicator-get-ordering-index">
 <ANCHOR id="app-indicator-build-menu-from-desktop" href="libappindicator/libappindicator-app-indicator.html#app-indicator-build-menu-from-desktop">
 <ANCHOR id="libappindicator-app-indicator.property-details" href="libappindicator/libappindicator-app-indicator.html#libappindicator-app-indicator.property-details">
+<ANCHOR id="AppIndicator--attention-icon-desc" href="libappindicator/libappindicator-app-indicator.html#AppIndicator--attention-icon-desc">
 <ANCHOR id="AppIndicator--attention-icon-name" href="libappindicator/libappindicator-app-indicator.html#AppIndicator--attention-icon-name">
 <ANCHOR id="AppIndicator--category" href="libappindicator/libappindicator-app-indicator.html#AppIndicator--category">
 <ANCHOR id="AppIndicator--connected" href="libappindicator/libappindicator-app-indicator.html#AppIndicator--connected">
 <ANCHOR id="AppIndicator--dbus-menu-server" href="libappindicator/libappindicator-app-indicator.html#AppIndicator--dbus-menu-server">
+<ANCHOR id="AppIndicator--icon-desc" href="libappindicator/libappindicator-app-indicator.html#AppIndicator--icon-desc">
 <ANCHOR id="AppIndicator--icon-name" href="libappindicator/libappindicator-app-indicator.html#AppIndicator--icon-name">
 <ANCHOR id="AppIndicator--icon-theme-path" href="libappindicator/libappindicator-app-indicator.html#AppIndicator--icon-theme-path">
 <ANCHOR id="AppIndicator--id" href="libappindicator/libappindicator-app-indicator.html#AppIndicator--id">
@@ -74,3 +80,4 @@
 <ANCHOR id="AppIndicator-new-label" href="libappindicator/libappindicator-app-indicator.html#AppIndicator-new-label">
 <ANCHOR id="AppIndicator-new-status" href="libappindicator/libappindicator-app-indicator.html#AppIndicator-new-status">
 <ANCHOR id="AppIndicator-scroll-event" href="libappindicator/libappindicator-app-indicator.html#AppIndicator-scroll-event">
+<ANCHOR id="annotation-glossterm-transfer none" href="libappindicator/annotation-glossary.html#annotation-glossterm-transfer none">
diff --git a/docs/reference/html/libappindicator-app-indicator.html b/docs/reference/html/libappindicator-app-indicator.html
index 93193b9..0b032b2 100644
--- a/docs/reference/html/libappindicator-app-indicator.html
+++ b/docs/reference/html/libappindicator-app-indicator.html
@@ -81,10 +81,17 @@ struct              <a class="link" href="libappindicator-app-indicator.html#App
                                                          <em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicatorStatus" title="enum AppIndicatorStatus"><span class="type">AppIndicatorStatus</span></a> status</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="libappindicator-app-indicator.html#app-indicator-set-attention-icon" title="app_indicator_set_attention_icon ()">app_indicator_set_attention_icon</a>    (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_name</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="libappindicator-app-indicator.html#app-indicator-set-attention-icon-full" title="app_indicator_set_attention_icon_full ()">app_indicator_set_attention_icon_full</a>
+                                                        (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>,
+                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_name</code></em>,
+                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_desc</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="libappindicator-app-indicator.html#app-indicator-set-menu" title="app_indicator_set_menu ()">app_indicator_set_menu</a>              (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/gtk/2.22/GtkMenu.html"><span class="type">GtkMenu</span></a> *menu</code></em>);
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/gtk/2.24/GtkMenu.html"><span class="type">GtkMenu</span></a> *menu</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="libappindicator-app-indicator.html#app-indicator-set-icon" title="app_indicator_set_icon ()">app_indicator_set_icon</a>              (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_name</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="libappindicator-app-indicator.html#app-indicator-set-icon-full" title="app_indicator_set_icon_full ()">app_indicator_set_icon_full</a>         (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>,
+                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_name</code></em>,
+                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_desc</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="libappindicator-app-indicator.html#app-indicator-set-icon-theme-path" title="app_indicator_set_icon_theme_path ()">app_indicator_set_icon_theme_path</a>   (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_theme_path</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="libappindicator-app-indicator.html#app-indicator-set-label" title="app_indicator_set_label ()">app_indicator_set_label</a>             (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>,
@@ -96,11 +103,15 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.htm
 <a class="link" href="libappindicator-app-indicator.html#AppIndicatorCategory" title="enum AppIndicatorCategory"><span class="returnvalue">AppIndicatorCategory</span></a>  <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-category" title="app_indicator_get_category ()">app_indicator_get_category</a>        (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);
 <a class="link" href="libappindicator-app-indicator.html#AppIndicatorStatus" title="enum AppIndicatorStatus"><span class="returnvalue">AppIndicatorStatus</span></a>  <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-status" title="app_indicator_get_status ()">app_indicator_get_status</a>            (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);
 const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *                    <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-icon" title="app_indicator_get_icon ()">app_indicator_get_icon</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *                    <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-icon-desc" title="app_indicator_get_icon_desc ()">app_indicator_get_icon_desc</a>
+                                                        (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);
 const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *                    <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-icon-theme-path" title="app_indicator_get_icon_theme_path ()">app_indicator_get_icon_theme_path</a>
                                                         (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);
 const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *                    <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-attention-icon" title="app_indicator_get_attention_icon ()">app_indicator_get_attention_icon</a>
                                                         (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);
-<a href="http://library.gnome.org/devel/gtk/2.22/GtkMenu.html"><span class="returnvalue">GtkMenu</span></a> *                        <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-menu" title="app_indicator_get_menu ()">app_indicator_get_menu</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);
+const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *                    <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-attention-icon-desc" title="app_indicator_get_attention_icon_desc ()">app_indicator_get_attention_icon_desc</a>
+                                                        (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);
+<a href="http://library.gnome.org/devel/gtk/2.24/GtkMenu.html"><span class="returnvalue">GtkMenu</span></a> *                        <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-menu" title="app_indicator_get_menu ()">app_indicator_get_menu</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);
 const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *                    <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-label" title="app_indicator_get_label ()">app_indicator_get_label</a>
                                                         (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);
 const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *                    <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-label-guide" title="app_indicator_get_label_guide ()">app_indicator_get_label_guide</a>
@@ -122,11 +133,13 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.htm
 <div class="refsect1">
 <a name="libappindicator-app-indicator.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
+  "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--attention-icon-desc" title='The "attention-icon-desc" property'>attention-icon-desc</a>"      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
   "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--attention-icon-name" title='The "attention-icon-name" property'>attention-icon-name</a>"      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
   "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--category" title='The "category" property'>category</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write / Construct Only
   "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--connected" title='The "connected" property'>connected</a>"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>              : Read
   "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--dbus-menu-server" title='The "dbus-menu-server" property'>dbus-menu-server</a>"         <a href="/usr/share/gtk-doc/html/libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html#DbusmenuServer"><span class="type">DbusmenuServer</span></a>*       : Read / Write
-  "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--icon-name" title='The "icon-name" property'>icon-name</a>"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write / Construct
+  "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--icon-desc" title='The "icon-desc" property'>icon-desc</a>"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
+  "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--icon-name" title='The "icon-name" property'>icon-name</a>"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
   "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--icon-theme-path" title='The "icon-theme-path" property'>icon-theme-path</a>"          <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write / Construct
   "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--id" title='The "id" property'>id</a>"                       <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write / Construct Only
   "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--label" title='The "label" property'>label</a>"                    <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write
@@ -512,7 +525,7 @@ The signals and external functions that make up the <a class="link" href="libapp
 </tr>
 <tr>
 <td><p><span class="term"><em class="structfield"><code><a name="AppIndicatorClass.fallback"></a>fallback</code></em> ()</span></p></td>
-<td>Function that gets called to make a <a href="http://library.gnome.org/devel/gtk/2.22/GtkStatusIcon.html"><span class="type">GtkStatusIcon</span></a> when
+<td>Function that gets called to make a <a href="http://library.gnome.org/devel/gtk/2.24/GtkStatusIcon.html"><span class="type">GtkStatusIcon</span></a> when
 there is no Application Indicator area available.</td>
 </tr>
 <tr>
@@ -662,6 +675,35 @@ Wrapper function for property <a class="link" href="libappindicator-app-indicato
 <a name="app-indicator-set-attention-icon"></a><h3>app_indicator_set_attention_icon ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                app_indicator_set_attention_icon    (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_name</code></em>);</pre>
+<div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Warning</h3>
+<p><code class="literal">app_indicator_set_attention_icon</code> is deprecated and should not be used in newly-written code. Use <a class="link" href="libappindicator-app-indicator.html#app-indicator-set-attention-icon-full" title="app_indicator_set_attention_icon_full ()"><code class="function">app_indicator_set_attention_icon_full()</code></a> instead.</p>
+</div>
+<p>
+Wrapper for <a class="link" href="libappindicator-app-indicator.html#app-indicator-set-attention-icon-full" title="app_indicator_set_attention_icon_full ()"><code class="function">app_indicator_set_attention_icon_full()</code></a> with a NULL
+	description.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>self</code></em> :</span></p></td>
+<td>The <a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> object to use</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>icon_name</code></em> :</span></p></td>
+<td>The name of the attention icon to set for this indicator</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="app-indicator-set-attention-icon-full"></a><h3>app_indicator_set_attention_icon_full ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                app_indicator_set_attention_icon_full
+                                                        (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>,
+                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_name</code></em>,
+                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_desc</code></em>);</pre>
 <p>
 Wrapper function for property <a class="link" href="libappindicator-app-indicator.html#AppIndicator--attention-icon-name" title='The "attention-icon-name" property'><span class="type">"attention-icon-name"</span></a>.
 </p>
@@ -676,6 +718,10 @@ Wrapper function for property <a class="link" href="libappindicator-app-indicato
 <td><p><span class="term"><em class="parameter"><code>icon_name</code></em> :</span></p></td>
 <td>The name of the attention icon to set for this indicator</td>
 </tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>icon_desc</code></em> :</span></p></td>
+<td>A textual description of the icon</td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -683,7 +729,7 @@ Wrapper function for property <a class="link" href="libappindicator-app-indicato
 <div class="refsect2">
 <a name="app-indicator-set-menu"></a><h3>app_indicator_set_menu ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                app_indicator_set_menu              (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>,
-                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/gtk/2.22/GtkMenu.html"><span class="type">GtkMenu</span></a> *menu</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/gtk/2.24/GtkMenu.html"><span class="type">GtkMenu</span></a> *menu</code></em>);</pre>
 <p>
 Sets the menu that should be shown when the Application Indicator
         is clicked on in the panel.  An application indicator will not
@@ -701,7 +747,7 @@ Sets the menu that should be shown when the Application Indicator
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>menu</code></em> :</span></p></td>
-<td>A <a href="http://library.gnome.org/devel/gtk/2.22/GtkMenu.html"><span class="type">GtkMenu</span></a> to set</td>
+<td>A <a href="http://library.gnome.org/devel/gtk/2.24/GtkMenu.html"><span class="type">GtkMenu</span></a> to set</td>
 </tr>
 </tbody>
 </table></div>
@@ -711,11 +757,42 @@ Sets the menu that should be shown when the Application Indicator
 <a name="app-indicator-set-icon"></a><h3>app_indicator_set_icon ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                app_indicator_set_icon              (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_name</code></em>);</pre>
+<div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Warning</h3>
+<p><code class="literal">app_indicator_set_icon</code> is deprecated and should not be used in newly-written code. Use <a class="link" href="libappindicator-app-indicator.html#app-indicator-set-icon-full" title="app_indicator_set_icon_full ()"><code class="function">app_indicator_set_icon_full()</code></a></p>
+</div>
+<p>
+Wrapper function for <a class="link" href="libappindicator-app-indicator.html#app-indicator-set-icon-full" title="app_indicator_set_icon_full ()"><code class="function">app_indicator_set_icon_full()</code></a> with a NULL
+		description.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>self</code></em> :</span></p></td>
+<td>The <a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> object to use</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>icon_name</code></em> :</span></p></td>
+<td>The icon name to set.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
+<a name="app-indicator-set-icon-full"></a><h3>app_indicator_set_icon_full ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                app_indicator_set_icon_full         (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>,
+                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_name</code></em>,
+                                                         <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_desc</code></em>);</pre>
 <p>
 Sets the default icon to use when the status is active but
 		not set to attention.  In most cases, this should be the
 		application icon for the program.
-		Wrapper function for property <a class="link" href="libappindicator-app-indicator.html#AppIndicator--icon-name" title='The "icon-name" property'><span class="type">"icon-name"</span></a>.
+</p>
+<p>
+		Wrapper function for property <a class="link" href="libappindicator-app-indicator.html#AppIndicator--icon-name" title='The "icon-name" property'><span class="type">"icon-name"</span></a> and
+		<span class="type">"icon-description"</span>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -728,6 +805,10 @@ Sets the default icon to use when the status is active but
 <td><p><span class="term"><em class="parameter"><code>icon_name</code></em> :</span></p></td>
 <td>The icon name to set.</td>
 </tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>icon_desc</code></em> :</span></p></td>
+<td>A textual description of the icon for accessibility</td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -896,6 +977,28 @@ Wrapper function for property <a class="link" href="libappindicator-app-indicato
 </div>
 <hr>
 <div class="refsect2">
+<a name="app-indicator-get-icon-desc"></a><h3>app_indicator_get_icon_desc ()</h3>
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *                    app_indicator_get_icon_desc
+                                                        (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);</pre>
+<p>
+Wrapper function for property <a class="link" href="libappindicator-app-indicator.html#AppIndicator--icon-desc" title='The "icon-desc" property'><span class="type">"icon-desc"</span></a>.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>self</code></em> :</span></p></td>
+<td>The <a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> object to use</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>The current icon description.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
 <a name="app-indicator-get-icon-theme-path"></a><h3>app_indicator_get_icon_theme_path ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *                    app_indicator_get_icon_theme_path
                                                         (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);</pre>
@@ -940,8 +1043,30 @@ Wrapper function for property <a class="link" href="libappindicator-app-indicato
 </div>
 <hr>
 <div class="refsect2">
+<a name="app-indicator-get-attention-icon-desc"></a><h3>app_indicator_get_attention_icon_desc ()</h3>
+<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *                    app_indicator_get_attention_icon_desc
+                                                        (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);</pre>
+<p>
+Wrapper function for property <a class="link" href="libappindicator-app-indicator.html#AppIndicator--attention-icon-desc" title='The "attention-icon-desc" property'><span class="type">"attention-icon-desc"</span></a>.
+</p>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>self</code></em> :</span></p></td>
+<td>The <a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> object to use</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>The current attention icon description.</td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<hr>
+<div class="refsect2">
 <a name="app-indicator-get-menu"></a><h3>app_indicator_get_menu ()</h3>
-<pre class="programlisting"><a href="http://library.gnome.org/devel/gtk/2.22/GtkMenu.html"><span class="returnvalue">GtkMenu</span></a> *                        app_indicator_get_menu (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/gtk/2.24/GtkMenu.html"><span class="returnvalue">GtkMenu</span></a> *                        app_indicator_get_menu (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);</pre>
 <p>
 Gets the menu being used for this application indicator.
 	Wrapper function for property <span class="type">"menu"</span>.
@@ -955,7 +1080,8 @@ Gets the menu being used for this application indicator.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>A <a href="http://library.gnome.org/devel/gtk/2.22/GtkMenu.html"><span class="type">GtkMenu</span></a> object or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if one hasn't been set.</td>
+<td>A <a href="http://library.gnome.org/devel/gtk/2.24/GtkMenu.html"><span class="type">GtkMenu</span></a> object or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if one hasn't been set. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
+</td>
 </tr>
 </tbody>
 </table></div>
@@ -1058,6 +1184,16 @@ This function allows for building the Application Indicator menu
 <div class="refsect1">
 <a name="libappindicator-app-indicator.property-details"></a><h2>Property Details</h2>
 <div class="refsect2">
+<a name="AppIndicator--attention-icon-desc"></a><h3>The <code class="literal">"attention-icon-desc"</code> property</h3>
+<pre class="programlisting">  "attention-icon-desc"      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
+<p>
+If the indicator sets it's status to <a class="link" href="libappindicator-app-indicator.html#APP-INDICATOR-STATUS-ATTENTION:CAPS"><code class="literal">APP_INDICATOR_STATUS_ATTENTION</code></a>
+		then this textual description of the icon shown.
+</p>
+<p>Default value: NULL</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="AppIndicator--attention-icon-name"></a><h3>The <code class="literal">"attention-icon-name"</code> property</h3>
 <pre class="programlisting">  "attention-icon-name"      <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
@@ -1097,8 +1233,17 @@ A way to get the internal dbusmenu server if it is available.
 </div>
 <hr>
 <div class="refsect2">
+<a name="AppIndicator--icon-desc"></a><h3>The <code class="literal">"icon-desc"</code> property</h3>
+<pre class="programlisting">  "icon-desc"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
+<p>
+The description of the regular icon that is shown for the indicator.
+</p>
+<p>Default value: NULL</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="AppIndicator--icon-name"></a><h3>The <code class="literal">"icon-name"</code> property</h3>
-<pre class="programlisting">  "icon-name"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write / Construct</pre>
+<pre class="programlisting">  "icon-name"                <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write</pre>
 <p>
 The name of the regular icon that is shown for the indicator.
 </p>
diff --git a/docs/reference/html/libappindicator.devhelp b/docs/reference/html/libappindicator.devhelp
index a695026..fe5a1ef 100644
--- a/docs/reference/html/libappindicator.devhelp
+++ b/docs/reference/html/libappindicator.devhelp
@@ -8,6 +8,7 @@
     <sub name="Object Hierarchy" link="object-tree.html"/>
     <sub name="API Index" link="api-index-full.html"/>
     <sub name="Deprecated API Index" link="api-index-deprecated.html"/>
+    <sub name="Annotation Glossary" link="annotation-glossary.html"/>
   </chapters>
   <functions>
     <function name="APP_INDICATOR_TYPE" link="libappindicator-app-indicator.html#APP-INDICATOR-TYPE:CAPS"/>
@@ -33,8 +34,10 @@
     <function name="app_indicator_new_with_path ()" link="libappindicator-app-indicator.html#app-indicator-new-with-path"/>
     <function name="app_indicator_set_status ()" link="libappindicator-app-indicator.html#app-indicator-set-status"/>
     <function name="app_indicator_set_attention_icon ()" link="libappindicator-app-indicator.html#app-indicator-set-attention-icon"/>
+    <function name="app_indicator_set_attention_icon_full ()" link="libappindicator-app-indicator.html#app-indicator-set-attention-icon-full"/>
     <function name="app_indicator_set_menu ()" link="libappindicator-app-indicator.html#app-indicator-set-menu"/>
     <function name="app_indicator_set_icon ()" link="libappindicator-app-indicator.html#app-indicator-set-icon"/>
+    <function name="app_indicator_set_icon_full ()" link="libappindicator-app-indicator.html#app-indicator-set-icon-full"/>
     <function name="app_indicator_set_icon_theme_path ()" link="libappindicator-app-indicator.html#app-indicator-set-icon-theme-path"/>
     <function name="app_indicator_set_label ()" link="libappindicator-app-indicator.html#app-indicator-set-label"/>
     <function name="app_indicator_set_ordering_index ()" link="libappindicator-app-indicator.html#app-indicator-set-ordering-index"/>
@@ -42,17 +45,21 @@
     <function name="app_indicator_get_category ()" link="libappindicator-app-indicator.html#app-indicator-get-category"/>
     <function name="app_indicator_get_status ()" link="libappindicator-app-indicator.html#app-indicator-get-status"/>
     <function name="app_indicator_get_icon ()" link="libappindicator-app-indicator.html#app-indicator-get-icon"/>
+    <function name="app_indicator_get_icon_desc ()" link="libappindicator-app-indicator.html#app-indicator-get-icon-desc"/>
     <function name="app_indicator_get_icon_theme_path ()" link="libappindicator-app-indicator.html#app-indicator-get-icon-theme-path"/>
     <function name="app_indicator_get_attention_icon ()" link="libappindicator-app-indicator.html#app-indicator-get-attention-icon"/>
+    <function name="app_indicator_get_attention_icon_desc ()" link="libappindicator-app-indicator.html#app-indicator-get-attention-icon-desc"/>
     <function name="app_indicator_get_menu ()" link="libappindicator-app-indicator.html#app-indicator-get-menu"/>
     <function name="app_indicator_get_label ()" link="libappindicator-app-indicator.html#app-indicator-get-label"/>
     <function name="app_indicator_get_label_guide ()" link="libappindicator-app-indicator.html#app-indicator-get-label-guide"/>
     <function name="app_indicator_get_ordering_index ()" link="libappindicator-app-indicator.html#app-indicator-get-ordering-index"/>
     <function name="app_indicator_build_menu_from_desktop ()" link="libappindicator-app-indicator.html#app-indicator-build-menu-from-desktop"/>
+    <function name="The &quot;attention-icon-desc&quot; property" link="libappindicator-app-indicator.html#AppIndicator--attention-icon-desc"/>
     <function name="The &quot;attention-icon-name&quot; property" link="libappindicator-app-indicator.html#AppIndicator--attention-icon-name"/>
     <function name="The &quot;category&quot; property" link="libappindicator-app-indicator.html#AppIndicator--category"/>
     <function name="The &quot;connected&quot; property" link="libappindicator-app-indicator.html#AppIndicator--connected"/>
     <function name="The &quot;dbus-menu-server&quot; property" link="libappindicator-app-indicator.html#AppIndicator--dbus-menu-server"/>
+    <function name="The &quot;icon-desc&quot; property" link="libappindicator-app-indicator.html#AppIndicator--icon-desc"/>
     <function name="The &quot;icon-name&quot; property" link="libappindicator-app-indicator.html#AppIndicator--icon-name"/>
     <function name="The &quot;icon-theme-path&quot; property" link="libappindicator-app-indicator.html#AppIndicator--icon-theme-path"/>
     <function name="The &quot;id&quot; property" link="libappindicator-app-indicator.html#AppIndicator--id"/>
diff --git a/docs/reference/html/libappindicator.devhelp2 b/docs/reference/html/libappindicator.devhelp2
index d6b0066..516ae2a 100644
--- a/docs/reference/html/libappindicator.devhelp2
+++ b/docs/reference/html/libappindicator.devhelp2
@@ -8,6 +8,7 @@
     <sub name="Object Hierarchy" link="object-tree.html"/>
     <sub name="API Index" link="api-index-full.html"/>
     <sub name="Deprecated API Index" link="api-index-deprecated.html"/>
+    <sub name="Annotation Glossary" link="annotation-glossary.html"/>
   </chapters>
   <functions>
     <keyword type="macro" name="APP_INDICATOR_TYPE" link="libappindicator-app-indicator.html#APP-INDICATOR-TYPE:CAPS"/>
@@ -32,9 +33,11 @@
     <keyword type="function" name="app_indicator_new ()" link="libappindicator-app-indicator.html#app-indicator-new"/>
     <keyword type="function" name="app_indicator_new_with_path ()" link="libappindicator-app-indicator.html#app-indicator-new-with-path"/>
     <keyword type="function" name="app_indicator_set_status ()" link="libappindicator-app-indicator.html#app-indicator-set-status"/>
-    <keyword type="function" name="app_indicator_set_attention_icon ()" link="libappindicator-app-indicator.html#app-indicator-set-attention-icon"/>
+    <keyword type="function" name="app_indicator_set_attention_icon ()" link="libappindicator-app-indicator.html#app-indicator-set-attention-icon" deprecated="Use app_indicator_set_attention_icon_full() instead."/>
+    <keyword type="function" name="app_indicator_set_attention_icon_full ()" link="libappindicator-app-indicator.html#app-indicator-set-attention-icon-full"/>
     <keyword type="function" name="app_indicator_set_menu ()" link="libappindicator-app-indicator.html#app-indicator-set-menu"/>
-    <keyword type="function" name="app_indicator_set_icon ()" link="libappindicator-app-indicator.html#app-indicator-set-icon"/>
+    <keyword type="function" name="app_indicator_set_icon ()" link="libappindicator-app-indicator.html#app-indicator-set-icon" deprecated="Use app_indicator_set_icon_full()"/>
+    <keyword type="function" name="app_indicator_set_icon_full ()" link="libappindicator-app-indicator.html#app-indicator-set-icon-full"/>
     <keyword type="function" name="app_indicator_set_icon_theme_path ()" link="libappindicator-app-indicator.html#app-indicator-set-icon-theme-path"/>
     <keyword type="function" name="app_indicator_set_label ()" link="libappindicator-app-indicator.html#app-indicator-set-label"/>
     <keyword type="function" name="app_indicator_set_ordering_index ()" link="libappindicator-app-indicator.html#app-indicator-set-ordering-index"/>
@@ -42,17 +45,21 @@
     <keyword type="function" name="app_indicator_get_category ()" link="libappindicator-app-indicator.html#app-indicator-get-category"/>
     <keyword type="function" name="app_indicator_get_status ()" link="libappindicator-app-indicator.html#app-indicator-get-status"/>
     <keyword type="function" name="app_indicator_get_icon ()" link="libappindicator-app-indicator.html#app-indicator-get-icon"/>
+    <keyword type="function" name="app_indicator_get_icon_desc ()" link="libappindicator-app-indicator.html#app-indicator-get-icon-desc"/>
     <keyword type="function" name="app_indicator_get_icon_theme_path ()" link="libappindicator-app-indicator.html#app-indicator-get-icon-theme-path"/>
     <keyword type="function" name="app_indicator_get_attention_icon ()" link="libappindicator-app-indicator.html#app-indicator-get-attention-icon"/>
+    <keyword type="function" name="app_indicator_get_attention_icon_desc ()" link="libappindicator-app-indicator.html#app-indicator-get-attention-icon-desc"/>
     <keyword type="function" name="app_indicator_get_menu ()" link="libappindicator-app-indicator.html#app-indicator-get-menu"/>
     <keyword type="function" name="app_indicator_get_label ()" link="libappindicator-app-indicator.html#app-indicator-get-label"/>
     <keyword type="function" name="app_indicator_get_label_guide ()" link="libappindicator-app-indicator.html#app-indicator-get-label-guide"/>
     <keyword type="function" name="app_indicator_get_ordering_index ()" link="libappindicator-app-indicator.html#app-indicator-get-ordering-index"/>
     <keyword type="function" name="app_indicator_build_menu_from_desktop ()" link="libappindicator-app-indicator.html#app-indicator-build-menu-from-desktop"/>
+    <keyword type="property" name="The &quot;attention-icon-desc&quot; property" link="libappindicator-app-indicator.html#AppIndicator--attention-icon-desc"/>
     <keyword type="property" name="The &quot;attention-icon-name&quot; property" link="libappindicator-app-indicator.html#AppIndicator--attention-icon-name"/>
     <keyword type="property" name="The &quot;category&quot; property" link="libappindicator-app-indicator.html#AppIndicator--category"/>
     <keyword type="property" name="The &quot;connected&quot; property" link="libappindicator-app-indicator.html#AppIndicator--connected"/>
     <keyword type="property" name="The &quot;dbus-menu-server&quot; property" link="libappindicator-app-indicator.html#AppIndicator--dbus-menu-server"/>
+    <keyword type="property" name="The &quot;icon-desc&quot; property" link="libappindicator-app-indicator.html#AppIndicator--icon-desc"/>
     <keyword type="property" name="The &quot;icon-name&quot; property" link="libappindicator-app-indicator.html#AppIndicator--icon-name"/>
     <keyword type="property" name="The &quot;icon-theme-path&quot; property" link="libappindicator-app-indicator.html#AppIndicator--icon-theme-path"/>
     <keyword type="property" name="The &quot;id&quot; property" link="libappindicator-app-indicator.html#AppIndicator--id"/>
diff --git a/docs/reference/libappindicator-docs.sgml b/docs/reference/libappindicator-docs.sgml
index 4a29d2b..a749a68 100644
--- a/docs/reference/libappindicator-docs.sgml
+++ b/docs/reference/libappindicator-docs.sgml
@@ -8,7 +8,7 @@
   <bookinfo>
     <title>libappindicator Reference Manual</title>
     <releaseinfo>
-      for libappindicator 0.2.95
+      for libappindicator 0.2.96
     </releaseinfo>
   </bookinfo>
 
diff --git a/docs/reference/libappindicator-sections.txt b/docs/reference/libappindicator-sections.txt
index 536e355..da05f40 100644
--- a/docs/reference/libappindicator-sections.txt
+++ b/docs/reference/libappindicator-sections.txt
@@ -24,8 +24,10 @@ app_indicator_new
 app_indicator_new_with_path
 app_indicator_set_status
 app_indicator_set_attention_icon
+app_indicator_set_attention_icon_full
 app_indicator_set_menu
 app_indicator_set_icon
+app_indicator_set_icon_full
 app_indicator_set_icon_theme_path
 app_indicator_set_label
 app_indicator_set_ordering_index
@@ -33,8 +35,10 @@ app_indicator_get_id
 app_indicator_get_category
 app_indicator_get_status
 app_indicator_get_icon
+app_indicator_get_icon_desc
 app_indicator_get_icon_theme_path
 app_indicator_get_attention_icon
+app_indicator_get_attention_icon_desc
 app_indicator_get_menu
 app_indicator_get_label
 app_indicator_get_label_guide
diff --git a/docs/reference/tmpl/app-indicator.sgml b/docs/reference/tmpl/app-indicator.sgml
index 1027d41..cebd2eb 100644
--- a/docs/reference/tmpl/app-indicator.sgml
+++ b/docs/reference/tmpl/app-indicator.sgml
@@ -204,6 +204,11 @@ AppIndicator
 @arg1: 
 @arg2: 
 
+<!-- ##### ARG AppIndicator:attention-icon-desc ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG AppIndicator:attention-icon-name ##### -->
 <para>
 
@@ -224,6 +229,11 @@ AppIndicator
 
 </para>
 
+<!-- ##### ARG AppIndicator:icon-desc ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG AppIndicator:icon-name ##### -->
 <para>
 
@@ -332,6 +342,16 @@ AppIndicator
 @icon_name: 
 
 
+<!-- ##### FUNCTION app_indicator_set_attention_icon_full ##### -->
+<para>
+
+</para>
+
+@self: 
+@icon_name: 
+@icon_desc: 
+
+
 <!-- ##### FUNCTION app_indicator_set_menu ##### -->
 <para>
 
@@ -350,6 +370,16 @@ AppIndicator
 @icon_name: 
 
 
+<!-- ##### FUNCTION app_indicator_set_icon_full ##### -->
+<para>
+
+</para>
+
+@self: 
+@icon_name: 
+@icon_desc: 
+
+
 <!-- ##### FUNCTION app_indicator_set_icon_theme_path ##### -->
 <para>
 
@@ -414,6 +444,15 @@ AppIndicator
 @Returns: 
 
 
+<!-- ##### FUNCTION app_indicator_get_icon_desc ##### -->
+<para>
+
+</para>
+
+@self: 
+@Returns: 
+
+
 <!-- ##### FUNCTION app_indicator_get_icon_theme_path ##### -->
 <para>
 
@@ -432,6 +471,15 @@ AppIndicator
 @Returns: 
 
 
+<!-- ##### FUNCTION app_indicator_get_attention_icon_desc ##### -->
+<para>
+
+</para>
+
+@self: 
+@Returns: 
+
+
 <!-- ##### FUNCTION app_indicator_get_menu ##### -->
 <para>
 
diff --git a/docs/reference/tmpl/libappindicator-unused.sgml b/docs/reference/tmpl/libappindicator-unused.sgml
index 1428b51..789a03f 100644
--- a/docs/reference/tmpl/libappindicator-unused.sgml
+++ b/docs/reference/tmpl/libappindicator-unused.sgml
@@ -1,6 +1,42 @@
+<!-- ##### MACRO APP_INDICATOR_SIGNAL_NEW_ACCESSIBLE_DESC ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SIGNAL AppIndicator::new-accessible-desc ##### -->
+<para>
+
+</para>
+
+@appindicator: the object which received the signal.
+@arg1: 
+
+<!-- ##### ARG AppIndicator:accessible-desc ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### ARG AppIndicator:icon-path ##### -->
 <para>
 
 </para>
 
 
+<!-- ##### FUNCTION app_indicator_get_accessible_desc ##### -->
+<para>
+
+</para>
+
+@self: 
+@Returns: 
+
+<!-- ##### FUNCTION app_indicator_set_accessible_desc ##### -->
+<para>
+
+</para>
+
+@self: 
+@accessible_desc: 
+
diff --git a/docs/reference/version.xml b/docs/reference/version.xml
index 7ed9fbf..27feebe 100644
--- a/docs/reference/version.xml
+++ b/docs/reference/version.xml
@@ -1 +1 @@
-0.2.95
+0.2.96
diff --git a/docs/reference/xml/annotation-glossary.xml b/docs/reference/xml/annotation-glossary.xml
new file mode 100644
index 0000000..f0417a4
--- /dev/null
+++ b/docs/reference/xml/annotation-glossary.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!DOCTYPE glossary PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+]>
+
+<glossary id="annotation-glossary">
+  <title>Annotation Glossary</title>
+<glossdiv><title>T</title>
+    <glossentry>
+      <glossterm><anchor id="annotation-glossterm-transfer none"/>transfer none</glossterm>
+      <glossdef>
+        <para>Don't free data after the code is done.</para>
+      </glossdef>
+    </glossentry>
+</glossdiv>
+</glossary>
diff --git a/docs/reference/xml/api-index-deprecated.xml b/docs/reference/xml/api-index-deprecated.xml
index 8ec0fe4..9e54922 100644
--- a/docs/reference/xml/api-index-deprecated.xml
+++ b/docs/reference/xml/api-index-deprecated.xml
@@ -5,4 +5,8 @@
   <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
 ]>
 <indexdiv>
+<indexdiv><title>I</title>
+<indexentry><primaryie linkends="app-indicator-set-attention-icon"><link linkend="app-indicator-set-attention-icon">app_indicator_set_attention_icon</link>, function in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
+<indexentry><primaryie linkends="app-indicator-set-icon"><link linkend="app-indicator-set-icon">app_indicator_set_icon</link>, function in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
+</indexdiv>
 </indexdiv>
diff --git a/docs/reference/xml/api-index-full.xml b/docs/reference/xml/api-index-full.xml
index a187a94..1ede231 100644
--- a/docs/reference/xml/api-index-full.xml
+++ b/docs/reference/xml/api-index-full.xml
@@ -15,10 +15,12 @@
 <indexentry><primaryie linkends="AppIndicator-new-label"><link linkend="AppIndicator-new-label">AppIndicator::new-label</link>, object signal in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
 <indexentry><primaryie linkends="AppIndicator-new-status"><link linkend="AppIndicator-new-status">AppIndicator::new-status</link>, object signal in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
 <indexentry><primaryie linkends="AppIndicator-scroll-event"><link linkend="AppIndicator-scroll-event">AppIndicator::scroll-event</link>, object signal in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
+<indexentry><primaryie linkends="AppIndicator--attention-icon-desc"><link linkend="AppIndicator--attention-icon-desc">AppIndicator:attention-icon-desc</link>, object property in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
 <indexentry><primaryie linkends="AppIndicator--attention-icon-name"><link linkend="AppIndicator--attention-icon-name">AppIndicator:attention-icon-name</link>, object property in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
 <indexentry><primaryie linkends="AppIndicator--category"><link linkend="AppIndicator--category">AppIndicator:category</link>, object property in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
 <indexentry><primaryie linkends="AppIndicator--connected"><link linkend="AppIndicator--connected">AppIndicator:connected</link>, object property in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
 <indexentry><primaryie linkends="AppIndicator--dbus-menu-server"><link linkend="AppIndicator--dbus-menu-server">AppIndicator:dbus-menu-server</link>, object property in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
+<indexentry><primaryie linkends="AppIndicator--icon-desc"><link linkend="AppIndicator--icon-desc">AppIndicator:icon-desc</link>, object property in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
 <indexentry><primaryie linkends="AppIndicator--icon-name"><link linkend="AppIndicator--icon-name">AppIndicator:icon-name</link>, object property in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
 <indexentry><primaryie linkends="AppIndicator--icon-theme-path"><link linkend="AppIndicator--icon-theme-path">AppIndicator:icon-theme-path</link>, object property in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
 <indexentry><primaryie linkends="AppIndicator--id"><link linkend="AppIndicator--id">AppIndicator:id</link>, object property in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
@@ -33,9 +35,11 @@
 <indexentry><primaryie linkends="app-indicator-build-menu-from-desktop"><link linkend="app-indicator-build-menu-from-desktop">app_indicator_build_menu_from_desktop</link>, function in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
 <indexentry><primaryie linkends="APP-INDICATOR-CLASS:CAPS"><link linkend="APP-INDICATOR-CLASS:CAPS">APP_INDICATOR_CLASS</link>, macro in <link linkend="libappindicator-app-indicator">app-indicator</link></primaryie></indexentry>
 <indexentry><primaryie linkends="app-indicator-get-attention-icon"><link linkend="app-indicator-get-attention-icon">app_indicator_get_attention_icon</link>, function in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
+<indexentry><primaryie linkends="app-indicator-get-attention-icon-desc"><link linkend="app-indicator-get-attention-icon-desc">app_indicator_get_attention_icon_desc</link>, function in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
 <indexentry><primaryie linkends="app-indicator-get-category"><link linkend="app-indicator-get-category">app_indicator_get_category</link>, function in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
 <indexentry><primaryie linkends="APP-INDICATOR-GET-CLASS:CAPS"><link linkend="APP-INDICATOR-GET-CLASS:CAPS">APP_INDICATOR_GET_CLASS</link>, macro in <link linkend="libappindicator-app-indicator">app-indicator</link></primaryie></indexentry>
 <indexentry><primaryie linkends="app-indicator-get-icon"><link linkend="app-indicator-get-icon">app_indicator_get_icon</link>, function in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
+<indexentry><primaryie linkends="app-indicator-get-icon-desc"><link linkend="app-indicator-get-icon-desc">app_indicator_get_icon_desc</link>, function in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
 <indexentry><primaryie linkends="app-indicator-get-icon-theme-path"><link linkend="app-indicator-get-icon-theme-path">app_indicator_get_icon_theme_path</link>, function in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
 <indexentry><primaryie linkends="app-indicator-get-id"><link linkend="app-indicator-get-id">app_indicator_get_id</link>, function in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
 <indexentry><primaryie linkends="app-indicator-get-label"><link linkend="app-indicator-get-label">app_indicator_get_label</link>, function in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
@@ -47,7 +51,9 @@
 <indexentry><primaryie linkends="app-indicator-new"><link linkend="app-indicator-new">app_indicator_new</link>, function in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
 <indexentry><primaryie linkends="app-indicator-new-with-path"><link linkend="app-indicator-new-with-path">app_indicator_new_with_path</link>, function in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
 <indexentry><primaryie linkends="app-indicator-set-attention-icon"><link linkend="app-indicator-set-attention-icon">app_indicator_set_attention_icon</link>, function in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
+<indexentry><primaryie linkends="app-indicator-set-attention-icon-full"><link linkend="app-indicator-set-attention-icon-full">app_indicator_set_attention_icon_full</link>, function in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
 <indexentry><primaryie linkends="app-indicator-set-icon"><link linkend="app-indicator-set-icon">app_indicator_set_icon</link>, function in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
+<indexentry><primaryie linkends="app-indicator-set-icon-full"><link linkend="app-indicator-set-icon-full">app_indicator_set_icon_full</link>, function in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
 <indexentry><primaryie linkends="app-indicator-set-icon-theme-path"><link linkend="app-indicator-set-icon-theme-path">app_indicator_set_icon_theme_path</link>, function in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
 <indexentry><primaryie linkends="app-indicator-set-label"><link linkend="app-indicator-set-label">app_indicator_set_label</link>, function in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
 <indexentry><primaryie linkends="app-indicator-set-menu"><link linkend="app-indicator-set-menu">app_indicator_set_menu</link>, function in <link linkend="libappindicator-app-indicator">AppIndicator</link></primaryie></indexentry>
diff --git a/docs/reference/xml/app-indicator.xml b/docs/reference/xml/app-indicator.xml
index c83b31d..7070140 100644
--- a/docs/reference/xml/app-indicator.xml
+++ b/docs/reference/xml/app-indicator.xml
@@ -58,10 +58,17 @@ struct              <link linkend="AppIndicatorClass">AppIndicatorClass</link>;
                                                          <parameter><link linkend="AppIndicatorStatus"><type>AppIndicatorStatus</type></link> status</parameter>);
 <link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="app-indicator-set-attention-icon">app_indicator_set_attention_icon</link>    (<parameter><link linkend="AppIndicator"><type>AppIndicator</type></link> *self</parameter>,
                                                          <parameter>const <link linkend="gchar"><type>gchar</type></link> *icon_name</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="app-indicator-set-attention-icon-full">app_indicator_set_attention_icon_full</link>
+                                                        (<parameter><link linkend="AppIndicator"><type>AppIndicator</type></link> *self</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *icon_name</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *icon_desc</parameter>);
 <link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="app-indicator-set-menu">app_indicator_set_menu</link>              (<parameter><link linkend="AppIndicator"><type>AppIndicator</type></link> *self</parameter>,
                                                          <parameter><link linkend="GtkMenu"><type>GtkMenu</type></link> *menu</parameter>);
 <link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="app-indicator-set-icon">app_indicator_set_icon</link>              (<parameter><link linkend="AppIndicator"><type>AppIndicator</type></link> *self</parameter>,
                                                          <parameter>const <link linkend="gchar"><type>gchar</type></link> *icon_name</parameter>);
+<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="app-indicator-set-icon-full">app_indicator_set_icon_full</link>         (<parameter><link linkend="AppIndicator"><type>AppIndicator</type></link> *self</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *icon_name</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *icon_desc</parameter>);
 <link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="app-indicator-set-icon-theme-path">app_indicator_set_icon_theme_path</link>   (<parameter><link linkend="AppIndicator"><type>AppIndicator</type></link> *self</parameter>,
                                                          <parameter>const <link linkend="gchar"><type>gchar</type></link> *icon_theme_path</parameter>);
 <link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="app-indicator-set-label">app_indicator_set_label</link>             (<parameter><link linkend="AppIndicator"><type>AppIndicator</type></link> *self</parameter>,
@@ -73,10 +80,14 @@ const <link linkend="gchar"><returnvalue>gchar</returnvalue></link> *
 <link linkend="AppIndicatorCategory"><returnvalue>AppIndicatorCategory</returnvalue></link>  <link linkend="app-indicator-get-category">app_indicator_get_category</link>        (<parameter><link linkend="AppIndicator"><type>AppIndicator</type></link> *self</parameter>);
 <link linkend="AppIndicatorStatus"><returnvalue>AppIndicatorStatus</returnvalue></link>  <link linkend="app-indicator-get-status">app_indicator_get_status</link>            (<parameter><link linkend="AppIndicator"><type>AppIndicator</type></link> *self</parameter>);
 const <link linkend="gchar"><returnvalue>gchar</returnvalue></link> *                    <link linkend="app-indicator-get-icon">app_indicator_get_icon</link> (<parameter><link linkend="AppIndicator"><type>AppIndicator</type></link> *self</parameter>);
+const <link linkend="gchar"><returnvalue>gchar</returnvalue></link> *                    <link linkend="app-indicator-get-icon-desc">app_indicator_get_icon_desc</link>
+                                                        (<parameter><link linkend="AppIndicator"><type>AppIndicator</type></link> *self</parameter>);
 const <link linkend="gchar"><returnvalue>gchar</returnvalue></link> *                    <link linkend="app-indicator-get-icon-theme-path">app_indicator_get_icon_theme_path</link>
                                                         (<parameter><link linkend="AppIndicator"><type>AppIndicator</type></link> *self</parameter>);
 const <link linkend="gchar"><returnvalue>gchar</returnvalue></link> *                    <link linkend="app-indicator-get-attention-icon">app_indicator_get_attention_icon</link>
                                                         (<parameter><link linkend="AppIndicator"><type>AppIndicator</type></link> *self</parameter>);
+const <link linkend="gchar"><returnvalue>gchar</returnvalue></link> *                    <link linkend="app-indicator-get-attention-icon-desc">app_indicator_get_attention_icon_desc</link>
+                                                        (<parameter><link linkend="AppIndicator"><type>AppIndicator</type></link> *self</parameter>);
 <link linkend="GtkMenu"><returnvalue>GtkMenu</returnvalue></link> *                        <link linkend="app-indicator-get-menu">app_indicator_get_menu</link> (<parameter><link linkend="AppIndicator"><type>AppIndicator</type></link> *self</parameter>);
 const <link linkend="gchar"><returnvalue>gchar</returnvalue></link> *                    <link linkend="app-indicator-get-label">app_indicator_get_label</link>
                                                         (<parameter><link linkend="AppIndicator"><type>AppIndicator</type></link> *self</parameter>);
@@ -99,11 +110,13 @@ const <link linkend="gchar"><returnvalue>gchar</returnvalue></link> *
 <refsect1 id="libappindicator-app-indicator.properties" role="properties">
 <title role="properties.title">Properties</title>
 <synopsis>
+  &quot;<link linkend="AppIndicator--attention-icon-desc">attention-icon-desc</link>&quot;      <link linkend="gchar"><type>gchar</type></link>*                : Read / Write
   &quot;<link linkend="AppIndicator--attention-icon-name">attention-icon-name</link>&quot;      <link linkend="gchar"><type>gchar</type></link>*                : Read / Write
   &quot;<link linkend="AppIndicator--category">category</link>&quot;                 <link linkend="gchar"><type>gchar</type></link>*                : Read / Write / Construct Only
   &quot;<link linkend="AppIndicator--connected">connected</link>&quot;                <link linkend="gboolean"><type>gboolean</type></link>              : Read
   &quot;<link linkend="AppIndicator--dbus-menu-server">dbus-menu-server</link>&quot;         <link linkend="DbusmenuServer"><type>DbusmenuServer</type></link>*       : Read / Write
-  &quot;<link linkend="AppIndicator--icon-name">icon-name</link>&quot;                <link linkend="gchar"><type>gchar</type></link>*                : Read / Write / Construct
+  &quot;<link linkend="AppIndicator--icon-desc">icon-desc</link>&quot;                <link linkend="gchar"><type>gchar</type></link>*                : Read / Write
+  &quot;<link linkend="AppIndicator--icon-name">icon-name</link>&quot;                <link linkend="gchar"><type>gchar</type></link>*                : Read / Write
   &quot;<link linkend="AppIndicator--icon-theme-path">icon-theme-path</link>&quot;          <link linkend="gchar"><type>gchar</type></link>*                : Read / Write / Construct
   &quot;<link linkend="AppIndicator--id">id</link>&quot;                       <link linkend="gchar"><type>gchar</type></link>*                : Read / Write / Construct Only
   &quot;<link linkend="AppIndicator--label">label</link>&quot;                    <link linkend="gchar"><type>gchar</type></link>*                : Read / Write
@@ -521,11 +534,28 @@ Wrapper function for property <link linkend="AppIndicator--status"><type>"status
 <varlistentry><term><parameter>status</parameter>&#160;:</term>
 <listitem><simpara>The status to set for this indicator</simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="app-indicator-set-attention-icon" role="function">
+<refsect2 id="app-indicator-set-attention-icon" role="function" condition="deprecated:Use app_indicator_set_attention_icon_full() instead.">
 <title>app_indicator_set_attention_icon ()</title>
-<indexterm zone="app-indicator-set-attention-icon"><primary>app_indicator_set_attention_icon</primary></indexterm>
+<indexterm zone="app-indicator-set-attention-icon" role="deprecated"><primary>app_indicator_set_attention_icon</primary></indexterm>
 <programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                app_indicator_set_attention_icon    (<parameter><link linkend="AppIndicator"><type>AppIndicator</type></link> *self</parameter>,
                                                          <parameter>const <link linkend="gchar"><type>gchar</type></link> *icon_name</parameter>);</programlisting>
+<warning><para><literal>app_indicator_set_attention_icon</literal> is deprecated and should not be used in newly-written code. Use <link linkend="app-indicator-set-attention-icon-full"><function>app_indicator_set_attention_icon_full()</function></link> instead.</para></warning>
+<para>
+Wrapper for <link linkend="app-indicator-set-attention-icon-full"><function>app_indicator_set_attention_icon_full()</function></link> with a NULL
+	description.
+</para><variablelist role="params">
+<varlistentry><term><parameter>self</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="AppIndicator"><type>AppIndicator</type></link> object to use</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>icon_name</parameter>&#160;:</term>
+<listitem><simpara>The name of the attention icon to set for this indicator</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="app-indicator-set-attention-icon-full" role="function">
+<title>app_indicator_set_attention_icon_full ()</title>
+<indexterm zone="app-indicator-set-attention-icon-full"><primary>app_indicator_set_attention_icon_full</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                app_indicator_set_attention_icon_full
+                                                        (<parameter><link linkend="AppIndicator"><type>AppIndicator</type></link> *self</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *icon_name</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *icon_desc</parameter>);</programlisting>
 <para>
 Wrapper function for property <link linkend="AppIndicator--attention-icon-name"><type>"attention-icon-name"</type></link>.
 </para><variablelist role="params">
@@ -533,6 +563,8 @@ Wrapper function for property <link linkend="AppIndicator--attention-icon-name">
 <listitem><simpara>The <link linkend="AppIndicator"><type>AppIndicator</type></link> object to use</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>icon_name</parameter>&#160;:</term>
 <listitem><simpara>The name of the attention icon to set for this indicator</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>icon_desc</parameter>&#160;:</term>
+<listitem><simpara>A textual description of the icon</simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="app-indicator-set-menu" role="function">
 <title>app_indicator_set_menu ()</title>
@@ -551,21 +583,42 @@ Sets the menu that should be shown when the Application Indicator
 <varlistentry><term><parameter>menu</parameter>&#160;:</term>
 <listitem><simpara>A <link linkend="GtkMenu"><type>GtkMenu</type></link> to set</simpara></listitem></varlistentry>
 </variablelist></refsect2>
-<refsect2 id="app-indicator-set-icon" role="function">
+<refsect2 id="app-indicator-set-icon" role="function" condition="deprecated:Use app_indicator_set_icon_full()">
 <title>app_indicator_set_icon ()</title>
-<indexterm zone="app-indicator-set-icon"><primary>app_indicator_set_icon</primary></indexterm>
+<indexterm zone="app-indicator-set-icon" role="deprecated"><primary>app_indicator_set_icon</primary></indexterm>
 <programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                app_indicator_set_icon              (<parameter><link linkend="AppIndicator"><type>AppIndicator</type></link> *self</parameter>,
                                                          <parameter>const <link linkend="gchar"><type>gchar</type></link> *icon_name</parameter>);</programlisting>
+<warning><para><literal>app_indicator_set_icon</literal> is deprecated and should not be used in newly-written code. Use <link linkend="app-indicator-set-icon-full"><function>app_indicator_set_icon_full()</function></link></para></warning>
+<para>
+Wrapper function for <link linkend="app-indicator-set-icon-full"><function>app_indicator_set_icon_full()</function></link> with a NULL
+		description.
+</para><variablelist role="params">
+<varlistentry><term><parameter>self</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="AppIndicator"><type>AppIndicator</type></link> object to use</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>icon_name</parameter>&#160;:</term>
+<listitem><simpara>The icon name to set.</simpara></listitem></varlistentry>
+</variablelist></refsect2>
+<refsect2 id="app-indicator-set-icon-full" role="function">
+<title>app_indicator_set_icon_full ()</title>
+<indexterm zone="app-indicator-set-icon-full"><primary>app_indicator_set_icon_full</primary></indexterm>
+<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                app_indicator_set_icon_full         (<parameter><link linkend="AppIndicator"><type>AppIndicator</type></link> *self</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *icon_name</parameter>,
+                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *icon_desc</parameter>);</programlisting>
 <para>
 Sets the default icon to use when the status is active but
 		not set to attention.  In most cases, this should be the
 		application icon for the program.
-		Wrapper function for property <link linkend="AppIndicator--icon-name"><type>"icon-name"</type></link>.
+</para>
+<para>
+		Wrapper function for property <link linkend="AppIndicator--icon-name"><type>"icon-name"</type></link> and
+		<link linkend="AppIndicator-icon-description"><type>"icon-description"</type></link>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>self</parameter>&#160;:</term>
 <listitem><simpara>The <link linkend="AppIndicator"><type>AppIndicator</type></link> object to use</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>icon_name</parameter>&#160;:</term>
 <listitem><simpara>The icon name to set.</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>icon_desc</parameter>&#160;:</term>
+<listitem><simpara>A textual description of the icon for accessibility</simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="app-indicator-set-icon-theme-path" role="function">
 <title>app_indicator_set_icon_theme_path ()</title>
@@ -660,6 +713,18 @@ Wrapper function for property <link linkend="AppIndicator--icon-name"><type>"ico
 <listitem><simpara>The <link linkend="AppIndicator"><type>AppIndicator</type></link> object to use</simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>The current icon name.</simpara></listitem></varlistentry>
 </variablelist></refsect2>
+<refsect2 id="app-indicator-get-icon-desc" role="function">
+<title>app_indicator_get_icon_desc ()</title>
+<indexterm zone="app-indicator-get-icon-desc"><primary>app_indicator_get_icon_desc</primary></indexterm>
+<programlisting>const <link linkend="gchar"><returnvalue>gchar</returnvalue></link> *                    app_indicator_get_icon_desc
+                                                        (<parameter><link linkend="AppIndicator"><type>AppIndicator</type></link> *self</parameter>);</programlisting>
+<para>
+Wrapper function for property <link linkend="AppIndicator--icon-desc"><type>"icon-desc"</type></link>.
+</para><variablelist role="params">
+<varlistentry><term><parameter>self</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="AppIndicator"><type>AppIndicator</type></link> object to use</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>The current icon description.</simpara></listitem></varlistentry>
+</variablelist></refsect2>
 <refsect2 id="app-indicator-get-icon-theme-path" role="function">
 <title>app_indicator_get_icon_theme_path ()</title>
 <indexterm zone="app-indicator-get-icon-theme-path"><primary>app_indicator_get_icon_theme_path</primary></indexterm>
@@ -684,6 +749,18 @@ Wrapper function for property <link linkend="AppIndicator--attention-icon-name">
 <listitem><simpara>The <link linkend="AppIndicator"><type>AppIndicator</type></link> object to use</simpara></listitem></varlistentry>
 <varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>The current attention icon name.</simpara></listitem></varlistentry>
 </variablelist></refsect2>
+<refsect2 id="app-indicator-get-attention-icon-desc" role="function">
+<title>app_indicator_get_attention_icon_desc ()</title>
+<indexterm zone="app-indicator-get-attention-icon-desc"><primary>app_indicator_get_attention_icon_desc</primary></indexterm>
+<programlisting>const <link linkend="gchar"><returnvalue>gchar</returnvalue></link> *                    app_indicator_get_attention_icon_desc
+                                                        (<parameter><link linkend="AppIndicator"><type>AppIndicator</type></link> *self</parameter>);</programlisting>
+<para>
+Wrapper function for property <link linkend="AppIndicator--attention-icon-desc"><type>"attention-icon-desc"</type></link>.
+</para><variablelist role="params">
+<varlistentry><term><parameter>self</parameter>&#160;:</term>
+<listitem><simpara>The <link linkend="AppIndicator"><type>AppIndicator</type></link> object to use</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>The current attention icon description.</simpara></listitem></varlistentry>
+</variablelist></refsect2>
 <refsect2 id="app-indicator-get-menu" role="function">
 <title>app_indicator_get_menu ()</title>
 <indexterm zone="app-indicator-get-menu"><primary>app_indicator_get_menu</primary></indexterm>
@@ -694,7 +771,7 @@ Gets the menu being used for this application indicator.
 </para><variablelist role="params">
 <varlistentry><term><parameter>self</parameter>&#160;:</term>
 <listitem><simpara>The <link linkend="AppIndicator"><type>AppIndicator</type></link> object to use</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>A <link linkend="GtkMenu"><type>GtkMenu</type></link> object or <link linkend="NULL:CAPS"><literal>NULL</literal></link> if one hasn't been set.</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>A <link linkend="GtkMenu"><type>GtkMenu</type></link> object or <link linkend="NULL:CAPS"><literal>NULL</literal></link> if one hasn't been set. <emphasis role="annotation">[<acronym>transfer none</acronym>]</emphasis></simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="app-indicator-get-label" role="function">
 <title>app_indicator_get_label ()</title>
@@ -753,6 +830,14 @@ This function allows for building the Application Indicator menu
 </refsect1>
 <refsect1 id="libappindicator-app-indicator.property-details" role="property_details">
 <title role="property_details.title">Property Details</title>
+<refsect2 id="AppIndicator--attention-icon-desc" role="property"><title>The <literal>&quot;attention-icon-desc&quot;</literal> property</title>
+<indexterm zone="AppIndicator--attention-icon-desc"><primary>AppIndicator:attention-icon-desc</primary></indexterm>
+<programlisting>  &quot;attention-icon-desc&quot;      <link linkend="gchar"><type>gchar</type></link>*                : Read / Write</programlisting>
+<para>
+If the indicator sets it's status to <link linkend="APP-INDICATOR-STATUS-ATTENTION:CAPS"><literal>APP_INDICATOR_STATUS_ATTENTION</literal></link>
+		then this textual description of the icon shown.
+</para><para>Default value: NULL</para>
+</refsect2>
 <refsect2 id="AppIndicator--attention-icon-name" role="property"><title>The <literal>&quot;attention-icon-name&quot;</literal> property</title>
 <indexterm zone="AppIndicator--attention-icon-name"><primary>AppIndicator:attention-icon-name</primary></indexterm>
 <programlisting>  &quot;attention-icon-name&quot;      <link linkend="gchar"><type>gchar</type></link>*                : Read / Write</programlisting>
@@ -784,9 +869,16 @@ Pretty simple, <link linkend="TRUE:CAPS"><literal>TRUE</literal></link> if we ha
 A way to get the internal dbusmenu server if it is available.
 		This should only be used for testing.
 </para></refsect2>
+<refsect2 id="AppIndicator--icon-desc" role="property"><title>The <literal>&quot;icon-desc&quot;</literal> property</title>
+<indexterm zone="AppIndicator--icon-desc"><primary>AppIndicator:icon-desc</primary></indexterm>
+<programlisting>  &quot;icon-desc&quot;                <link linkend="gchar"><type>gchar</type></link>*                : Read / Write</programlisting>
+<para>
+The description of the regular icon that is shown for the indicator.
+</para><para>Default value: NULL</para>
+</refsect2>
 <refsect2 id="AppIndicator--icon-name" role="property"><title>The <literal>&quot;icon-name&quot;</literal> property</title>
 <indexterm zone="AppIndicator--icon-name"><primary>AppIndicator:icon-name</primary></indexterm>
-<programlisting>  &quot;icon-name&quot;                <link linkend="gchar"><type>gchar</type></link>*                : Read / Write / Construct</programlisting>
+<programlisting>  &quot;icon-name&quot;                <link linkend="gchar"><type>gchar</type></link>*                : Read / Write</programlisting>
 <para>
 The name of the regular icon that is shown for the indicator.
 </para><para>Default value: NULL</para>
diff --git a/example/simple-client-vala.c b/example/simple-client-vala.c
index 0053429..44dca9e 100644
--- a/example/simple-client-vala.c
+++ b/example/simple-client-vala.c
@@ -1,4 +1,4 @@
-/* simple-client-vala.c generated by valac 0.11.5, the Vala compiler
+/* simple-client-vala.c generated by valac 0.11.6, the Vala compiler
  * generated from simple-client-vala.vala, do not modify */
 
 /*
diff --git a/example/simple-client.c b/example/simple-client.c
index 1cf06dc..9e63e14 100644
--- a/example/simple-client.c
+++ b/example/simple-client.c
@@ -65,9 +65,9 @@ local_icon_toggle_cb (GtkWidget *widget, gpointer data)
 	AppIndicator * ci = APP_INDICATOR(data);
 
 	if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) {
-		app_indicator_set_icon(ci, LOCAL_ICON);
+		app_indicator_set_icon_full(ci, LOCAL_ICON, "Local Icon");
 	} else {
-		app_indicator_set_icon(ci, "indicator-messages");
+		app_indicator_set_icon_full(ci, "indicator-messages", "System Icon");
 	}
 
 	return;
@@ -165,7 +165,7 @@ main (int argc, char ** argv)
         g_assert (G_IS_OBJECT (ci));
 
 	app_indicator_set_status (ci, APP_INDICATOR_STATUS_ACTIVE);
-	app_indicator_set_attention_icon(ci, "indicator-messages-new");
+	app_indicator_set_attention_icon_full(ci, "indicator-messages-new", "System Messages Icon Highlighted");
 	app_indicator_set_label (ci, "1%", "100%");
 
 	g_signal_connect (ci, "scroll-event",
diff --git a/ltmain.sh b/ltmain.sh
index 7ed280b..6765090 100755
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -65,7 +65,7 @@
 #       compiler:		$LTCC
 #       compiler flags:		$LTCFLAGS
 #       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
+#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu2
 #       automake:		$automake_version
 #       autoconf:		$autoconf_version
 #
@@ -73,7 +73,7 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
+VERSION="2.2.6b Debian-2.2.6b-2ubuntu2"
 TIMESTAMP=""
 package_revision=1.3017
 
diff --git a/src/app-indicator.c b/src/app-indicator.c
index f4e9173..167e17f 100644
--- a/src/app-indicator.c
+++ b/src/app-indicator.c
@@ -80,6 +80,8 @@ struct _AppIndicatorPrivate {
 	guint32               ordering_index;
 	gchar *               label;
 	gchar *               label_guide;
+	gchar *               accessible_desc;
+	gchar *               att_accessible_desc;
 	guint                 label_change_idle;
 
 	GtkStatusIcon *       status_icon;
@@ -117,7 +119,9 @@ enum {
 	PROP_CATEGORY,
 	PROP_STATUS,
 	PROP_ICON_NAME,
+	PROP_ICON_DESC,
 	PROP_ATTENTION_ICON_NAME,
+	PROP_ATTENTION_ICON_DESC,
 	PROP_ICON_THEME_PATH,
 	PROP_CONNECTED,
 	PROP_LABEL,
@@ -131,7 +135,9 @@ enum {
 #define PROP_CATEGORY_S              "category"
 #define PROP_STATUS_S                "status"
 #define PROP_ICON_NAME_S             "icon-name"
+#define PROP_ICON_DESC_S             "icon-desc"
 #define PROP_ATTENTION_ICON_NAME_S   "attention-icon-name"
+#define PROP_ATTENTION_ICON_DESC_S   "attention-icon-desc"
 #define PROP_ICON_THEME_PATH_S       "icon-theme-path"
 #define PROP_CONNECTED_S             "connected"
 #define PROP_LABEL_S                 "label"
@@ -263,12 +269,24 @@ app_indicator_class_init (AppIndicatorClass *klass)
 		The name of the regular icon that is shown for the indicator.
 	*/
 	g_object_class_install_property(object_class,
-                                    PROP_ICON_NAME,
+	                                PROP_ICON_NAME,
 	                                g_param_spec_string (PROP_ICON_NAME_S,
-                                                             "An icon for the indicator",
-                                                             "The default icon that is shown for the indicator.",
-                                                             NULL,
-                                                             G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT));
+	                                                     "An icon for the indicator",
+	                                                     "The default icon that is shown for the indicator.",
+	                                                     NULL,
+	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	/**
+		AppIndicator:icon-desc:
+		
+		The description of the regular icon that is shown for the indicator.
+	*/
+	g_object_class_install_property(object_class,
+	                                PROP_ICON_DESC,
+	                                g_param_spec_string (PROP_ICON_DESC_S,
+	                                                     "A description of the icon for the indicator",
+	                                                     "A description of the default icon that is shown for the indicator.",
+	                                                     NULL,
+	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	/**
 		AppIndicator:attention-icon-name:
@@ -284,6 +302,19 @@ app_indicator_class_init (AppIndicatorClass *klass)
                                                               NULL,
                                                               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 	/**
+		AppIndicator:attention-icon-desc:
+		
+		If the indicator sets it's status to %APP_INDICATOR_STATUS_ATTENTION
+		then this textual description of the icon shown.
+	*/
+	g_object_class_install_property (object_class,
+	                                 PROP_ATTENTION_ICON_DESC,
+	                                 g_param_spec_string (PROP_ATTENTION_ICON_DESC_S,
+	                                                      "A description of the icon to show when the indicator request attention.",
+	                                                      "When the indicator is an attention mode this should describe the icon shown",
+	                                                      NULL,
+	                                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+	/**
 		AppIndicator:icon-theme-path:
 		
 		An additional place to look for icon names that may be installed by the
@@ -442,7 +473,6 @@ app_indicator_class_init (AppIndicatorClass *klass)
 	                                    _application_service_marshal_VOID__STRING_STRING,
 	                                    G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
 
-
 	/**
 		AppIndicator::connection-changed:
 		@arg0: The #AppIndicator object
@@ -579,11 +609,6 @@ app_indicator_dispose (GObject *object)
 	AppIndicator *self = APP_INDICATOR (object);
 	AppIndicatorPrivate *priv = self->priv;
 
-	if (priv->dbus_registration != 0) {
-		g_dbus_connection_unregister_object(priv->connection, priv->dbus_registration);
-		priv->dbus_registration = 0;
-	}
-
 	if (priv->shorties != NULL) {
 		g_object_unref(G_OBJECT(priv->shorties));
 		priv->shorties = NULL;
@@ -632,6 +657,11 @@ app_indicator_dispose (GObject *object)
         g_signal_emit (self, signals[CONNECTION_CHANGED], 0, FALSE);
 	}
 
+	if (priv->dbus_registration != 0) {
+		g_dbus_connection_unregister_object(priv->connection, priv->dbus_registration);
+		priv->dbus_registration = 0;
+	}
+
 	if (priv->connection != NULL) {
 		g_object_unref(G_OBJECT(priv->connection));
 		priv->connection = NULL;
@@ -688,6 +718,16 @@ app_indicator_finalize (GObject *object)
 		priv->label_guide = NULL;
 	}
 
+	if (priv->accessible_desc != NULL) {
+		g_free(priv->accessible_desc);
+		priv->accessible_desc = NULL;
+	}
+
+	if (priv->att_accessible_desc != NULL) {
+		g_free(priv->att_accessible_desc);
+		priv->att_accessible_desc = NULL;
+	}
+
 	if (priv->path != NULL) {
 		g_free(priv->path);
 		priv->path = NULL;
@@ -747,14 +787,29 @@ app_indicator_set_property (GObject * object, guint prop_id, const GValue * valu
           break;
 
         case PROP_ICON_NAME:
-          app_indicator_set_icon (APP_INDICATOR (object),
-                                  g_value_get_string (value));
+          app_indicator_set_icon_full (APP_INDICATOR (object),
+                                       g_value_get_string (value),
+                                       priv->accessible_desc);
+          check_connect (self);
+          break;
+
+        case PROP_ICON_DESC:
+          app_indicator_set_icon_full (APP_INDICATOR (object),
+                                       priv->icon_name,
+                                       g_value_get_string (value));
           check_connect (self);
           break;
 
         case PROP_ATTENTION_ICON_NAME:
-          app_indicator_set_attention_icon (APP_INDICATOR (object),
-                                            g_value_get_string (value));
+          app_indicator_set_attention_icon_full (APP_INDICATOR (object),
+                                                 g_value_get_string (value),
+                                                 priv->att_accessible_desc);
+          break;
+
+        case PROP_ATTENTION_ICON_DESC:
+          app_indicator_set_attention_icon_full (APP_INDICATOR (object),
+                                                 priv->attention_icon_name,
+                                                 g_value_get_string (value));
           break;
 
         case PROP_ICON_THEME_PATH:
@@ -846,10 +901,18 @@ app_indicator_get_property (GObject * object, guint prop_id, GValue * value, GPa
           g_value_set_string (value, priv->icon_name);
           break;
 
+        case PROP_ICON_DESC:
+          g_value_set_string (value, priv->accessible_desc);
+          break;
+
         case PROP_ATTENTION_ICON_NAME:
           g_value_set_string (value, priv->attention_icon_name);
           break;
 
+        case PROP_ATTENTION_ICON_DESC:
+          g_value_set_string (value, priv->att_accessible_desc);
+          break;
+
         case PROP_ICON_THEME_PATH:
           g_value_set_string (value, priv->icon_theme_path);
           break;
@@ -999,6 +1062,10 @@ bus_get_prop (GDBusConnection * connection, const gchar * sender, const gchar *
 		return g_variant_new_string(priv->label_guide ? priv->label_guide : "");
 	} else if (g_strcmp0(property, "XAyatanaOrderingIndex") == 0) {
 		return g_variant_new_uint32(priv->ordering_index);
+	} else if (g_strcmp0(property, "IconAccessibleDesc") == 0) {
+		return g_variant_new_string(priv->accessible_desc ? priv->accessible_desc : "");
+	} else if (g_strcmp0(property, "AttentionAccessibleDesc") == 0) {
+		return g_variant_new_string(priv->att_accessible_desc ? priv->att_accessible_desc : "");
 	}
 
 	*error = g_error_new(0, 0, "Unknown property: %s", property);
@@ -1613,20 +1680,51 @@ app_indicator_set_status (AppIndicator *self, AppIndicatorStatus status)
 	@self: The #AppIndicator object to use
 	@icon_name: The name of the attention icon to set for this indicator
 
-	Wrapper function for property #AppIndicator:attention-icon-name.
+	Wrapper for app_indicator_set_attention_icon_full() with a NULL
+	description.
+
+	Deprecated: Use app_indicator_set_attention_icon_full() instead.
 */
 void
 app_indicator_set_attention_icon (AppIndicator *self, const gchar *icon_name)
 {
+	return app_indicator_set_attention_icon_full(self, icon_name, NULL);
+}
+
+/**
+	app_indicator_set_attention_icon_full:
+	@self: The #AppIndicator object to use
+	@icon_name: The name of the attention icon to set for this indicator
+	@icon_desc: A textual description of the icon
+
+	Wrapper function for property #AppIndicator:attention-icon-name.
+*/
+void
+app_indicator_set_attention_icon_full (AppIndicator *self, const gchar *icon_name, const gchar * icon_desc)
+{
 	g_return_if_fail (IS_APP_INDICATOR (self));
 	g_return_if_fail (icon_name != NULL);
+	gboolean changed = FALSE;
 
 	if (g_strcmp0 (self->priv->attention_icon_name, icon_name) != 0) {
-		if (self->priv->attention_icon_name)
+		if (self->priv->attention_icon_name) {
 			g_free (self->priv->attention_icon_name);
+		}
 
 		self->priv->attention_icon_name = g_strdup(icon_name);
+		changed = TRUE;
+	}
 
+	if (g_strcmp0(self->priv->att_accessible_desc, icon_desc) != 0) {
+		if (self->priv->att_accessible_desc) {
+			g_free (self->priv->att_accessible_desc);
+		}
+
+		self->priv->att_accessible_desc = g_strdup(icon_name);
+		changed = TRUE;
+	}
+
+	if (changed) {
 		g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0, TRUE);
 
 		if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
@@ -1655,23 +1753,56 @@ app_indicator_set_attention_icon (AppIndicator *self, const gchar *icon_name)
         @self: The #AppIndicator object to use
         @icon_name: The icon name to set.
 
+		Wrapper function for app_indicator_set_icon_full() with a NULL
+		description.
+
+		Deprecated: Use app_indicator_set_icon_full()
+**/
+void
+app_indicator_set_icon (AppIndicator *self, const gchar *icon_name)
+{
+	return app_indicator_set_icon_full(self, icon_name, NULL);
+}
+
+/**
+        app_indicator_set_icon_full:
+        @self: The #AppIndicator object to use
+        @icon_name: The icon name to set.
+		@icon_desc: A textual description of the icon for accessibility
+
 		Sets the default icon to use when the status is active but
 		not set to attention.  In most cases, this should be the
 		application icon for the program.
-		Wrapper function for property #AppIndicator:icon-name.
+
+		Wrapper function for property #AppIndicator:icon-name and
+		#AppIndicator::icon-description.
 **/
 void
-app_indicator_set_icon (AppIndicator *self, const gchar *icon_name)
+app_indicator_set_icon_full (AppIndicator *self, const gchar *icon_name, const gchar * icon_desc)
 {
 	g_return_if_fail (IS_APP_INDICATOR (self));
 	g_return_if_fail (icon_name != NULL);
+	gboolean changed = FALSE;
 
 	if (g_strcmp0 (self->priv->icon_name, icon_name) != 0) {
-		if (self->priv->icon_name)
+		if (self->priv->icon_name) {
 			g_free (self->priv->icon_name);
+		}
 
 		self->priv->icon_name = g_strdup(icon_name);
+		changed = TRUE;
+	}
+
+	if (g_strcmp0(self->priv->accessible_desc, icon_desc) != 0) {
+		if (self->priv->accessible_desc != NULL) {
+			g_free(self->priv->accessible_desc);
+		}
 
+		self->priv->accessible_desc = g_strdup(icon_desc);
+		changed = TRUE;
+	}
+
+	if (changed) {
 		g_signal_emit (self, signals[NEW_ICON], 0, TRUE);
 
 		if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
@@ -1930,6 +2061,22 @@ app_indicator_get_icon (AppIndicator *self)
 }
 
 /**
+	app_indicator_get_icon_desc:
+	@self: The #AppIndicator object to use
+
+	Wrapper function for property #AppIndicator:icon-desc.
+
+	Return value: The current icon description.
+*/
+const gchar *
+app_indicator_get_icon_desc (AppIndicator *self)
+{
+  g_return_val_if_fail (IS_APP_INDICATOR (self), NULL);
+
+  return self->priv->accessible_desc;
+}
+
+/**
 	app_indicator_get_icon_theme_path:
 	@self: The #AppIndicator object to use
 
@@ -1962,13 +2109,29 @@ app_indicator_get_attention_icon (AppIndicator *self)
 }
 
 /**
+	app_indicator_get_attention_icon_desc:
+	@self: The #AppIndicator object to use
+
+	Wrapper function for property #AppIndicator:attention-icon-desc.
+
+	Return value: The current attention icon description.
+*/
+const gchar *
+app_indicator_get_attention_icon_desc (AppIndicator *self)
+{
+  g_return_val_if_fail (IS_APP_INDICATOR (self), NULL);
+
+  return self->priv->att_accessible_desc;
+}
+
+/**
 	app_indicator_get_menu:
 	@self: The #AppIndicator object to use
 
 	Gets the menu being used for this application indicator.
 	Wrapper function for property #AppIndicator:menu.
 
-	Return value: A #GtkMenu object or %NULL if one hasn't been set.
+	Return value: (transfer none): A #GtkMenu object or %NULL if one hasn't been set.
 */
 GtkMenu *
 app_indicator_get_menu (AppIndicator *self)
diff --git a/src/app-indicator.h b/src/app-indicator.h
index 3fdee86..f96212d 100644
--- a/src/app-indicator.h
+++ b/src/app-indicator.h
@@ -267,10 +267,16 @@ void                            app_indicator_set_status         (AppIndicator
                                                                   AppIndicatorStatus  status);
 void                            app_indicator_set_attention_icon (AppIndicator       *self,
                                                                   const gchar        *icon_name);
+void                            app_indicator_set_attention_icon_full (AppIndicator       *self,
+                                                                  const gchar        *icon_name,
+                                                                  const gchar        *icon_desc);
 void                            app_indicator_set_menu           (AppIndicator       *self,
                                                                   GtkMenu            *menu);
 void                            app_indicator_set_icon           (AppIndicator       *self,
                                                                   const gchar        *icon_name);
+void                            app_indicator_set_icon_full      (AppIndicator       *self,
+                                                                  const gchar        *icon_name,
+                                                                  const gchar        *icon_desc);
 void                            app_indicator_set_label          (AppIndicator       *self,
                                                                   const gchar        *label,
                                                                   const gchar        *guide);
@@ -280,16 +286,18 @@ void                            app_indicator_set_ordering_index (AppIndicator
                                                                   guint32             ordering_index);
 
 /* Get properties */
-const gchar *                   app_indicator_get_id             (AppIndicator *self);
-AppIndicatorCategory            app_indicator_get_category       (AppIndicator *self);
-AppIndicatorStatus              app_indicator_get_status         (AppIndicator *self);
-const gchar *                   app_indicator_get_icon           (AppIndicator *self);
-const gchar *                   app_indicator_get_icon_theme_path(AppIndicator *self);
-const gchar *                   app_indicator_get_attention_icon (AppIndicator *self);
-GtkMenu *                       app_indicator_get_menu           (AppIndicator *self);
-const gchar *                   app_indicator_get_label          (AppIndicator *self);
-const gchar *                   app_indicator_get_label_guide    (AppIndicator *self);
-guint32                         app_indicator_get_ordering_index (AppIndicator *self);
+const gchar *                   app_indicator_get_id                   (AppIndicator *self);
+AppIndicatorCategory            app_indicator_get_category             (AppIndicator *self);
+AppIndicatorStatus              app_indicator_get_status               (AppIndicator *self);
+const gchar *                   app_indicator_get_icon                 (AppIndicator *self);
+const gchar *                   app_indicator_get_icon_desc            (AppIndicator *self);
+const gchar *                   app_indicator_get_icon_theme_path      (AppIndicator *self);
+const gchar *                   app_indicator_get_attention_icon       (AppIndicator *self);
+const gchar *                   app_indicator_get_attention_icon_desc  (AppIndicator *self);
+GtkMenu *                       app_indicator_get_menu                 (AppIndicator *self);
+const gchar *                   app_indicator_get_label                (AppIndicator *self);
+const gchar *                   app_indicator_get_label_guide          (AppIndicator *self);
+guint32                         app_indicator_get_ordering_index       (AppIndicator *self);
 
 /* Helpers */
 void                            app_indicator_build_menu_from_desktop (AppIndicator * self,
diff --git a/src/gen-notification-item.xml.c b/src/gen-notification-item.xml.c
index b80567e..aa2ee0d 100644
--- a/src/gen-notification-item.xml.c
+++ b/src/gen-notification-item.xml.c
@@ -8,7 +8,9 @@ const char * _notification_item =
 "		<property name=\"Category\" type=\"s\" access=\"read\" />\n"
 "		<property name=\"Status\" type=\"s\" access=\"read\" />\n"
 "		<property name=\"IconName\" type=\"s\" access=\"read\" />\n"
+"		<property name=\"IconAccessibleDesc\" type=\"s\" access=\"read\" />\n"
 "		<property name=\"AttentionIconName\" type=\"s\" access=\"read\" />\n"
+"		<property name=\"AttentionAccessibleDesc\" type=\"s\" access=\"read\" />\n"
 "		<!-- An additional path to add to the theme search path\n"
 "		     to find the icons specified above. -->\n"
 "		<property name=\"IconThemePath\" type=\"s\" access=\"read\" />\n"
@@ -38,6 +40,7 @@ const char * _notification_item =
 "			<arg type=\"s\" name=\"label\" direction=\"out\" />\n"
 "			<arg type=\"s\" name=\"guide\" direction=\"out\" />\n"
 "		</signal>\n"
+"\n"
 "	</interface>\n"
 "</node>\n"
 ;
diff --git a/src/notification-item.xml b/src/notification-item.xml
index 127eb3a..bbf77c5 100644
--- a/src/notification-item.xml
+++ b/src/notification-item.xml
@@ -7,7 +7,9 @@
 		<property name="Category" type="s" access="read" />
 		<property name="Status" type="s" access="read" />
 		<property name="IconName" type="s" access="read" />
+		<property name="IconAccessibleDesc" type="s" access="read" />
 		<property name="AttentionIconName" type="s" access="read" />
+		<property name="AttentionAccessibleDesc" type="s" access="read" />
 		<!-- An additional path to add to the theme search path
 		     to find the icons specified above. -->
 		<property name="IconThemePath" type="s" access="read" />
@@ -37,5 +39,6 @@
 			<arg type="s" name="label" direction="out" />
 			<arg type="s" name="guide" direction="out" />
 		</signal>
+
 	</interface>
 </node>