aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2011-02-17 15:30:58 -0500
committerKen VanDine <ken.vandine@canonical.com>2011-02-17 15:30:58 -0500
commit04397e71cdbe75221629716b9d1d415a82f0be11 (patch)
treed7c399532ffd92fabb4bbbaadd43a25ea37eb1ac
parent326b5bf46ccc31ce53355d2cdba88102e8d8ca64 (diff)
parent6ca27e8cbf3246e2333bedfb466916299cb5cdaf (diff)
downloadlibayatana-indicator-04397e71cdbe75221629716b9d1d415a82f0be11.tar.gz
libayatana-indicator-04397e71cdbe75221629716b9d1d415a82f0be11.tar.bz2
libayatana-indicator-04397e71cdbe75221629716b9d1d415a82f0be11.zip
releasing version 0.3.19-0ubuntu10.3.19-0ubuntu1
-rw-r--r--AUTHORS2
-rw-r--r--ChangeLog50
-rwxr-xr-xconfigure20
-rw-r--r--configure.ac4
-rw-r--r--debian/changelog15
-rw-r--r--debian/control16
-rw-r--r--debian/libindicator3-3.install (renamed from debian/libindicator3-2.install)0
-rw-r--r--debian/libindicator3.install (renamed from debian/libindicator2.install)0
-rwxr-xr-xdebian/rules8
-rw-r--r--libindicator/Makefile.am2
-rw-r--r--libindicator/Makefile.in2
-rw-r--r--libindicator/indicator-object.c29
-rw-r--r--libindicator/indicator-object.h21
-rw-r--r--libindicator/indicator.pc.in2
-rw-r--r--libindicator/indicator3.pc.in2
-rw-r--r--tests/Makefile.am7
-rw-r--r--tests/Makefile.in5
-rw-r--r--tests/dummy-indicator-null.c6
-rw-r--r--tests/dummy-indicator-signaler.c7
-rw-r--r--tests/dummy-indicator-simple.c7
-rw-r--r--tests/service-manager-connect.service.in3
-rw-r--r--tests/service-version-bad.service.in3
-rw-r--r--tests/service-version-good.service.in3
-rw-r--r--tests/session.conf.in40
24 files changed, 225 insertions, 29 deletions
diff --git a/AUTHORS b/AUTHORS
index 186fb9f..8207f5e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,10 +5,12 @@
Eitan Isaacson
Karl
Ken VanDine
+ Luke Yelavich
Marco Trevisan (Treviño)
Martin Pitt
Michael Terry
Mikkel Kamstrup Erlandsen
Neil Jagdish Patel
Robert Carr
+ Sebastien Bacher
Ted Gould
diff --git a/ChangeLog b/ChangeLog
index 8ce7055..77c90a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,55 @@
# Generated by Makefile. Do not edit.
+2011-02-17 Ted Gould <ted@gould.cx>
+
+ 0.3.19
+
+2011-02-16 Ted Gould <ted@gould.cx>
+
+ Returning reserveds as we're breaking ABI anyway
+
+2011-02-16 Ted Gould <ted@gould.cx>
+
+ Bumping the major version of the lib and the indicator directory
+
+2011-02-16 Ted Gould <ted@gould.cx>
+
+ Merging support for having an accessible description
+
+2011-02-08 Luke Yelavich <luke.yelavich@canonical.com>
+
+ accessible_name -> accessible_desc in tests as well
+
+2011-02-08 Luke Yelavich <luke.yelavich@canonical.com>
+
+ * accessible_name -> accessible_desc to better reflect the use of the content.
+ * Add accessible-desc-update signal so that indicators can tell
+ indicator-applet/unity that the accessible description has changed
+
+2011-02-01 Luke Yelavich <luke.yelavich@canonical.com>
+
+ use const gchar for variable and prototype
+
+2011-02-01 Luke Yelavich <luke.yelavich@canonical.com>
+
+ Merge from trunk
+
+2011-01-18 Luke Yelavich <luke.yelavich@canonical.com>
+
+ Add accessible_name variable in indicator entry structure
+
+2011-02-16 Ted Gould <ted@gould.cx>
+
+ Fixing makefile to include all the necissary files in dist
+
+2011-02-15 Ted Gould <ted@gould.cx>
+
+ Adding the service.in files as well
+
+2011-02-15 Sebastien Bacher <seb128@ubuntu.com>
+
+ Add session.conf.in to dist
+
2011-01-27 Ted Gould <ted@gould.cx>
0.3.18
diff --git a/configure b/configure
index e6f52a6..0838d33 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 libindicator 0.3.18.
+# Generated by GNU Autoconf 2.67 for libindicator 0.3.19.
#
# Report bugs to <ted@canonical.com>.
#
@@ -701,8 +701,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libindicator'
PACKAGE_TARNAME='libindicator'
-PACKAGE_VERSION='0.3.18'
-PACKAGE_STRING='libindicator 0.3.18'
+PACKAGE_VERSION='0.3.19'
+PACKAGE_STRING='libindicator 0.3.19'
PACKAGE_BUGREPORT='ted@canonical.com'
PACKAGE_URL=''
@@ -1443,7 +1443,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libindicator 0.3.18 to adapt to many kinds of systems.
+\`configure' configures libindicator 0.3.19 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1513,7 +1513,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libindicator 0.3.18:";;
+ short | recursive ) echo "Configuration of libindicator 0.3.19:";;
esac
cat <<\_ACEOF
@@ -1628,7 +1628,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libindicator configure 0.3.18
+libindicator configure 0.3.19
generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1906,7 +1906,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libindicator $as_me 0.3.18, which was
+It was created by libindicator $as_me 0.3.19, which was
generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -2726,7 +2726,7 @@ fi
# Define the identity of the package.
PACKAGE=libindicator
- VERSION=0.3.18
+ VERSION=0.3.19
cat >>confdefs.h <<_ACEOF
@@ -12361,7 +12361,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libindicator $as_me 0.3.18, which was
+This file was extended by libindicator $as_me 0.3.19, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12427,7 +12427,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libindicator config.status 0.3.18
+libindicator config.status 0.3.19
configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 839cff1..cae787a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
-AC_INIT(libindicator, 0.3.18, ted@canonical.com)
+AC_INIT(libindicator, 0.3.19, ted@canonical.com)
AC_PREREQ(2.53)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libindicator, 0.3.18)
+AM_INIT_AUTOMAKE(libindicator, 0.3.19)
AM_MAINTAINER_MODE
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
diff --git a/debian/changelog b/debian/changelog
index 1764509..1ad8a55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+libindicator (0.3.19-0ubuntu1) natty; urgency=low
+
+ * debian/rules
+ - Updated shlibs
+
+ [Ted Gould]
+ * New upstream release.
+ ∘ Adding in a11y description support
+ ∘ Fixing distcheck (LP: #587811)
+ * debian/*: Changing the library major version from 2 to 3
+ * debian/control: Adding Breaks for the previous library rev
+ so that users don't end up with systems that use both.
+
+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 17 Feb 2011 14:04:55 -0500
+
libindicator (0.3.18-0ubuntu1) natty; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 4d0932f..03085a2 100644
--- a/debian/control
+++ b/debian/control
@@ -18,12 +18,13 @@ Homepage: https://launchpad.net/libindicator
Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libindicator/ubuntu
Vcs-Browser: http://bazaar.launchpad.net/~indicator-applet-developers/libindicator/ubuntu
-Package: libindicator2
+Package: libindicator3
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Breaks: libindicator1
+Breaks: libindicator1 (<= ${binary:Version}),
+ libindicator2 (<= ${binary:Version})
Description: panel indicator applet - shared library
This library contains information to build indicators to go into
the indicator applet.
@@ -36,7 +37,7 @@ Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
libgtk2.0-dev (>= 2.12.0),
- libindicator2 (= ${binary:Version})
+ libindicator3 (= ${binary:Version})
Description: panel indicator applet - library development files
This library contains information to build indicators to go into
the indicator applet.
@@ -48,17 +49,18 @@ Section: devel
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- libindicator2 (= ${binary:Version})
+ libindicator3 (= ${binary:Version})
Description: Tools for libindicator
Tools useful for developers of applications using indicators.
.
This package contains files that are needed to build applications.
-Package: libindicator3-2
+Package: libindicator3-3
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+Breaks: libindicator3-2 (<= ${binary:Version})
Description: panel indicator applet - shared library
This library contains information to build indicators to go into
the indicator applet.
@@ -71,7 +73,7 @@ Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
libgtk3.0-dev (>= 2.91.3),
- libindicator3-2 (= ${binary:Version})
+ libindicator3-3 (= ${binary:Version})
Description: panel indicator applet - library development files
This library contains information to build indicators to go into
the indicator applet.
@@ -83,7 +85,7 @@ Section: devel
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- libindicator3-2 (= ${binary:Version})
+ libindicator3-3 (= ${binary:Version})
Description: Tools for libindicator
Tools useful for developers of applications using indicators.
.
diff --git a/debian/libindicator3-2.install b/debian/libindicator3-3.install
index aaa2e72..aaa2e72 100644
--- a/debian/libindicator3-2.install
+++ b/debian/libindicator3-3.install
diff --git a/debian/libindicator2.install b/debian/libindicator3.install
index 85dbd3e..85dbd3e 100644
--- a/debian/libindicator2.install
+++ b/debian/libindicator3.install
diff --git a/debian/rules b/debian/rules
index de71b0a..4c21f86 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,10 +9,10 @@ DEB_BUILDDIR = $(DEB_SRCDIR)/build
LDFLAGS += -Wl,-z,defs -Wl,--as-needed
-DEB_DH_MAKESHLIBS_ARGS_libindicator1 += -V 'libindicator1 (>= 0.3.18)'
-DEB_DH_MAKESHLIBS_ARGS_libindicator3 += -V 'libindicator3-1 (>= 0.3.18)'
+DEB_DH_MAKESHLIBS_ARGS_libindicator3 += -V 'libindicator3 (>= 0.3.19)'
+DEB_DH_MAKESHLIBS_ARGS_libindicator3_3 += -V 'libindicator3-3 (>= 0.3.19)'
-configure/libindicator3-1:: stamp-configure-gtk3
+configure/libindicator3-3:: stamp-configure-gtk3
stamp-configure-gtk3:
: # configure for GTK+ 3.0
set -e; \
@@ -24,7 +24,7 @@ stamp-configure-gtk3:
cd ..;
touch stamp-configure-gtk3
-build/libindicator3-1:: stamp-build-gtk3
+build/libindicator3-3:: stamp-build-gtk3
stamp-build-gtk3: stamp-configure-gtk3
: # build for GTK+ 3.0
$(MAKE) -C build-gtk3;
diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am
index 47a902a..d63f841 100644
--- a/libindicator/Makefile.am
+++ b/libindicator/Makefile.am
@@ -51,7 +51,7 @@ libindicator_la_LIBADD = \
$(LIBINDICATOR_LIBS)
libindicator_la_LDFLAGS = \
- -version-info 2:0:0 \
+ -version-info 3:0:0 \
-no-undefined \
-export-symbols-regex "^[^_].*"
diff --git a/libindicator/Makefile.in b/libindicator/Makefile.in
index 78b19ad..5ccc9da 100644
--- a/libindicator/Makefile.in
+++ b/libindicator/Makefile.in
@@ -338,7 +338,7 @@ libindicator_la_LIBADD = \
$(LIBINDICATOR_LIBS)
libindicator_la_LDFLAGS = \
- -version-info 2:0:0 \
+ -version-info 3:0:0 \
-no-undefined \
-export-symbols-regex "^[^_].*"
diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c
index 95ab08a..73c1ca7 100644
--- a/libindicator/indicator-object.c
+++ b/libindicator/indicator-object.c
@@ -61,6 +61,7 @@ enum {
SCROLL_ENTRY,
MENU_SHOW,
SHOW_NOW_CHANGED,
+ ACCESSIBLE_DESC_UPDATE,
LAST_SIGNAL
};
@@ -91,6 +92,7 @@ indicator_object_class_init (IndicatorObjectClass *klass)
klass->get_label = NULL;
klass->get_menu = NULL;
klass->get_image = NULL;
+ klass->get_accessible_desc = NULL;
klass->get_entries = get_entries_default;
klass->get_location = NULL;
@@ -221,6 +223,24 @@ indicator_object_class_init (IndicatorObjectClass *klass)
_indicator_object_marshal_VOID__POINTER_BOOLEAN,
G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_BOOLEAN);
+ /**
+ IndicatorObject::accessible-desc-update::
+ @arg0: The #IndicatorObject object
+ @arg1: A pointer to the #IndicatorObjectEntry whos
+ accessible description has been updated.
+
+ Signaled when an indicator's accessible description
+ has been updated, so that the displayer of the
+ indicator can fetch the new description.
+ */
+ signals[ACCESSIBLE_DESC_UPDATE] = g_signal_new (INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE,
+ G_TYPE_FROM_CLASS(klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (IndicatorObjectClass, accessible_desc_update),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__POINTER,
+ G_TYPE_NONE, 1, G_TYPE_POINTER, G_TYPE_NONE);
+
return;
}
@@ -236,6 +256,7 @@ indicator_object_init (IndicatorObject *self)
self->priv->entry.menu = NULL;
self->priv->entry.label = NULL;
self->priv->entry.image = NULL;
+ self->priv->entry.accessible_desc = NULL;
self->priv->gotten_entries = FALSE;
@@ -416,6 +437,14 @@ get_entries_default (IndicatorObject * io)
return NULL;
}
+ if (class->get_accessible_desc) {
+ priv->entry.accessible_desc = class->get_accessible_desc(io);
+ }
+
+ if (priv->entry.accessible_desc == NULL) {
+ g_warning("IndicatorObject class does not have an accessible description.");
+ }
+
priv->gotten_entries = TRUE;
}
diff --git a/libindicator/indicator-object.h b/libindicator/indicator-object.h
index 4b3ce0b..67a3bda 100644
--- a/libindicator/indicator-object.h
+++ b/libindicator/indicator-object.h
@@ -57,6 +57,8 @@ typedef enum
#define INDICATOR_OBJECT_SIGNAL_MENU_SHOW_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_MENU_SHOW, INDICATOR_OBJECT_TYPE))
#define INDICATOR_OBJECT_SIGNAL_SHOW_NOW_CHANGED "show-now-changed"
#define INDICATOR_OBJECT_SIGNAL_SHOW_NOW_CHANGED_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_SHOW_NOW_CHANGED, INDICATOR_OBJECT_TYPE))
+#define INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE "accessible-desc-update"
+#define INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE, INDICATOR_OBJECT_TYPE))
typedef struct _IndicatorObject IndicatorObject;
typedef struct _IndicatorObjectClass IndicatorObjectClass;
@@ -75,6 +77,8 @@ typedef struct _IndicatorObjectEntry IndicatorObjectEntry;
@get_menu: Gets the image for this object. Should be set
to #NULL if @get_entries is set. Should NOT ref the
object.
+ @get_accessible_desc: Gets the accessible descriptionfor this
+ object.
@get_entries: Gets all of the entires for this object returning
a #GList of #IndicatorObjectEntries. The list should be
under the ownership of the caller but the entires will
@@ -93,6 +97,7 @@ typedef struct _IndicatorObjectEntry IndicatorObjectEntry;
@entry_moved: Slot for #IndicatorObject::entry-moved
@menu_show: Slot for #IndicatorObject::menu-show
@show_now_changed: Slot for #IndicatorObject::show-now-changed
+ @accessible_desc_update: Slot for #IndicatorObject::accessible-desc-update
*/
struct _IndicatorObjectClass {
GObjectClass parent_class;
@@ -101,6 +106,7 @@ struct _IndicatorObjectClass {
GtkLabel * (*get_label) (IndicatorObject * io);
GtkImage * (*get_image) (IndicatorObject * io);
GtkMenu * (*get_menu) (IndicatorObject * io);
+ const gchar * (*get_accessible_desc) (IndicatorObject * io);
GList * (*get_entries) (IndicatorObject * io);
guint (*get_location) (IndicatorObject * io, IndicatorObjectEntry * entry);
@@ -117,6 +123,7 @@ struct _IndicatorObjectClass {
void (*menu_show) (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp, gpointer user_data);
void (*show_now_changed) (IndicatorObject * io, IndicatorObjectEntry * entry, gboolean show_now_state, gpointer user_data);
void (*scroll_entry) (IndicatorObject * io, IndicatorObjectEntry * entry, gint delta, IndicatorScrollDirection direction);
+ void (*accessible_desc_update) (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data);
/* Reserved */
void (*reserved1) (void);
@@ -124,6 +131,7 @@ struct _IndicatorObjectClass {
void (*reserved3) (void);
void (*reserved4) (void);
void (*reserved5) (void);
+ void (*reserved6) (void);
};
/**
@@ -142,11 +150,24 @@ struct _IndicatorObject {
@label: The label to be shown on the panel
@image: The image to be shown on the panel
@menu: The menu to be added to the menubar
+ @accessible_desc: The accessible description
+ of the indicator
+
+ @reserved1: Reserved for future use
+ @reserved2: Reserved for future use
+ @reserved3: Reserved for future use
+ @reserved4: Reserved for future use
*/
struct _IndicatorObjectEntry {
GtkLabel * label;
GtkImage * image;
GtkMenu * menu;
+ const gchar * accessible_desc;
+
+ void (*reserved1) (void);
+ void (*reserved2) (void);
+ void (*reserved3) (void);
+ void (*reserved4) (void);
};
GType indicator_object_get_type (void);
diff --git a/libindicator/indicator.pc.in b/libindicator/indicator.pc.in
index abc5590..4e9b177 100644
--- a/libindicator/indicator.pc.in
+++ b/libindicator/indicator.pc.in
@@ -4,7 +4,7 @@ libdir=@libdir@
bindir=@bindir@
includedir=@includedir@
-indicatordir=${libdir}/indicators/4/
+indicatordir=${libdir}/indicators/5/
iconsdir=@datarootdir@/@PACKAGE@/icons/
Cflags: -I${includedir}/libindicator-0.3
diff --git a/libindicator/indicator3.pc.in b/libindicator/indicator3.pc.in
index bb85db6..9fa0eac 100644
--- a/libindicator/indicator3.pc.in
+++ b/libindicator/indicator3.pc.in
@@ -4,7 +4,7 @@ libdir=@libdir@
bindir=@bindir@
includedir=@includedir@
-indicatordir=${libdir}/indicators3/1/
+indicatordir=${libdir}/indicators3/2/
iconsdir=@datarootdir@/@PACKAGE@/icons/
Cflags: -I${includedir}/libindicator-0.3
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f15309d..569055c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,7 +18,12 @@ lib_LTLIBRARIES = \
DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf
XVFB_RUN=". $(srcdir)/run-xvfb.sh"
-EXTRA_DIST = run-xvfb.sh
+EXTRA_DIST = \
+ run-xvfb.sh \
+ session.conf.in \
+ service-manager-connect.service.in \
+ service-version-bad.service.in \
+ service-version-good.service.in
#############################
# Test Loader
diff --git a/tests/Makefile.in b/tests/Makefile.in
index d77b4ac..10db723 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -452,7 +452,10 @@ lib_LTLIBRARIES = \
DBUS_RUNNER = dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf
XVFB_RUN = ". $(srcdir)/run-xvfb.sh"
-EXTRA_DIST = run-xvfb.sh test-well-formed.desktop
+EXTRA_DIST = run-xvfb.sh session.conf.in \
+ service-manager-connect.service.in \
+ service-version-bad.service.in service-version-good.service.in \
+ test-well-formed.desktop
test_loader_SOURCES = \
test-loader.c
diff --git a/tests/dummy-indicator-null.c b/tests/dummy-indicator-null.c
index 767067d..169196c 100644
--- a/tests/dummy-indicator-null.c
+++ b/tests/dummy-indicator-null.c
@@ -46,6 +46,11 @@ get_menu (IndicatorObject * io)
{
return NULL;
}
+const gchar *
+get_accessible_desc (IndicatorObject * io)
+{
+ return NULL;
+}
static void dummy_indicator_null_class_init (DummyIndicatorNullClass *klass);
static void dummy_indicator_null_init (DummyIndicatorNull *self);
@@ -67,6 +72,7 @@ dummy_indicator_null_class_init (DummyIndicatorNullClass *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;
}
diff --git a/tests/dummy-indicator-signaler.c b/tests/dummy-indicator-signaler.c
index 9bd01bf..dcb2560 100644
--- a/tests/dummy-indicator-signaler.c
+++ b/tests/dummy-indicator-signaler.c
@@ -50,6 +50,12 @@ get_menu (IndicatorObject * io)
return main_menu;
}
+const gchar *
+get_accessible_desc (IndicatorObject * io)
+{
+ return "Signaler Item";
+}
+
static void dummy_indicator_signaler_class_init (DummyIndicatorSignalerClass *klass);
static void dummy_indicator_signaler_init (DummyIndicatorSignaler *self);
static void dummy_indicator_signaler_dispose (GObject *object);
@@ -70,6 +76,7 @@ dummy_indicator_signaler_class_init (DummyIndicatorSignalerClass *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;
}
diff --git a/tests/dummy-indicator-simple.c b/tests/dummy-indicator-simple.c
index 654650f..70937ba 100644
--- a/tests/dummy-indicator-simple.c
+++ b/tests/dummy-indicator-simple.c
@@ -50,6 +50,12 @@ get_menu (IndicatorObject * io)
return main_menu;
}
+const gchar *
+get_accessible_desc (IndicatorObject * io)
+{
+ return "Simple Item";
+}
+
static void dummy_indicator_simple_class_init (DummyIndicatorSimpleClass *klass);
static void dummy_indicator_simple_init (DummyIndicatorSimple *self);
static void dummy_indicator_simple_dispose (GObject *object);
@@ -70,6 +76,7 @@ dummy_indicator_simple_class_init (DummyIndicatorSimpleClass *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;
}
diff --git a/tests/service-manager-connect.service.in b/tests/service-manager-connect.service.in
new file mode 100644
index 0000000..7d3da6b
--- /dev/null
+++ b/tests/service-manager-connect.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.ayatana.test
+Exec=@builddir@/service-manager-connect-service
diff --git a/tests/service-version-bad.service.in b/tests/service-version-bad.service.in
new file mode 100644
index 0000000..1e763eb
--- /dev/null
+++ b/tests/service-version-bad.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.ayatana.version.bad
+Exec=@builddir@/service-version-bad-service
diff --git a/tests/service-version-good.service.in b/tests/service-version-good.service.in
new file mode 100644
index 0000000..c57a04f
--- /dev/null
+++ b/tests/service-version-good.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.ayatana.version.good
+Exec=@builddir@/service-version-good-service
diff --git a/tests/session.conf.in b/tests/session.conf.in
new file mode 100644
index 0000000..d1e2805
--- /dev/null
+++ b/tests/session.conf.in
@@ -0,0 +1,40 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+ <!-- If we fork, keep the user's original umask to avoid affecting
+ the behavior of child processes. -->
+ <keep_umask/>
+
+ <listen>unix:tmpdir=/tmp</listen>
+
+ <servicedir>@servicedir@</servicedir>
+
+ <policy context="default">
+ <!-- Allow everything to be sent -->
+ <allow send_destination="*" eavesdrop="true"/>
+ <!-- Allow everything to be received -->
+ <allow eavesdrop="true"/>
+ <!-- Allow anyone to own anything -->
+ <allow own="*"/>
+ </policy>
+
+ <!-- raise the service start timeout to 40 seconds as it can timeout
+ on the live cd on slow machines -->
+ <limit name="service_start_timeout">60000</limit>
+
+ <!-- the memory limits are 1G instead of say 4G because they can't exceed 32-bit signed int max -->
+ <limit name="max_incoming_bytes">1000000000</limit>
+ <limit name="max_outgoing_bytes">1000000000</limit>
+ <limit name="max_message_size">1000000000</limit>
+ <limit name="service_start_timeout">120000</limit>
+ <limit name="auth_timeout">240000</limit>
+ <limit name="max_completed_connections">100000</limit>
+ <limit name="max_incomplete_connections">10000</limit>
+ <limit name="max_connections_per_user">100000</limit>
+ <limit name="max_pending_service_starts">10000</limit>
+ <limit name="max_names_per_connection">50000</limit>
+ <limit name="max_match_rules_per_connection">50000</limit>
+ <limit name="max_replies_per_connection">50000</limit>
+ <limit name="reply_timeout">300000</limit>
+
+</busconfig>