From 9215e19e801f59a2abd4dd92563cfe50f366f635 Mon Sep 17 00:00:00 2001
From: Luke Yelavich <luke.yelavich@canonical.com>
Date: Tue, 18 Jan 2011 16:50:37 +1100
Subject: Add accessible_name variable in indicator entry structure

---
 libindicator/indicator-object.c  | 10 ++++++++++
 libindicator/indicator-object.h  |  5 +++++
 tests/dummy-indicator-null.c     |  6 ++++++
 tests/dummy-indicator-signaler.c |  7 +++++++
 tests/dummy-indicator-simple.c   |  7 +++++++
 5 files changed, 35 insertions(+)

diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c
index 988a8ae..c190cd7 100644
--- a/libindicator/indicator-object.c
+++ b/libindicator/indicator-object.c
@@ -90,6 +90,7 @@ indicator_object_class_init (IndicatorObjectClass *klass)
 	klass->get_label =  NULL;
 	klass->get_menu =   NULL;
 	klass->get_image =  NULL;
+	klass->get_accessible_name = NULL;
 
 	klass->get_entries = get_entries_default;
 	klass->get_location = NULL;
@@ -215,6 +216,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_name = NULL;
 
 	self->priv->gotten_entries = FALSE;
 
@@ -395,6 +397,14 @@ get_entries_default (IndicatorObject * io)
 			return NULL;
 		}
 
+		if (class->get_accessible_name) {
+			priv->entry.accessible_name = class->get_accessible_name(io);
+		}
+
+		if (priv->entry.accessible_name == NULL) {
+			g_warning("IndicatorObject class does not have an accessible name.");
+		}
+
 		priv->gotten_entries = TRUE;
 	}
 
diff --git a/libindicator/indicator-object.h b/libindicator/indicator-object.h
index 9ad1366..a2736d3 100644
--- a/libindicator/indicator-object.h
+++ b/libindicator/indicator-object.h
@@ -73,6 +73,7 @@ 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_name: Gets the accessible name for 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
@@ -99,6 +100,7 @@ struct _IndicatorObjectClass {
 	GtkLabel * (*get_label) (IndicatorObject * io);
 	GtkImage * (*get_image) (IndicatorObject * io);
 	GtkMenu  * (*get_menu)  (IndicatorObject * io);
+	gchar    * (*get_accessible_name) (IndicatorObject * io);
 
 	GList *    (*get_entries) (IndicatorObject * io);
 	guint      (*get_location) (IndicatorObject * io, IndicatorObjectEntry * entry);
@@ -140,11 +142,14 @@ 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_name: The accessible name of the
+		indicator
 */
 struct _IndicatorObjectEntry {
 	GtkLabel * label;
 	GtkImage * image;
 	GtkMenu  * menu;
+	gchar    * accessible_name;
 };
 
 GType indicator_object_get_type (void);
diff --git a/tests/dummy-indicator-null.c b/tests/dummy-indicator-null.c
index 767067d..acebdb8 100644
--- a/tests/dummy-indicator-null.c
+++ b/tests/dummy-indicator-null.c
@@ -46,6 +46,11 @@ get_menu (IndicatorObject * io)
 {
 	return NULL;
 }
+gchar *
+get_accessible_name (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_name = get_accessible_name;
 
 	return;
 }
diff --git a/tests/dummy-indicator-signaler.c b/tests/dummy-indicator-signaler.c
index 9bd01bf..7dbe704 100644
--- a/tests/dummy-indicator-signaler.c
+++ b/tests/dummy-indicator-signaler.c
@@ -50,6 +50,12 @@ get_menu (IndicatorObject * io)
 	return main_menu;
 }
 
+gchar *
+get_accessible_name (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_name = get_accessible_name;
 
 	return;
 }
diff --git a/tests/dummy-indicator-simple.c b/tests/dummy-indicator-simple.c
index 654650f..0bbcde6 100644
--- a/tests/dummy-indicator-simple.c
+++ b/tests/dummy-indicator-simple.c
@@ -50,6 +50,12 @@ get_menu (IndicatorObject * io)
 	return main_menu;
 }
 
+gchar *
+get_accessible_name (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_name = get_accessible_name;
 
 	return;
 }
-- 
cgit v1.2.3


From 855d3545376a037fc73712ac5879e4130783b3b1 Mon Sep 17 00:00:00 2001
From: Luke Yelavich <luke.yelavich@canonical.com>
Date: Tue, 1 Feb 2011 17:49:23 +1100
Subject: use const gchar for variable and prototype

---
 libindicator/indicator-object.h  | 4 ++--
 tests/dummy-indicator-null.c     | 2 +-
 tests/dummy-indicator-signaler.c | 2 +-
 tests/dummy-indicator-simple.c   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libindicator/indicator-object.h b/libindicator/indicator-object.h
