* New upstream release.

  * Build Fixes
  * Adding license to test files (LP: #684886)
  * Bump API/ABI versions appropriately and make easier to edit them in
    the future
  * Adding a name-hint to the indicator entries
  * Merging scroll functions into a single good one (LP: #804618)

9 files changed, 72 insertions, 103 deletions

diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am
index d63f841..4433655 100644
--- a/libindicator/Makefile.am
+++ b/libindicator/Makefile.am
@@ -10,12 +10,23 @@ BUILT_SOURCES = indicator-object-enum-types.h indicator-object-enum-types.c
 CLEANFILES =
 DISTCLEANFILES =
 EXTRA_DIST = \
-	indicator3.pc.in \
-	indicator.pc.in
+	indicator3-0.$(INDICATOR_API_VERSION).pc.in.in \
+	indicator-0.$(INDICATOR_API_VERSION).pc.in.in
+
+INDICATOR_ABI_VERSION = 6
+INDICATOR_API_VERSION = 4
+
+%.pc: %.pc.in
+	sed \
+		-e "s|\@indicator_api_version\@|$(INDICATOR_API_VERSION)|" \
+		-e "s|\@indicator_abi_version\@|$(INDICATOR_ABI_VERSION)|" \
+		$< > $@
+
+CLEANFILES = indicator$(VER)-0.$(INDICATOR_API_VERSION).pc
 
 include $(top_srcdir)/Makefile.am.marshal
 
-libindicatorincludedir=$(includedir)/libindicator$(VER)-0.3/libindicator
+libindicatorincludedir=$(includedir)/libindicator$(VER)-0.$(INDICATOR_API_VERSION)/libindicator
 
 indicator_headers = \
 	indicator.h \
@@ -51,7 +62,7 @@ libindicator_la_LIBADD = \
 	$(LIBINDICATOR_LIBS)
 
 libindicator_la_LDFLAGS = \
-	-version-info 3:0:0 \
+	-version-info $(INDICATOR_ABI_VERSION):0:0 \
 	-no-undefined \
 	-export-symbols-regex "^[^_].*"
 
@@ -66,7 +77,7 @@ libindicator3_la_CFLAGS = $(libindicator_la_CFLAGS)
 libindicator3_la_LIBADD = $(libindicator_la_LIBADD)
 libindicator3_la_LDFLAGS = $(libindicator_la_LDFLAGS)
 
-pkgconfig_DATA = indicator$(VER).pc
+pkgconfig_DATA = indicator$(VER)-0.$(INDICATOR_API_VERSION).pc
 pkgconfigdir = $(libdir)/pkgconfig
 
 glib_marshal_list = indicator-object-marshal.list
diff --git a/libindicator/Makefile.in b/libindicator/Makefile.in
index 5ccc9da..6c80998 100644
--- a/libindicator/Makefile.in
+++ b/libindicator/Makefile.in
@@ -54,16 +54,20 @@ build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(libindicator3include_HEADERS) \
 	$(libindicatorinclude_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/indicator.pc.in \
-	$(srcdir)/indicator3.pc.in $(top_srcdir)/Makefile.am.marshal
+	$(srcdir)/Makefile.in $(srcdir)/indicator-0.4.pc.in.in \
+	$(srcdir)/indicator3-0.4.pc.in.in \
+	$(top_srcdir)/Makefile.am.marshal
 subdir = libindicator
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = indicator.pc indicator3.pc
+CONFIG_CLEAN_FILES = indicator-0.4.pc.in indicator3-0.4.pc.in
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -130,7 +134,7 @@ libindicator3_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(libindicator3_la_LDFLAGS) $(LDFLAGS) -o $@
 @USE_GTK3_TRUE@am_libindicator3_la_rpath = -rpath $(libdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -294,16 +298,20 @@ top_srcdir = @top_srcdir@
 BUILT_SOURCES = indicator-object-enum-types.h \
 	indicator-object-enum-types.c $(marshal_h) $(marshal_c) \
 	gen-indicator-service.xml.h gen-indicator-service.xml.c
-CLEANFILES = stamp-marshal indicator-object-enum-types.h \
+CLEANFILES = indicator$(VER)-0.$(INDICATOR_API_VERSION).pc \
+	stamp-marshal indicator-object-enum-types.h \
 	indicator-object-enum-types.c s-enum-types-h s-enum-types-c \
 	$(BUILT_SOURCES)
 DISTCLEANFILES = $(marshal_h) $(marshal_c)
-EXTRA_DIST = indicator3.pc.in indicator.pc.in $(glib_marshal_list) \
-	indicator-object-enum-types.h.template \
+EXTRA_DIST = indicator3-0.$(INDICATOR_API_VERSION).pc.in.in \
+	indicator-0.$(INDICATOR_API_VERSION).pc.in.in \
+	$(glib_marshal_list) indicator-object-enum-types.h.template \
 	indicator-object-enum-types.c.template $(DBUS_SPECS)
+INDICATOR_ABI_VERSION = 6
+INDICATOR_API_VERSION = 4
 marshal_h = $(glib_marshal_list:.list=.h)
 marshal_c = $(glib_marshal_list:.list=.c)
-libindicatorincludedir = $(includedir)/libindicator$(VER)-0.3/libindicator
+libindicatorincludedir = $(includedir)/libindicator$(VER)-0.$(INDICATOR_API_VERSION)/libindicator
 indicator_headers = \
 	indicator.h \
 	indicator-desktop-shortcuts.h \
@@ -338,7 +346,7 @@ libindicator_la_LIBADD = \
 	$(LIBINDICATOR_LIBS)
 
 libindicator_la_LDFLAGS = \
-	-version-info 3:0:0 \
+	-version-info $(INDICATOR_ABI_VERSION):0:0 \
 	-no-undefined \
 	-export-symbols-regex "^[^_].*"
 
@@ -353,7 +361,7 @@ libindicator3_la_SOURCES = $(libindicator_la_SOURCES)
 libindicator3_la_CFLAGS = $(libindicator_la_CFLAGS)
 libindicator3_la_LIBADD = $(libindicator_la_LIBADD)
 libindicator3_la_LDFLAGS = $(libindicator_la_LDFLAGS)
-pkgconfig_DATA = indicator$(VER).pc
+pkgconfig_DATA = indicator$(VER)-0.$(INDICATOR_API_VERSION).pc
 pkgconfigdir = $(libdir)/pkgconfig
 glib_marshal_list = indicator-object-marshal.list
 glib_marshal_prefix = _indicator_object_marshal
@@ -399,9 +407,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-indicator.pc: $(top_builddir)/config.status $(srcdir)/indicator.pc.in
+indicator-0.4.pc.in: $(top_builddir)/config.status $(srcdir)/indicator-0.4.pc.in.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-indicator3.pc: $(top_builddir)/config.status $(srcdir)/indicator3.pc.in
+indicator3-0.4.pc.in: $(top_builddir)/config.status $(srcdir)/indicator3-0.4.pc.in.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
@@ -893,6 +901,12 @@ uninstall-am: uninstall-libLTLIBRARIES \
 	uninstall-libindicatorincludeHEADERS uninstall-pkgconfigDATA
 
 
+%.pc: %.pc.in
+	sed \
+		-e "s|\@indicator_api_version\@|$(INDICATOR_API_VERSION)|" \
+		-e "s|\@indicator_abi_version\@|$(INDICATOR_ABI_VERSION)|" \
+		$< > $@
+
 stamp-marshal: $(glib_marshal_list)
 	$(QUIET_GEN)$(GLIB_GENMARSHAL) \
 		--prefix=$(glib_marshal_prefix) \
diff --git a/libindicator/indicator.pc.in b/libindicator/indicator-0.4.pc.in.in
index 4e9b177..df4d6c8 100644
--- a/libindicator/indicator.pc.in
+++ b/libindicator/indicator-0.4.pc.in.in
@@ -4,10 +4,10 @@ libdir=@libdir@
 bindir=@bindir@
 includedir=@includedir@
 
-indicatordir=${libdir}/indicators/5/
+indicatordir=${libdir}/indicators/@indicator_abi_version@
 iconsdir=@datarootdir@/@PACKAGE@/icons/
 
-Cflags: -I${includedir}/libindicator-0.3
+Cflags: -I${includedir}/libindicator-0.@indicator_api_version@
 Requires: gtk+-2.0
 Libs: -lindicator
 
diff --git a/libindicator/indicator-object-marshal.c b/libindicator/indicator-object-marshal.c
index a6415d2..3e29260 100644
--- a/libindicator/indicator-object-marshal.c
+++ b/libindicator/indicator-object-marshal.c
@@ -89,44 +89,7 @@ _indicator_object_marshal_VOID__POINTER_UINT_UINT (GClosure     *closure,
             data2);
 }
 
-/* VOID:UINT,ENUM (./indicator-object-marshal.list:2) */
-void
-_indicator_object_marshal_VOID__UINT_ENUM (GClosure     *closure,
-                                           GValue       *return_value G_GNUC_UNUSED,
-                                           guint         n_param_values,
-                                           const GValue *param_values,
-                                           gpointer      invocation_hint G_GNUC_UNUSED,
-                                           gpointer      marshal_data)
-{
-  typedef void (*GMarshalFunc_VOID__UINT_ENUM) (gpointer     data1,
-                                                guint        arg_1,
-                                                gint         arg_2,
-                                                gpointer     data2);
-  register GMarshalFunc_VOID__UINT_ENUM callback;
-  register GCClosure *cc = (GCClosure*) closure;
-  register gpointer data1, data2;
-
-  g_return_if_fail (n_param_values == 3);
-
-  if (G_CCLOSURE_SWAP_DATA (closure))
-    {
-      data1 = closure->data;
-      data2 = g_value_peek_pointer (param_values + 0);
-    }
-  else
-    {
-      data1 = g_value_peek_pointer (param_values + 0);
-      data2 = closure->data;
-    }
-  callback = (GMarshalFunc_VOID__UINT_ENUM) (marshal_data ? marshal_data : cc->callback);
-
-  callback (data1,
-            g_marshal_value_peek_uint (param_values + 1),
-            g_marshal_value_peek_enum (param_values + 2),
-            data2);
-}
-
-/* VOID:POINTER,UINT,ENUM (./indicator-object-marshal.list:3) */
+/* VOID:POINTER,UINT,ENUM (./indicator-object-marshal.list:2) */
 void
 _indicator_object_marshal_VOID__POINTER_UINT_ENUM (GClosure     *closure,
                                                    GValue       *return_value G_GNUC_UNUSED,
@@ -165,7 +128,7 @@ _indicator_object_marshal_VOID__POINTER_UINT_ENUM (GClosure     *closure,
             data2);
 }
 
-/* VOID:POINTER,UINT (./indicator-object-marshal.list:4) */
+/* VOID:POINTER,UINT (./indicator-object-marshal.list:3) */
 void
 _indicator_object_marshal_VOID__POINTER_UINT (GClosure     *closure,
                                               GValue       *return_value G_GNUC_UNUSED,
@@ -202,7 +165,7 @@ _indicator_object_marshal_VOID__POINTER_UINT (GClosure     *closure,
             data2);
 }
 
-/* VOID:POINTER,BOOLEAN (./indicator-object-marshal.list:5) */
+/* VOID:POINTER,BOOLEAN (./indicator-object-marshal.list:4) */
 void
 _indicator_object_marshal_VOID__POINTER_BOOLEAN (GClosure     *closure,
                                                  GValue       *return_value G_GNUC_UNUSED,
diff --git a/libindicator/indicator-object-marshal.h b/libindicator/indicator-object-marshal.h
index ba91c72..143e9c2 100644
--- a/libindicator/indicator-object-marshal.h
+++ b/libindicator/indicator-object-marshal.h
@@ -14,15 +14,7 @@ extern void _indicator_object_marshal_VOID__POINTER_UINT_UINT (GClosure     *clo
                                                                gpointer      invocation_hint,
                                                                gpointer      marshal_data);
 
-/* VOID:UINT,ENUM (./indicator-object-marshal.list:2) */
-extern void _indicator_object_marshal_VOID__UINT_ENUM (GClosure     *closure,
-                                                       GValue       *return_value,
-                                                       guint         n_param_values,
-                                                       const GValue *param_values,
-                                                       gpointer      invocation_hint,
-                                                       gpointer      marshal_data);
-
-/* VOID:POINTER,UINT,ENUM (./indicator-object-marshal.list:3) */
+/* VOID:POINTER,UINT,ENUM (./indicator-object-marshal.list:2) */
 extern void _indicator_object_marshal_VOID__POINTER_UINT_ENUM (GClosure     *closure,
                                                                GValue       *return_value,
                                                                guint         n_param_values,
@@ -30,7 +22,7 @@ extern void _indicator_object_marshal_VOID__POINTER_UINT_ENUM (GClosure     *clo
                                                                gpointer      invocation_hint,
                                                                gpointer      marshal_data);
 
-/* VOID:POINTER,UINT (./indicator-object-marshal.list:4) */
+/* VOID:POINTER,UINT (./indicator-object-marshal.list:3) */
 extern void _indicator_object_marshal_VOID__POINTER_UINT (GClosure     *closure,
                                                           GValue       *return_value,
                                                           guint         n_param_values,
@@ -38,7 +30,7 @@ extern void _indicator_object_marshal_VOID__POINTER_UINT (GClosure     *closure,
                                                           gpointer      invocation_hint,
                                                           gpointer      marshal_data);
 
-/* VOID:POINTER,BOOLEAN (./indicator-object-marshal.list:5) */
+/* VOID:POINTER,BOOLEAN (./indicator-object-marshal.list:4) */
 extern void _indicator_object_marshal_VOID__POINTER_BOOLEAN (GClosure     *closure,
                                                              GValue       *return_value,
                                                              guint         n_param_values,
diff --git a/libindicator/indicator-object-marshal.list b/libindicator/indicator-object-marshal.list
index 73f1fac..4896ac4 100644
--- a/libindicator/indicator-object-marshal.list
+++ b/libindicator/indicator-object-marshal.list
@@ -1,5 +1,4 @@
 VOID: POINTER, UINT, UINT
-VOID: UINT, ENUM
 VOID: POINTER, UINT, ENUM
 VOID: POINTER, UINT
 VOID: POINTER, BOOLEAN
diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c
index a061215..2fe8dd1 100644
--- a/libindicator/indicator-object.c
+++ b/libindicator/indicator-object.c
@@ -59,8 +59,7 @@ enum {
 	ENTRY_ADDED,
 	ENTRY_REMOVED,
 	ENTRY_MOVED,
-	SCROLL,
-	SCROLL_ENTRY,
+	ENTRY_SCROLLED,
 	MENU_SHOW,
 	SHOW_NOW_CHANGED,
 	ACCESSIBLE_DESC_UPDATE,
@@ -151,26 +150,8 @@ indicator_object_class_init (IndicatorObjectClass *klass)
 	                                     _indicator_object_marshal_VOID__POINTER_UINT_UINT,
 	                                     G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_NONE);
 
-	/**
-		IndicatorObject::scroll:
-		@arg0: The #IndicatorObject object
-		@arg1: The delta of the scroll event
-		@arg2: The orientation of the scroll event.
-
-		When the indicator receives a mouse scroll wheel event
-		from the user, this signal is emitted.
-	*/
-	signals[SCROLL] = g_signal_new (INDICATOR_OBJECT_SIGNAL_SCROLL,
-	                                G_TYPE_FROM_CLASS(klass),
-	                                G_SIGNAL_RUN_LAST,
-	                                G_STRUCT_OFFSET (IndicatorObjectClass, scroll),
-	                                NULL, NULL,
-	                                _indicator_object_marshal_VOID__UINT_ENUM,
-	                                G_TYPE_NONE, 2, G_TYPE_UINT,
-	                                INDICATOR_OBJECT_TYPE_SCROLL_DIRECTION);
-
 /**
-		IndicatorObject::scroll-entry:
+		IndicatorObject::entry-scrolled:
 		@arg0: The #IndicatorObject object
 		@arg1: A pointer to the #IndicatorObjectEntry that
 			receives the scroll event.
@@ -180,10 +161,10 @@ indicator_object_class_init (IndicatorObjectClass *klass)
 		When the indicator receives a mouse scroll wheel event
 		from the user, this signal is emitted.
 	*/
-	signals[SCROLL_ENTRY] = g_signal_new (INDICATOR_OBJECT_SIGNAL_SCROLL_ENTRY,
+	signals[ENTRY_SCROLLED] = g_signal_new (INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED,
 	                                G_TYPE_FROM_CLASS(klass),
 	                                G_SIGNAL_RUN_LAST,
-	                                G_STRUCT_OFFSET (IndicatorObjectClass, scroll_entry),
+	                                G_STRUCT_OFFSET (IndicatorObjectClass, entry_scrolled),
 	                                NULL, NULL,
 	                                _indicator_object_marshal_VOID__POINTER_UINT_ENUM,
 	                                G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_UINT,
@@ -259,6 +240,7 @@ indicator_object_init (IndicatorObject *self)
 	self->priv->entry.label = NULL;
 	self->priv->entry.image = NULL;
 	self->priv->entry.accessible_desc = NULL;
+	self->priv->entry.name_hint = NULL;
 
 	self->priv->gotten_entries = FALSE;
 
@@ -454,6 +436,10 @@ get_entries_default (IndicatorObject * io)
 			g_warning("IndicatorObject class does not have an accessible description.");
 		}
 
+		if (class->get_name_hint) {
+			priv->entry.name_hint = class->get_name_hint(io);
+		}
+
 		priv->gotten_entries = TRUE;
 	}
 
diff --git a/libindicator/indicator-object.h b/libindicator/indicator-object.h
index aa15c79..a285949 100644
--- a/libindicator/indicator-object.h
+++ b/libindicator/indicator-object.h
@@ -49,10 +49,8 @@ typedef enum
 #define INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED_ID  (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, INDICATOR_OBJECT_TYPE))
 #define INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED       "entry-moved"
 #define INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED_ID    (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED, INDICATOR_OBJECT_TYPE))
-#define INDICATOR_OBJECT_SIGNAL_SCROLL            "scroll"
-#define INDICATOR_OBJECT_SIGNAL_SCROLL_ID         (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_SCROLL, INDICATOR_OBJECT_TYPE))
-#define INDICATOR_OBJECT_SIGNAL_SCROLL_ENTRY      "scroll-entry"
-#define INDICATOR_OBJECT_SIGNAL_SCROLL_ENTRY_ID   (g_signal_lookup(#define INDICATOR_OBJECT_SIGNAL_SCROLL_ENTRY, INDICATOR_OBJECT_TYPE))
+#define INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED    "entry-scrolled"
+#define INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED, INDICATOR_OBJECT_TYPE))
 #define INDICATOR_OBJECT_SIGNAL_MENU_SHOW         "menu-show"
 #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"
@@ -79,6 +77,8 @@ typedef struct _IndicatorObjectEntry   IndicatorObjectEntry;
 		object.
 	@get_accessible_desc: Gets the accessible descriptionfor this
 		object.
+	@get_name_hint: Gets the hint of the type of indicator that this
+		is for the caller.
 	@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
@@ -96,6 +96,7 @@ typedef struct _IndicatorObjectEntry   IndicatorObjectEntry;
 	@entry_removed: Slot for #IndicatorObject::entry-removed
 	@entry_moved: Slot for #IndicatorObject::entry-moved
 	@menu_show: Slot for #IndicatorObject::menu-show
+	@entry_scrolled: Slot for #IndicatorObject::entry-scrolled
 	@show_now_changed: Slot for #IndicatorObject::show-now-changed
 	@accessible_desc_update: Slot for #IndicatorObject::accessible-desc-update
 */
@@ -107,6 +108,7 @@ struct _IndicatorObjectClass {
 	GtkImage * (*get_image) (IndicatorObject * io);
 	GtkMenu  * (*get_menu)  (IndicatorObject * io);
 	const gchar * (*get_accessible_desc) (IndicatorObject * io);
+	const gchar * (*get_name_hint) (IndicatorObject * io);
 
 	GList *    (*get_entries) (IndicatorObject * io);
 	guint      (*get_location) (IndicatorObject * io, IndicatorObjectEntry * entry);
@@ -119,10 +121,9 @@ struct _IndicatorObjectClass {
 	void       (*entry_added)   (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data);
 	void       (*entry_removed) (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data);
 	void       (*entry_moved)   (IndicatorObject * io, IndicatorObjectEntry * entry, guint old_pos, guint new_pos, gpointer user_data);
-	void       (*scroll)        (IndicatorObject * io, gint delta, IndicatorScrollDirection direction);
+	void       (*entry_scrolled)  (IndicatorObject * io, IndicatorObjectEntry * entry, gint delta, IndicatorScrollDirection direction);
 	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 */
@@ -152,6 +153,8 @@ struct _IndicatorObject {
 	@menu: The menu to be added to the menubar
 	@accessible_desc: The accessible description
 		of the indicator
+	@name_hint: A name to describe the indicator being placed to allow
+		the caller to be more aware of the individual entries.
 
 	@reserved1: Reserved for future use
 	@reserved2: Reserved for future use
@@ -163,6 +166,7 @@ struct _IndicatorObjectEntry {
 	GtkImage * image;
 	GtkMenu  * menu;
 	const gchar * accessible_desc;
+	const gchar * name_hint;
 
 	void       (*reserved1)     (void);
 	void       (*reserved2)     (void);
diff --git a/libindicator/indicator3.pc.in b/libindicator/indicator3-0.4.pc.in.in
index 9fa0eac..1f34567 100644
--- a/libindicator/indicator3.pc.in
+++ b/libindicator/indicator3-0.4.pc.in.in
@@ -4,10 +4,10 @@ libdir=@libdir@
 bindir=@bindir@
 includedir=@includedir@
 
-indicatordir=${libdir}/indicators3/2/
+indicatordir=${libdir}/indicators3/@indicator_abi_version@/
 iconsdir=@datarootdir@/@PACKAGE@/icons/
 
-Cflags: -I${includedir}/libindicator-0.3
+Cflags: -I${includedir}/libindicator-0.@indicator_api_version@
 Requires: gtk+-3.0
 Libs: -lindicator3