Import upstream version 0.3.14

5 files changed, 47 insertions, 3 deletions

diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am
index 983a6a5..f942f0d 100644
--- a/libindicator/Makefile.am
+++ b/libindicator/Makefile.am
@@ -42,6 +42,11 @@ libindicator_la_CFLAGS = \
 libindicator_la_LIBADD = \
 	$(LIBINDICATOR_LIBS)
 
+libindicator_la_LDFLAGS = \
+	-version-info 1:0:0 \
+	-no-undefined \
+	-export-symbols-regex "^[^_].*"
+
 pkgconfig_DATA = indicator.pc
 pkgconfigdir = $(libdir)/pkgconfig
 
diff --git a/libindicator/Makefile.in b/libindicator/Makefile.in
index 0dddfe0..209f524 100644
--- a/libindicator/Makefile.in
+++ b/libindicator/Makefile.in
@@ -105,8 +105,8 @@ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
 libindicator_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(libindicator_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-	-o $@
+	$(libindicator_la_CFLAGS) $(CFLAGS) $(libindicator_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -311,6 +311,11 @@ libindicator_la_CFLAGS = \
 libindicator_la_LIBADD = \
 	$(LIBINDICATOR_LIBS)
 
+libindicator_la_LDFLAGS = \
+	-version-info 1:0:0 \
+	-no-undefined \
+	-export-symbols-regex "^[^_].*"
+
 pkgconfig_DATA = indicator.pc
 pkgconfigdir = $(libdir)/pkgconfig
 glib_marshal_list = indicator-object-marshal.list
diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c
index a5fd740..41484a6 100644
--- a/libindicator/indicator-object.c
+++ b/libindicator/indicator-object.c
@@ -432,3 +432,28 @@ indicator_object_get_location (IndicatorObject * io, IndicatorObjectEntry * entr
 
 	return 0;
 }
+
+/**
+	indicator_object_entry_activate:
+	@io: #IndicatorObject to query
+	@entry: The #IndicatorObjectEntry whose entry was shown
+	@timestamp: The X11 timestamp of the event
+
+	Used to signal to the indicator that the menu on an entry has
+	been clicked on.  This can either be an activate or a showing
+	of the menu.  Note, this does not actually show the menu that's
+	left up to the reader.
+*/
+void
+indicator_object_entry_activate (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp)
+{
+	g_return_if_fail(INDICATOR_IS_OBJECT(io));
+	IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io);
+
+	if (class->entry_activate != NULL) {
+		return class->entry_activate(io, entry, timestamp);
+	}
+
+	return;
+}
+
diff --git a/libindicator/indicator-object.h b/libindicator/indicator-object.h
index 32a35f9..79f4757 100644
--- a/libindicator/indicator-object.h
+++ b/libindicator/indicator-object.h
@@ -94,6 +94,8 @@ struct _IndicatorObjectClass {
 	GList *    (*get_entries) (IndicatorObject * io);
 	guint      (*get_location) (IndicatorObject * io, IndicatorObjectEntry * entry);
 
+	void       (*entry_activate) (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp);
+
 	/* Signals */
 	void       (*entry_added)   (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data);
 	void       (*entry_removed) (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data);
@@ -102,6 +104,12 @@ struct _IndicatorObjectClass {
 	void       (*menu_show)     (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp, gpointer user_data);
 
 	/* Reserved */
+	void       (*reserved1)     (void);
+	void       (*reserved2)     (void);
+	void       (*reserved3)     (void);
+	void       (*reserved4)     (void);
+	void       (*reserved5)     (void);
+	void       (*reserved6)     (void);
 };
 
 /**
@@ -132,6 +140,7 @@ IndicatorObject * indicator_object_new_from_file (const gchar * file);
 
 GList * indicator_object_get_entries (IndicatorObject * io);
 guint   indicator_object_get_location (IndicatorObject * io, IndicatorObjectEntry * entry);
+void    indicator_object_entry_activate (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp);
 
 G_END_DECLS
 
diff --git a/libindicator/indicator.pc.in b/libindicator/indicator.pc.in
index 91b70b1..abc5590 100644
--- a/libindicator/indicator.pc.in
+++ b/libindicator/indicator.pc.in
@@ -4,7 +4,7 @@ libdir=@libdir@
 bindir=@bindir@
 includedir=@includedir@
 
-indicatordir=${libdir}/indicators/3/
+indicatordir=${libdir}/indicators/4/
 iconsdir=@datarootdir@/@PACKAGE@/icons/
 
 Cflags: -I${includedir}/libindicator-0.3