index ea303f8..b79aef4 100644
--- a/libindicator/indicator-object.h
+++ b/libindicator/indicator-object.h
@@ -102,7 +102,7 @@ struct _IndicatorObjectClass {
 	GtkLabel * (*get_label) (IndicatorObject * io);
 	GtkImage * (*get_image) (IndicatorObject * io);
 	GtkMenu  * (*get_menu)  (IndicatorObject * io);
-	gchar    * (*get_accessible_name) (IndicatorObject * io);
+	const gchar * (*get_accessible_name) (IndicatorObject * io);
 
 	GList *    (*get_entries) (IndicatorObject * io);
 	guint      (*get_location) (IndicatorObject * io, IndicatorObjectEntry * entry);
@@ -151,7 +151,7 @@ struct _IndicatorObjectEntry {
 	GtkLabel * label;
 	GtkImage * image;
 	GtkMenu  * menu;
-	gchar    * accessible_name;
+	const gchar * accessible_name;
 };
 
 GType indicator_object_get_type (void);
diff --git a/tests/dummy-indicator-null.c b/tests/dummy-indicator-null.c
index acebdb8..34adf58 100644
--- a/tests/dummy-indicator-null.c
+++ b/tests/dummy-indicator-null.c
@@ -46,7 +46,7 @@ get_menu (IndicatorObject * io)
 {
 	return NULL;
 }
-gchar *
+const gchar *
 get_accessible_name (IndicatorObject * io)
 {
 	return NULL;
diff --git a/tests/dummy-indicator-signaler.c b/tests/dummy-indicator-signaler.c
index 7dbe704..bb70d1e 100644
--- a/tests/dummy-indicator-signaler.c
+++ b/tests/dummy-indicator-signaler.c
@@ -50,7 +50,7 @@ get_menu (IndicatorObject * io)
 	return main_menu;
 }
 
-gchar *
+const gchar *
 get_accessible_name (IndicatorObject * io)
 {
 	return "Signaler Item";
diff --git a/tests/dummy-indicator-simple.c b/tests/dummy-indicator-simple.c
index 0bbcde6..9a5cbbd 100644
--- a/tests/dummy-indicator-simple.c
+++ b/tests/dummy-indicator-simple.c
@@ -50,7 +50,7 @@ get_menu (IndicatorObject * io)
 	return main_menu;
 }
 
-gchar *
+const gchar *
 get_accessible_name (IndicatorObject * io)
 {
 	return "Simple Item";
-- 
cgit v1.2.3


From f59301296c4090175db9d771adde7e0d991dbdf4 Mon Sep 17 00:00:00 2001
From: Luke Yelavich <luke.yelavich@canonical.com>
Date: Tue, 8 Feb 2011 14:25:10 +1100
Subject: * 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

---
 libindicator/indicator-object.c | 31 +++++++++++++++++++++++++------
 libindicator/indicator-object.h | 15 ++++++++++-----
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c
index 58952d7..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,7 +92,7 @@ indicator_object_class_init (IndicatorObjectClass *klass)
 	klass->get_label =  NULL;
 	klass->get_menu =   NULL;
 	klass->get_image =  NULL;
-	klass->get_accessible_name = NULL;
+	klass->get_accessible_desc = NULL;
 
 	klass->get_entries = get_entries_default;
 	klass->get_location = NULL;
@@ -222,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;
 }
@@ -237,7 +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_name = NULL;
+	self->priv->entry.accessible_desc = NULL;
 
 	self->priv->gotten_entries = FALSE;
 
@@ -418,12 +437,12 @@ get_entries_default (IndicatorObject * io)
 			return NULL;
 		}
 
