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

[Ted Gould]

0.3.6

=== modified file 'AUTHORS'
--- AUTHORS	2009-02-11 21:59:42 +0000
+++ AUTHORS	2010-03-18 16:33:19 +0000
@@ -1,1 +1,2 @@
 Ted Gould <[e-mail]>
+Cody Russell <[e-mail]>
\ No newline at end of file

=== modified file 'configure.ac'
--- configure.ac	2010-03-11 20:22:51 +0000
+++ configure.ac	2010-03-18 16:33:19 +0000
@@ -1,10 +1,10 @@
 
-AC_INIT(libindicator, 0.3.5, [e-mail])
+AC_INIT(libindicator, 0.3.6, [e-mail])
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libindicator, 0.3.5)
+AM_INIT_AUTOMAKE(libindicator, 0.3.6)
 
 AM_MAINTAINER_MODE
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
@@ -15,6 +15,8 @@
 AC_STDC_HEADERS
 AC_PROG_LIBTOOL
 
+AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums])
+
 AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
 
 AC_SUBST(VERSION)
@@ -66,7 +68,7 @@
   REAL_PREFIX=$prefix
 fi
 
-# Have to go $sysconfdir->$prefix/etc->/usr/local/etc   
+# Have to go $sysconfdir->$prefix/etc->/usr/local/etc
 # if you actually know how to code shell then fix this :-)
 SYSCONFDIR_TMP="$sysconfdir"
 old_prefix=$prefix

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-11 21:52:27 +0000
+++ debian/changelog	2010-03-18 16:33:19 +0000
@@ -1,3 +1,11 @@
+libindicator (0.3.6-0ubuntu1~ppa1) lucid; urgency=low
+
+  * Upstream release 0.3.6
+    * Adding in scroll signals for the indicators
+  * debian/rules: Updating shlibs 
+
+ -- Ted Gould <[e-mail]>  Thu, 18 Mar 2010 11:10:20 -0500
+
 libindicator (0.3.5-0ubuntu1) lucid; urgency=low
 
   * Upstream release 0.3.5

=== modified file 'debian/rules'
--- debian/rules	2010-03-11 20:26:58 +0000
+++ debian/rules	2010-03-18 16:33:19 +0000
@@ -5,4 +5,4 @@
 
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator0 (>= 0.3.5)'
+DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator0 (>= 0.3.6)'

=== modified file 'libindicator/Makefile.am'
--- libindicator/Makefile.am	2010-03-10 17:45:53 +0000
+++ libindicator/Makefile.am	2010-03-18 16:33:19 +0000
@@ -1,6 +1,6 @@
-BUILT_SOURCES = 
-CLEANFILES = 
-DISTCLEANFILES = 
+BUILT_SOURCES = indicator-object-enum-types.h indicator-object-enum-types.c
+CLEANFILES =
+DISTCLEANFILES =
 EXTRA_DIST = \
 	indicator.pc.in
 
@@ -26,6 +26,7 @@
 	$(indicator_headers) \
 	dbus-shared.h \
 	indicator-object.c \
+	indicator-object-enum-types.c \
 	indicator-desktop-shortcuts.c \
 	indicator-image-helper.c \
 	indicator-object-marshal.h \
@@ -47,6 +48,29 @@
 glib_marshal_list = indicator-object-marshal.list
 glib_marshal_prefix = _indicator_object_marshal
 
+indicator-object-enum-types.h: s-enum-types-h
+	@true
+s-enum-types-h: $(indicator_headers)
+	( cd $(srcdir) && $(GLIB_MKENUMS) --template $(srcdir)/indicator-object-enum-types.h.template								\
+		$(indicator_headers) ) >> tmp-indicator-object-enum-types.h											\
+	&& (cmp -s tmp-indicator-object-enum-types.h indicator-object-enum-types.h || cp tmp-indicator-object-enum-types.h indicator-object-enum-types.h )	\
+	&& rm -f tmp-indicator-object-enum-types.h && echo timestamp > $(@F)
+
+indicator-object-enum-types.c: s-enum-types-c
+	@true
+s-enum-types-c: $(indicator_headers)
+	( cd $(srcdir) && $(GLIB_MKENUMS) --template $(srcdir)/indicator-object-enum-types.c.template								\
+		$(indicator_headers) ) > tmp-indicator-object-enum-types.c											\
+	&& (cmp -s tmp-indicator-object-enum-types.c indicator-object-enum-types.c || cp tmp-indicator-object-enum-types.c indicator-object-enum-types.c )	\
+	&& rm -f tmp-indicator-object-enum-types.c
+
+EXTRA_DIST += indicator-object-enum-types.h
+CLEANFILES +=						\
+	indicator-object-enum-types.h			\
+	indicator-object-enum-types.c			\
+	s-enum-types-h					\
+	s-enum-types-c
+
 ##################################
 # DBus Specs
 ##################################

=== added file 'libindicator/indicator-object-enum-types.c.template'
--- libindicator/indicator-object-enum-types.c.template	1970-01-01 00:00:00 +0000
+++ libindicator/indicator-object-enum-types.c.template	2010-03-18 16:33:19 +0000
@@ -0,0 +1,30 @@
+/*** BEGIN file-header ***/
+#include "indicator-object-enum-types.h"
+/*** END file-header ***/
+
+/*** BEGIN file-production ***/
+/* enumerations from "@filename@" */
+#include "@filename@"
+/*** END file-production ***/
+
+/*** BEGIN value-header ***/
+GType
+@enum_name@_get_type (void) {
+  static GType enum_type_id = 0;
+  if (G_UNLIKELY (!enum_type_id))
+    {
+      static const G@Type@Value values[] = {
+/*** END value-header ***/
+
+/*** BEGIN value-production ***/
+        { @VALUENAME@, "@VALUENAME@", "@valuenick@" },
+/*** END value-production ***/
+
+/*** BEGIN value-tail ***/
+        { 0, NULL, NULL }
+      };
+      enum_type_id = g_@type@_register_static (g_intern_static_string ("@EnumName@"), values);
+    }
+  return enum_type_id;
+}
+/*** END value-tail ***/

