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

[Ted Gould]

[Ted Gould (ted)]

0.3.1

=== modified file 'configure.ac'
--- configure.ac	2010-02-04 23:16:17 +0000
+++ configure.ac	2010-02-06 00:28:12 +0000
@@ -1,10 +1,10 @@
 
-AC_INIT(libindicate, 0.3.0, [e-mail])
+AC_INIT(libindicate, 0.3.1, [e-mail])
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libindicate, 0.3.0)
+AM_INIT_AUTOMAKE(libindicate, 0.3.1)
 
 AM_MAINTAINER_MODE
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
@@ -55,7 +55,7 @@
 DBUS_REQUIRED_VERSION=0.76
 GLIB_REQUIRED_VERSION=2.18
 GIO_REQUIRED_VERSION=2.18
-DBUSMENU_REQUIRED_VERSION=0.2.0
+DBUSMENU_REQUIRED_VERSION=0.2.2
 
 PKG_CHECK_MODULES(LIBINDICATE, glib-2.0 >= $GLIB_REQUIRED_VERSION
                                gio-2.0 >= $GIO_REQUIRED_VERSION
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-02-05 00:08:44 +0000
+++ debian/changelog	2010-02-06 00:28:12 +0000
@@ -1,9 +1,25 @@
+<<<<<<< TREE
 libindicate (0.3.0-0ubuntu1) lucid; urgency=low
 
   * debian/rules:
     - update the shlibs
   
   [ Ted Gould ]
+=======
+libindicate (0.3.1-0ubuntu1~ppa1) lucid; urgency=low
+
+  * Upstream release 0.3.1
+    * Fixing the server_display signal
+    * Reincluding the enum headers
+    * Fixing pkgconfig file to include dbusmenu-glib
+  * debian/control: Adding libdbusmenu-glib-dev as a dep
+    for the -dev package.
+
+ -- Ted Gould <[e-mail]>  Fri, 05 Feb 2010 16:25:47 -0800
+
+libindicate (0.3.0-0ubuntu1~ppa1) lucid; urgency=low
+
+>>>>>>> MERGE-SOURCE
   * Upstream 0.3.0 release
     * Fixing build of typelib file
     * Removing the system bus from a default bus
 
=== modified file 'libindicate/Makefile.am'
--- libindicate/Makefile.am	2010-02-04 22:37:39 +0000
+++ libindicate/Makefile.am	2010-02-06 00:28:12 +0000
@@ -46,7 +46,8 @@
 	interests.h
 
 libindicateinclude_HEADERS = \
-	$(indicate_headers)
+	$(indicate_headers) \
+	$(glib_enum_h)
 
 libindicate_la_SOURCES = \
 	$(indicate_headers) \
 
=== modified file 'libindicate/indicate-enum-types.h.in'
--- libindicate/indicate-enum-types.h.in	2010-02-03 21:14:27 +0000
+++ libindicate/indicate-enum-types.h.in	2010-02-06 00:28:12 +0000
@@ -11,11 +11,12 @@
 /*** BEGIN file-tail ***/
 
 G_END_DECLS
-#endif /* _INDICATE_ENUM_TYPES_H_ */"
+#endif /* _INDICATE_ENUM_TYPES_H_ */
+
 /*** END file-tail ***/
 
 /*** BEGIN file-production ***/
-/* enumerations from \"@filename@\" */
+/* enumerations from "@filename@" */
 
 /*** END file-production ***/
 
 
=== modified file 'libindicate/server.c'
--- libindicate/server.c	2010-02-04 22:41:43 +0000
+++ libindicate/server.c	2010-02-06 00:28:12 +0000
@@ -271,6 +271,7 @@
 	/**
 		IndicateServer::server-display:
 		@arg0: The #IndicateServer object
+		@arg1: Timestamp of the show event
 
 		Emitted when a listener signals that the server itself should be
 		displayed.  This signal is caused by a user clicking on the application
@@ -281,8 +282,8 @@
 	                                        G_SIGNAL_RUN_LAST,
 	                                        G_STRUCT_OFFSET (IndicateServerClass, server_display),
 	                                        NULL, NULL,
-	                                        g_cclosure_marshal_VOID__VOID,
-	                                        G_TYPE_NONE, 0);
+	                                        g_cclosure_marshal_VOID__UINT,
+	                                        G_TYPE_NONE, 1, G_TYPE_UINT);
 	/**
 		IndicateServer::interest-added:
 		@arg0: The #IndicateServer object
@@ -1313,7 +1314,7 @@
 show_indicator_to_user (IndicateServer * server, guint id, guint timestamp, GError ** error)
 {
 	if (id == INDICATE_SERVER_INDICATOR_NULL) {
-		g_signal_emit(server, signals[SERVER_DISPLAY], 0, TRUE);
+		g_signal_emit(server, signals[SERVER_DISPLAY], 0, timestamp, TRUE);
 		return TRUE;
 	}
 
 
=== modified file 'libindicate/server.h'
--- libindicate/server.h	2010-02-04 22:41:43 +0000
+++ libindicate/server.h	2010-02-06 00:28:12 +0000
@@ -143,7 +143,7 @@
 	void (* indicator_modified) (IndicateServer * server, guint id, gchar * property);
 	void (* server_show) (IndicateServer * server, gchar * type);
 	void (* server_hide) (IndicateServer * server, gchar * type);
-	void (* server_display) (IndicateServer * server);
+	void (* server_display) (IndicateServer * server, guint timestamp);
 	void (* interest_added) (IndicateServer * server, IndicateInterests interest);
 	void (* interest_removed) (IndicateServer * server, IndicateInterests interest);
 	void (* max_indicators_changed) (IndicateServer * server, gint max);