Merge lp:~indicator-applet-developers/libindicator/ubuntu into lp:~ubuntu-desktop/libindicator/ubuntu

[Ted Gould]

0.3.13

=== modified file 'configure'
--- configure	2010-08-18 16:01:43 +0000
+++ configure	2010-09-15 16:49:43 +0000
@@ -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.12.
+# Generated by GNU Autoconf 2.67 for libindicator 0.3.13.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -701,8 +701,8 @@
 # Identity of this package.
 PACKAGE_NAME='libindicator'
 PACKAGE_TARNAME='libindicator'
-PACKAGE_VERSION='0.3.12'
-PACKAGE_STRING='libindicator 0.3.12'
+PACKAGE_VERSION='0.3.13'
+PACKAGE_STRING='libindicator 0.3.13'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
@@ -1439,7 +1439,7 @@
   # 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.12 to adapt to many kinds of systems.
+\`configure' configures libindicator 0.3.13 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1509,7 +1509,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libindicator 0.3.12:";;
+     short | recursive ) echo "Configuration of libindicator 0.3.13:";;
    esac
   cat <<\_ACEOF
 
@@ -1622,7 +1622,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libindicator configure 0.3.12
+libindicator configure 0.3.13
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1900,7 +1900,7 @@
 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.12, which was
+It was created by libindicator $as_me 0.3.13, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2720,7 +2720,7 @@
 
 # Define the identity of the package.
  PACKAGE=libindicator
- VERSION=0.3.12
+ VERSION=0.3.13
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12222,7 +12222,7 @@
 # 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.12, which was
+This file was extended by libindicator $as_me 0.3.13, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12288,7 +12288,7 @@
 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.12
+libindicator config.status 0.3.13
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2010-08-18 16:02:28 +0000
+++ configure.ac	2010-09-15 16:49:43 +0000
@@ -1,10 +1,10 @@
 
-AC_INIT(libindicator, 0.3.12, [e-mail])
+AC_INIT(libindicator, 0.3.13, [e-mail])
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libindicator, 0.3.12)
+AM_INIT_AUTOMAKE(libindicator, 0.3.13)
 
 AM_MAINTAINER_MODE
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-18 16:48:09 +0000
+++ debian/changelog	2010-09-15 16:49:43 +0000
@@ -1,3 +1,10 @@
+libindicator (0.3.13-0ubuntu1~ppa1) maverick; urgency=low
+
+  * New upstream release.
+    * Adding a menu_show signal
+
+ -- Ted Gould <[e-mail]>  Wed, 15 Sep 2010 11:46:37 -0500
+
 libindicator (0.3.12-0ubuntu1) maverick; urgency=low
 
   * New upstream release.

=== modified file 'libindicator/indicator-object-marshal.c'
--- libindicator/indicator-object-marshal.c	2010-04-09 16:57:53 +0000
+++ libindicator/indicator-object-marshal.c	2010-09-15 16:49:43 +0000
@@ -22,6 +22,7 @@
 #define g_marshal_value_peek_boxed(v)    g_value_get_boxed (v)
 #define g_marshal_value_peek_pointer(v)  g_value_get_pointer (v)
 #define g_marshal_value_peek_object(v)   g_value_get_object (v)
+#define g_marshal_value_peek_variant(v)  g_value_get_variant (v)
 #else /* !G_ENABLE_DEBUG */
 /* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
  *          Do not access GValues directly in your code. Instead, use the
@@ -45,6 +46,7 @@
 #define g_marshal_value_peek_boxed(v)    (v)->data[0].v_pointer
 #define g_marshal_value_peek_pointer(v)  (v)->data[0].v_pointer
 #define g_marshal_value_peek_object(v)   (v)->data[0].v_pointer
+#define g_marshal_value_peek_variant(v)  (v)->data[0].v_pointer
 #endif /* !G_ENABLE_DEBUG */
 
 
@@ -124,3 +126,40 @@
             data2);
 }
 
+/* VOID:POINTER,UINT (./indicator-object-marshal.list:3) */
+void
+_indicator_object_marshal_VOID__POINTER_UINT (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__POINTER_UINT) (gpointer     data1,
+                                                   gpointer     arg_1,
+                                                   guint        arg_2,
+                                                   gpointer     data2);
+  register GMarshalFunc_VOID__POINTER_UINT 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__POINTER_UINT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_pointer (param_values + 1),
+            g_marshal_value_peek_uint (param_values + 2),
+            data2);
+}
+

=== modified file 'libindicator/indicator-object-marshal.h'
--- libindicator/indicator-object-marshal.h	2010-04-09 16:57:53 +0000
+++ libindicator/indicator-object-marshal.h	2010-09-15 16:49:43 +0000
@@ -22,6 +22,14 @@
                                                        gpointer      invocation_hint,
                                                        gpointer      marshal_data);
 
+/* 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,
+                                                          const GValue *param_values,
+                                                          gpointer      invocation_hint,
+                                                          gpointer      marshal_data);
+
 G_END_DECLS
 
 #endif /* ___indicator_object_marshal_MARSHAL_H__ */

=== modified file 'libindicator/indicator-object-marshal.list'
--- libindicator/indicator-object-marshal.list	2010-03-16 16:40:14 +0000
+++ libindicator/indicator-object-marshal.list	2010-09-15 16:49:43 +0000
@@ -1,2 +1,3 @@
 VOID: POINTER, UINT, UINT
 VOID: UINT,ENUM
+VOID: POINTER, UINT

=== modified file 'libindicator/indicator-object.c'
--- libindicator/indicator-object.c	2010-03-17 06:14:13 +0000
+++ libindicator/indicator-object.c	2010-09-15 16:49:43 +0000
@@ -57,7 +57,8 @@
 	ENTRY_ADDED,
 	ENTRY_REMOVED,
 	ENTRY_MOVED,
-        SCROLL,
+	SCROLL,
+	MENU_SHOW,
 	LAST_SIGNAL
 };
 
@@ -145,22 +146,40 @@
 	                                     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:
+		@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::menu-show:
+		@arg0: The #IndicatorObject object
+		@arg1: A pointer to the #IndicatorObjectEntry that
+			is being shown.
+		@arg2: The timestamp of the event
+
+		Used when the indicator wants to signal up the stack
+		that the menu should be shown.
+	*/
+	signals[MENU_SHOW] = g_signal_new (INDICATOR_OBJECT_SIGNAL_MENU_SHOW,
+	                                   G_TYPE_FROM_CLASS(klass),
+	                                   G_SIGNAL_RUN_LAST,
+	                                   G_STRUCT_OFFSET (IndicatorObjectClass, menu_show),
+	                                   NULL, NULL,
+	                                   _indicator_object_marshal_VOID__POINTER_UINT,
+	                                   G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_UINT);
 
 
 	return;

=== modified file 'libindicator/indicator-object.h'
--- libindicator/indicator-object.h	2010-03-16 20:31:15 +0000
+++ libindicator/indicator-object.h	2010-09-15 16:49:43 +0000
@@ -51,6 +51,8 @@
 #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_MENU_SHOW         "menu-show"
+#define INDICATOR_OBJECT_SIGNAL_MENU_SHOW_ID      (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_MENU_SHOW, INDICATOR_OBJECT_TYPE))
 
 typedef struct _IndicatorObject        IndicatorObject;
 typedef struct _IndicatorObjectClass   IndicatorObjectClass;
@@ -79,8 +81,7 @@
 	@entry_added: Slot for #IndicatorObject::entry-added
 	@entry_removed: Slot for #IndicatorObject::entry-removed
 	@entry_moved: Slot for #IndicatorObject::entry-moved
-	@indicator_object_reserved_1: Reserved for future use
-	@indicator_object_reserved_2: Reserved for future use
+	@menu_show: Slot for #IndicatorObject::menu-show
 */
 struct _IndicatorObjectClass {
 	GObjectClass parent_class;
@@ -94,13 +95,13 @@
 	guint      (*get_location) (IndicatorObject * io, IndicatorObjectEntry * entry);
 
 	/* Signals */
-        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_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       (*menu_show)     (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp, gpointer user_data);
 
 	/* Reserved */
-	void (* indicator_object_reserved_1) (void);
 };
 
 /**

=== modified file 'tools/indicator-loader.c'
--- tools/indicator-loader.c	2009-12-10 16:32:31 +0000
+++ tools/indicator-loader.c	2010-09-15 16:49:43 +0000
@@ -79,6 +79,13 @@
 	return;
 }
 
+static void
+menu_show (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp, gpointer user_data)
+{
+	g_debug("Show Menu: %s", entry->label != NULL ? gtk_label_get_text(entry->label) : "No Label");
+	return;
+}
+
 static gboolean
 load_module (const gchar * name, GtkWidget * menu)
 {
@@ -97,6 +104,7 @@
 	/* Connect to it's signals */
 	g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED,   G_CALLBACK(entry_added),    menu);
 	g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, G_CALLBACK(entry_removed),  menu);
+	g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_MENU_SHOW,     G_CALLBACK(menu_show),      NULL);
 
 	/* Work on the entries */
 	GList * entries = indicator_object_get_entries(io);