* New upstream release.

  * Adding support for a secondary activate signal

6 files changed, 67 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 10ffc95..78e2e5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,31 @@
 # Generated by Makefile. Do not edit.
 
+2011-07-21  Ted Gould  <ted@gould.cx>
+
+	0.3.92
+
+2011-07-21  Ted Gould  <ted@gould.cx>
+
+	Adding in secondary activate support
+
+2011-07-21  Ted Gould  <ted@gould.cx>
+
+	Dropping the x and y paramaters from the secondary activate signal
+
+2011-07-09  Marco Trevisan (Treviño)  <mail@3v1n0.net>
+
+	Added support for secondary activate signal: i.e. middle-click
+	
+	Secondary activate signal is designed to be used for a secondary
+	kind of activation, for example using middle-click.
+	
+	It exports both the event time and the mouse position (this is
+	mostly needed to follow the Status Notifier specifications).
+
+2011-07-08  Marco Trevisan (Treviño)  <mail@3v1n0.net>
+
+	Merging with trunk
+
 2011-07-14  Ted Gould  <ted@gould.cx>
 
 	0.3.91
diff --git a/configure b/configure
index b4e35f4..ee9eedf 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.68 for libindicator 0.3.91.
+# Generated by GNU Autoconf 2.68 for libindicator 0.3.92.
 #
 # Report bugs to <http://bugs.launchpad.net/libindicator>.
 #
@@ -709,8 +709,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libindicator'
 PACKAGE_TARNAME='libindicator'
-PACKAGE_VERSION='0.3.91'
-PACKAGE_STRING='libindicator 0.3.91'
+PACKAGE_VERSION='0.3.92'
+PACKAGE_STRING='libindicator 0.3.92'
 PACKAGE_BUGREPORT='http://bugs.launchpad.net/libindicator'
 PACKAGE_URL='http://launchpad.net/libindicator'
 
@@ -1451,7 +1451,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.91 to adapt to many kinds of systems.
+\`configure' configures libindicator 0.3.92 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1521,7 +1521,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libindicator 0.3.91:";;
+     short | recursive ) echo "Configuration of libindicator 0.3.92:";;
    esac
   cat <<\_ACEOF
 
@@ -1637,7 +1637,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libindicator configure 0.3.91
+libindicator configure 0.3.92
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1915,7 +1915,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.91, which was
+It was created by libindicator $as_me 0.3.92, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2737,7 +2737,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libindicator'
- VERSION='0.3.91'
+ VERSION='0.3.92'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -11730,7 +11730,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.91, which was
+This file was extended by libindicator $as_me 0.3.92, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -11797,7 +11797,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.91
+libindicator config.status 0.3.92
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index e8a162f..c8e5b27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([libindicator],
-        [0.3.91],
+        [0.3.92],
         [http://bugs.launchpad.net/libindicator],
         [libindicator],
         [http://launchpad.net/libindicator])
diff --git a/debian/changelog b/debian/changelog
index cb814a0..90c177d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libindicator (0.3.92-0ubuntu1~ppa1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    * Adding support for a secondary activate signal
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 21 Jul 2011 10:19:06 -0500
+
 libindicator (0.3.91-0ubuntu1~ppa1) oneiric; urgency=low
 
   * New upstream release.
diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c
index a563ebe..bd056f0 100644
--- a/libindicator/indicator-object.c
+++ b/libindicator/indicator-object.c
@@ -63,6 +63,7 @@ enum {
 	MENU_SHOW,
 	SHOW_NOW_CHANGED,
 	ACCESSIBLE_DESC_UPDATE,
+	SECONDARY_ACTIVATE,
 	LAST_SIGNAL
 };
 
@@ -149,8 +150,7 @@ indicator_object_class_init (IndicatorObjectClass *klass)
 	                                     NULL, NULL,
 	                                     _indicator_object_marshal_VOID__POINTER_UINT_UINT,
 	                                     G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_NONE);
-
-/**
+	/**
 		IndicatorObject::entry-scrolled:
 		@arg0: The #IndicatorObject object
 		@arg1: A pointer to the #IndicatorObjectEntry that
@@ -169,6 +169,23 @@ indicator_object_class_init (IndicatorObjectClass *klass)
 	                                _indicator_object_marshal_VOID__POINTER_UINT_ENUM,
 	                                G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_UINT,
 	                                INDICATOR_OBJECT_TYPE_SCROLL_DIRECTION);
+	/**
+		IndicatorObject::secondary-activate:
+		@arg0: The #IndicatorObject object
+		@arg1: A pointer to the #IndicatorObjectEntry that
+			receives the secondary activate event.
+		@arg2: The timestamp of the event
+
+		When the indicator receives a secondary activation event
+		from the user, this signal is emitted.
+	*/
+	signals[SECONDARY_ACTIVATE] = g_signal_new (INDICATOR_OBJECT_SIGNAL_SECONDARY_ACTIVATE,
+	                                G_TYPE_FROM_CLASS(klass),
+	                                G_SIGNAL_RUN_LAST,
+	                                G_STRUCT_OFFSET (IndicatorObjectClass, secondary_activate),
+	                                NULL, NULL,
+	                                _indicator_object_marshal_VOID__POINTER_UINT,
+	                                G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_UINT);
 
 	/**
 		IndicatorObject::menu-show:
diff --git a/libindicator/indicator-object.h b/libindicator/indicator-object.h
index a285949..3a120f5 100644
--- a/libindicator/indicator-object.h
+++ b/libindicator/indicator-object.h
@@ -57,6 +57,8 @@ typedef enum
 #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))
+#define INDICATOR_OBJECT_SIGNAL_SECONDARY_ACTIVATE "secondary-activate"
+#define INDICATOR_OBJECT_SIGNAL_SECONDARY_ACTIVATE_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_SECONDARY_ACTIVATE, INDICATOR_OBJECT_TYPE))
 
 typedef struct _IndicatorObject        IndicatorObject;
 typedef struct _IndicatorObjectClass   IndicatorObjectClass;
@@ -99,6 +101,7 @@ typedef struct _IndicatorObjectEntry   IndicatorObjectEntry;
 	@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
+	@secondary_activate: Slot for #IndicatorObject::secondary-activate
 */
 struct _IndicatorObjectClass {
 	GObjectClass parent_class;
@@ -125,6 +128,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       (*accessible_desc_update) (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data);
+	void       (*secondary_activate) (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp, gpointer user_data);
 
 	/* Reserved */
 	void       (*reserved1)     (void);
@@ -132,7 +136,6 @@ struct _IndicatorObjectClass {
 	void       (*reserved3)     (void);
 	void       (*reserved4)     (void);
 	void       (*reserved5)     (void);
-	void       (*reserved6)     (void);
 };
 
 /**