diff options
author | Ted Gould <ted@gould.cx> | 2011-02-17 13:29:07 -0600 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2011-02-17 13:29:07 -0600 |
commit | 54dde179be74619f64add30cb99f75fee2dfdd31 (patch) | |
tree | 3dad1769e1852b17bdf11132e4a5f6438967b978 | |
parent | 633567c4d8388c37457be6eb9020efadda8f8507 (diff) | |
parent | f4cdae15419acd81f378c158fb8159016ef0a9dd (diff) | |
download | ayatana-indicator-session-54dde179be74619f64add30cb99f75fee2dfdd31.tar.gz ayatana-indicator-session-54dde179be74619f64add30cb99f75fee2dfdd31.tar.bz2 ayatana-indicator-session-54dde179be74619f64add30cb99f75fee2dfdd31.zip |
Import upstream version 0.2.14
-rw-r--r-- | AUTHORS | 1 | ||||
-rw-r--r-- | ChangeLog | 20 | ||||
-rwxr-xr-x | configure | 4 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | src/indicator-session.c | 8 |
5 files changed, 33 insertions, 4 deletions
@@ -7,6 +7,7 @@ Gabor Kelemen Ken VanDine Kyle Nitzsche + Luke Yelavich Marc Deslauriers Martin Pitt Matthew Rasmus @@ -1,5 +1,25 @@ # Generated by Makefile. Do not edit. +2011-02-17 Ted Gould <ted@gould.cx> + + 0.2.14 + +2011-02-17 Ted Gould <ted@gould.cx> + + Adding an accessible description + +2011-02-17 Ted Gould <ted@gould.cx> + + Increasing the libindicator version + +2011-02-14 Luke Yelavich <luke.yelavich@canonical.com> + + Make the word session translatable + +2011-02-14 Luke Yelavich <luke.yelavich@canonical.com> + + Add accessible_desc support + 2011-02-11 Ted Gould <ted@gould.cx> 0.2.13 @@ -2882,7 +2882,7 @@ fi # Define the identity of the package. PACKAGE=indicator-session - VERSION=0.2.13 + VERSION=0.2.14 cat >>confdefs.h <<_ACEOF @@ -11979,7 +11979,7 @@ AM_BACKSLASH='\' ########################### GTK_REQUIRED_VERSION=2.12 -INDICATOR_REQUIRED_VERSION=0.3.5 +INDICATOR_REQUIRED_VERSION=0.3.19 DBUSMENUGTK_REQUIRED_VERSION=0.3.91 POLKIT_REQUIRED_VERSION=0.92 diff --git a/configure.ac b/configure.ac index 8350dd5..e12c744 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT(src/indicator-session.c) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-session, 0.2.13) +AM_INIT_AUTOMAKE(indicator-session, 0.2.14) AM_MAINTAINER_MODE @@ -26,7 +26,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) ########################### GTK_REQUIRED_VERSION=2.12 -INDICATOR_REQUIRED_VERSION=0.3.5 +INDICATOR_REQUIRED_VERSION=0.3.19 DBUSMENUGTK_REQUIRED_VERSION=0.3.91 POLKIT_REQUIRED_VERSION=0.92 diff --git a/src/indicator-session.c b/src/indicator-session.c index 2104281..97e2ce9 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -72,6 +72,7 @@ INDICATOR_SET_TYPE(INDICATOR_SESSION_TYPE) static GtkLabel * get_label (IndicatorObject * io); static GtkImage * get_icon (IndicatorObject * io); static GtkMenu * get_menu (IndicatorObject * io); +static const gchar * get_accessible_desc (IndicatorObject * io); static gboolean build_menu_switch (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data); static gboolean new_user_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data); static void icon_changed (IndicatorSession * session, const gchar * icon_name); @@ -99,6 +100,7 @@ indicator_session_class_init (IndicatorSessionClass *klass) io_class->get_label = get_label; io_class->get_image = get_icon; io_class->get_menu = get_menu; + io_class->get_accessible_desc = get_accessible_desc; return; } @@ -253,6 +255,12 @@ get_label (IndicatorObject * io) return NULL; } +static const gchar * +get_accessible_desc (IndicatorObject * io) +{ + return _("Session"); +} + static void icon_changed (IndicatorSession * session, const gchar * icon_name) { |