-		if (class->get_accessible_name) {
-			priv->entry.accessible_name = class->get_accessible_name(io);
+		if (class->get_accessible_desc) {
+			priv->entry.accessible_desc = class->get_accessible_desc(io);
 		}
 
-		if (priv->entry.accessible_name == NULL) {
-			g_warning("IndicatorObject class does not have an accessible name.");
+		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 b79aef4..4123119 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,7 +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_name: Gets the accessible name for this 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
@@ -94,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;
@@ -102,7 +106,7 @@ struct _IndicatorObjectClass {
 	GtkLabel * (*get_label) (IndicatorObject * io);
 	GtkImage * (*get_image) (IndicatorObject * io);
 	GtkMenu  * (*get_menu)  (IndicatorObject * io);
-	const gchar * (*get_accessible_name) (IndicatorObject * io);
+	const gchar * (*get_accessible_desc) (IndicatorObject * io);
 
 	GList *    (*get_entries) (IndicatorObject * io);
 	guint      (*get_location) (IndicatorObject * io, IndicatorObjectEntry * entry);
@@ -119,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);
@@ -144,14 +149,14 @@ 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_name: The accessible name of the
-		indicator
+	@accessible_desc: The accessible description
+		of the indicator
 */
 struct _IndicatorObjectEntry {
 	GtkLabel * label;
 	GtkImage * image;
 	GtkMenu  * menu;
-	const gchar * accessible_name;
+	const gchar * accessible_desc;
 };
 
 GType indicator_object_get_type (void);
-- 
cgit v1.2.3


From a51274553b1a95227abefc80a65e2cc74364c7b2 Mon Sep 17 00:00:00 2001
From: Luke Yelavich <luke.yelavich@canonical.com>
Date: Tue, 8 Feb 2011 14:28:50 +1100
Subject: accessible_name -> accessible_desc in tests as well

---
 tests/dummy-indicator-null.c     | 4 ++--
 tests/dummy-indicator-signaler.c | 4 ++--
 tests/dummy-indicator-simple.c   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/dummy-indicator-null.c b/tests/dummy-indicator-null.c
index 34adf58..169196c 100644
--- a/tests/dummy-indicator-null.c
+++ b/tests/dummy-indicator-null.c
@@ -47,7 +47,7 @@ get_menu (IndicatorObject * io)
 	return NULL;
 }
 const gchar *
-get_accessible_name (IndicatorObject * io)
+get_accessible_desc (IndicatorObject * io)
 {
 	return NULL;
 }
@@ -72,7 +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_name = get_accessible_name;
+	io_class->get_accessible_desc = get_accessible_desc;
 
 	return;
 }
diff --git a/tests/dummy-indicator-signaler.c b/tests/dummy-indicator-signaler.c
index bb70d1e..dcb2560 100644
--- a/tests/dummy-indicator-signaler.c
+++ b/tests/dummy-indicator-signaler.c
@@ -51,7 +51,7 @@ get_menu (IndicatorObject * io)
 }
 
 const gchar *
-get_accessible_name (IndicatorObject * io)
+get_accessible_desc (IndicatorObject * io)
 {
 	return "Signaler Item";
 }
@@ -76,7 +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_name = get_accessible_name;
+	io_class->get_accessible_desc = get_accessible_desc;
 
 	return;
 }
diff --git a/tests/dummy-indicator-simple.c b/tests/dummy-indicator-simple.c
index 9a5cbbd..70937ba 100644
--- a/tests/dummy-indicator-simple.c
+++ b/tests/dummy-indicator-simple.c
@@ -51,7 +51,7 @@ get_menu (IndicatorObject * io)
 }
 
 const gchar *
-get_accessible_name (IndicatorObject * io)
+get_accessible_desc (IndicatorObject * io)
 {
 	return "Simple Item";
 }
@@ -76,7 +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_name = get_accessible_name;
+	io_class->get_accessible_desc = get_accessible_desc;
 
 	return;
 }
-- 
cgit v1.2.3


From 27cdc75f4e27bec7154642030ecf739fca29978f Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Tue, 15 Feb 2011 09:30:34 -0600
Subject: Add session.conf.in to dist

---
 tests/Makefile.am | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f15309d..5c4ad26 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,7 +18,9 @@ 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
 
 #############################
 # Test Loader
-- 
cgit v1.2.3


From e137b600d7866fd7b42d99f97f28bddb5478abe9 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 15 Feb 2011 14:32:46 -0600
Subject: Adding the service.in files as well

---
 tests/Makefile.am | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5c4ad26..569055c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,7 +20,10 @@ XVFB_RUN=". $(srcdir)/run-xvfb.sh"
 
 EXTRA_DIST = \
 	run-xvfb.sh \
-	session.conf.in
+	session.conf.in \
+	service-manager-connect.service.in \
+	service-version-bad.service.in \
+	service-version-good.service.in
 
 #############################
 # Test Loader
-- 
cgit v1.2.3


From 518f847f4488fedbbd7636b709e151b7ab78cb4d Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 16 Feb 2011 15:40:14 -0600
Subject: Bumping the major version of the lib and the indicator directory

---
 libindicator/Makefile.am      | 2 +-
 libindicator/indicator.pc.in  | 2 +-
 libindicator/indicator3.pc.in | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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/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
-- 
cgit v1.2.3


From 0cfa5a8ad6ea8af5c1de78ecbe101da436e16eb8 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 16 Feb 2011 15:44:07 -0600
Subject: Returning reserveds as we're breaking ABI anyway

---
 libindicator/indicator-object.h | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/libindicator/indicator-object.h b/libindicator/indicator-object.h
index 4123119..67a3bda 100644
--- a/libindicator/indicator-object.h
+++ b/libindicator/indicator-object.h
@@ -123,7 +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);
+	void       (*accessible_desc_update) (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data);
 
 	/* Reserved */
 	void       (*reserved1)     (void);