=== added file 'libindicator/indicator-object-enum-types.h.template'
--- libindicator/indicator-object-enum-types.h.template	1970-01-01 00:00:00 +0000
+++ libindicator/indicator-object-enum-types.h.template	2010-03-18 16:33:19 +0000
@@ -0,0 +1,27 @@
+/*** BEGIN file-header ***/
+
+#ifndef __INDICATOR_OBJECT_ENUM_TYPES_H__
+#define __INDICATOR_OBJECT_ENUM_TYPES_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+/*** END file-header ***/
+
+/*** BEGIN file-production ***/
+/* enumerations from "@filename@" */
+/*** END file-production ***/
+
+/*** BEGIN file-tail ***/
+G_END_DECLS
+
+#endif /* !__INDICATOR_OBJECT_ENUM_TYPES_H__ */
+/*** END file-tail ***/
+
+/*** BEGIN value-header ***/
+
+GType @enum_name@_get_type (void) G_GNUC_CONST;
+#define INDICATOR_OBJECT_TYPE_@ENUMSHORT@ (@enum_name@_get_type())
+
+/*** END value-header ***/

=== modified file 'libindicator/indicator-object-marshal.list'
--- libindicator/indicator-object-marshal.list	2010-01-15 21:16:30 +0000
+++ libindicator/indicator-object-marshal.list	2010-03-18 16:33:19 +0000
@@ -1,1 +1,2 @@
 VOID: POINTER, UINT, UINT
+VOID: UINT,ENUM

=== modified file 'libindicator/indicator-object.c'
--- libindicator/indicator-object.c	2010-01-15 22:08:35 +0000
+++ libindicator/indicator-object.c	2010-03-18 16:33:19 +0000
@@ -28,6 +28,7 @@
 #include "indicator.h"
 #include "indicator-object.h"
 #include "indicator-object-marshal.h"
+#include "indicator-object-enum-types.h"
 
 /**
 	IndicatorObjectPrivate:
@@ -56,6 +57,7 @@
 	ENTRY_ADDED,
 	ENTRY_REMOVED,
 	ENTRY_MOVED,
+        SCROLL,
 	LAST_SIGNAL
 };
 
@@ -142,6 +144,25 @@
 	                                     _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);
+
+
 	return;
 }
 
@@ -188,7 +209,7 @@
 indicator_object_finalize (GObject *object)
 {
 	IndicatorObjectPrivate * priv = INDICATOR_OBJECT_GET_PRIVATE(object);
-	
+
 	if (priv->module != NULL) {
 		/* Wow, this is convoluted.  So basically we want to unref
 		   the module which will cause the code it included to be
@@ -211,7 +232,7 @@
 
 	This function builds an #IndicatorObject using the symbols
 	that are found in @file.  The module is loaded and the
-	references are all kept by the object.  To unload the 
+	references are all kept by the object.  To unload the
 	module the object must be destroyed.
 
 	Return value: A valid #IndicatorObject or #NULL if error.
@@ -304,7 +325,7 @@
 /* The default get entries function uses the other single
    entries in the class to create an entry structure and
    put it into a list.  This makes it simple for simple objects
-   to create the list.  Small changes from the way they 
+   to create the list.  Small changes from the way they
    previously were. */
 static GList *
 get_entries_default (IndicatorObject * io)

=== modified file 'libindicator/indicator-object.h'
--- libindicator/indicator-object.h	2010-01-15 21:04:20 +0000
+++ libindicator/indicator-object.h	2010-03-18 16:33:19 +0000
@@ -24,11 +24,18 @@
 #ifndef __INDICATOR_OBJECT_H__
 #define __INDICATOR_OBJECT_H__
 
-#include <glib.h>
-#include <glib-object.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
+typedef enum
+{
+  INDICATOR_OBJECT_SCROLL_UP,
+  INDICATOR_OBJECT_SCROLL_DOWN,
+  INDICATOR_OBJECT_SCROLL_LEFT,
+  INDICATOR_OBJECT_SCROLL_RIGHT
+} IndicatorScrollDirection;
+
 #define INDICATOR_OBJECT_TYPE            (indicator_object_get_type ())
 #define INDICATOR_OBJECT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_OBJECT_TYPE, IndicatorObject))
 #define INDICATOR_OBJECT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_OBJECT_TYPE, IndicatorObjectClass))
@@ -42,6 +49,8 @@
 #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))
 
 typedef struct _IndicatorObject        IndicatorObject;
 typedef struct _IndicatorObjectClass   IndicatorObjectClass;
@@ -75,7 +84,7 @@
 */
 struct _IndicatorObjectClass {
 	GObjectClass parent_class;
-	
+
 	/* Virtual Functions */
 	GtkLabel * (*get_label) (IndicatorObject * io);
 	GtkImage * (*get_image) (IndicatorObject * io);
@@ -85,13 +94,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       (*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);
 
 	/* Reserved */
 	void (* indicator_object_reserved_1) (void);
-	void (* indicator_object_reserved_2) (void);
 };
 
 /**