@@ -131,6 +131,7 @@ struct _IndicatorObjectClass {
 	void       (*reserved3)     (void);
 	void       (*reserved4)     (void);
 	void       (*reserved5)     (void);
+	void       (*reserved6)     (void);
 };
 
 /**
@@ -151,12 +152,22 @@ struct _IndicatorObject {
 	@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);
-- 
cgit v1.2.3


From 27d079891cdcc65bc1e7174a2d8dfe6bb2f639df Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 17 Feb 2011 09:58:30 -0600
Subject: 0.3.19

---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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])
-- 
cgit v1.2.3


From 2dae441fca0caed55dddc37f9a056e3b6aa8b2b4 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 17 Feb 2011 10:23:46 -0600
Subject: debian/*: Changing the library major version from 2 to 3

---
 debian/changelog               |  3 ++-
 debian/control                 | 12 ++++++------
 debian/libindicator2.install   |  1 -
 debian/libindicator3-2.install |  1 -
 debian/libindicator3-3.install |  1 +
 debian/libindicator3.install   |  1 +
 6 files changed, 10 insertions(+), 9 deletions(-)
 delete mode 100644 debian/libindicator2.install
 delete mode 100644 debian/libindicator3-2.install
 create mode 100644 debian/libindicator3-3.install
 create mode 100644 debian/libindicator3.install

diff --git a/debian/changelog b/debian/changelog
index 5a66acc..84753fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ libindicator (0.3.19-0ubuntu1~ppa1) UNRELEASED; urgency=low
   * New upstream release.
     ∘ Adding in a11y description support
     ∘ Fixing distcheck (LP: #587811)
+  * debian/*: Changing the library major version from 2 to 3
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 17 Feb 2011 10:20:50 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 17 Feb 2011 10:23:24 -0600
 
 libindicator (0.3.18-0ubuntu1) natty; urgency=low
 
diff --git a/debian/control b/debian/control
index 4d0932f..4a138a8 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ 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},
@@ -36,7 +36,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,13 +48,13 @@ 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},
@@ -71,7 +71,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 +83,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/libindicator2.install b/debian/libindicator2.install
deleted file mode 100644
index 85dbd3e..0000000
--- a/debian/libindicator2.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libindicator.so.*
diff --git a/debian/libindicator3-2.install b/debian/libindicator3-2.install
deleted file mode 100644
index aaa2e72..0000000
--- a/debian/libindicator3-2.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libindicator3.so.*
diff --git a/debian/libindicator3-3.install b/debian/libindicator3-3.install
new file mode 100644
index 0000000..aaa2e72
--- /dev/null
+++ b/debian/libindicator3-3.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libindicator3.so.*
diff --git a/debian/libindicator3.install b/debian/libindicator3.install
new file mode 100644
index 0000000..85dbd3e
--- /dev/null
+++ b/debian/libindicator3.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libindicator.so.*
-- 
cgit v1.2.3


From 4447040f1ad2c370a7532bb3ecb01fc7c0ab0da9 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 17 Feb 2011 10:25:54 -0600
Subject: debian/control: Adding Breaks for the previous library rev so that
 users don't end up with systems that use both.

---
 debian/changelog | 4 +++-
 debian/control   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 84753fe..e1df5b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ libindicator (0.3.19-0ubuntu1~ppa1) UNRELEASED; urgency=low
     ∘ 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.
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 17 Feb 2011 10:23:24 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 17 Feb 2011 10:25:11 -0600
 
 libindicator (0.3.18-0ubuntu1) natty; urgency=low
 
diff --git a/debian/control b/debian/control
index 4a138a8..03085a2 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,8 @@ 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.
@@ -59,6 +60,7 @@ 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.
-- 
cgit v1.2.3


From 6ca27e8cbf3246e2333bedfb466916299cb5cdaf Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 17 Feb 2011 10:27:18 -0600
Subject: releasing version 0.3.19-0ubuntu1~ppa1

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e1df5b6..fe711ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libindicator (0.3.19-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libindicator (0.3.19-0ubuntu1~ppa1) natty; urgency=low
 
   * New upstream release.
     ∘ Adding in a11y description support
@@ -7,7 +7,7 @@ libindicator (0.3.19-0ubuntu1~ppa1) UNRELEASED; urgency=low
   * debian/control: Adding Breaks for the previous library rev
     so that users don't end up with systems that use both.
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 17 Feb 2011 10:25:11 -0600
+ -- Ted Gould <ted@ubuntu.com>  Thu, 17 Feb 2011 10:27:14 -0600
 
 libindicator (0.3.18-0ubuntu1) natty; urgency=low
 
-- 
cgit v1.2.3