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

[Ted Gould]

[Ted Gould (ted)]

0.3.3

=== modified file 'Makefile.am'
--- Makefile.am	2009-08-18 16:28:35 +0000
+++ Makefile.am	2010-02-18 15:29:09 +0000
@@ -10,7 +10,8 @@
 	COPYING.LGPL.2.1 \
 	gtk-doc.make \
 	omf.make \
-	xmldocs.make
+	xmldocs.make \
+	autogen.sh
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-scrollkeeper
 
 
=== modified file 'configure.ac'
--- configure.ac	2010-02-11 15:36:39 +0000
+++ configure.ac	2010-02-18 15:29:09 +0000
@@ -1,10 +1,10 @@
 
-AC_INIT(libindicate, 0.3.2, [e-mail])
+AC_INIT(libindicate, 0.3.3, [e-mail])
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libindicate, 0.3.2)
+AM_INIT_AUTOMAKE(libindicate, 0.3.3)
 
 AM_MAINTAINER_MODE
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
@@ -28,7 +28,7 @@
 ###########################
 
 LIBINDICATE_CURRENT=4
-LIBINDICATE_REVISION=0
+LIBINDICATE_REVISION=1
 LIBINDICATE_AGE=0
 
 AC_SUBST(LIBINDICATE_CURRENT)
@@ -40,7 +40,7 @@
 ###########################
 
 LIBINDICATEGTK_CURRENT=2
-LIBINDICATEGTK_REVISION=0
+LIBINDICATEGTK_REVISION=1
 LIBINDICATEGTK_AGE=0
 
 AC_SUBST(LIBINDICATEGTK_CURRENT)
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-02-11 19:14:52 +0000
+++ debian/changelog	2010-02-18 15:29:09 +0000
@@ -1,3 +1,12 @@
+libindicate (0.3.3-0ubuntu1~ppa1) lucid; urgency=low
+
+  * Upstream release 0.3.3
+    * Add ability to get properties as values in the server.
+    * Fix error messages on failed properties.
+    * Add menu support to im-client example.
+
+ -- Ted Gould <[e-mail]>  Thu, 18 Feb 2010 09:25:28 -0600
+
 libindicate (0.3.2-0ubuntu1) lucid; urgency=low
 
   * Upstream release 0.3.2
 
=== modified file 'examples/im-client.c'
--- examples/im-client.c	2009-08-28 19:40:56 +0000
+++ examples/im-client.c	2010-02-18 15:29:09 +0000
@@ -78,6 +78,12 @@
 	g_debug("Someone is no longer interested in my for: %d", interest);
 }
 
+void
+menuitem_click (DbusmenuMenuitem * menuitem, guint timestamp, gpointer data)
+{
+	g_debug("Menuitem '%s' clicked at %d", (gchar *)data, timestamp);
+}
+
 int
 main (int argc, char ** argv)
 {
@@ -90,6 +96,23 @@
 	g_signal_connect(G_OBJECT(server), INDICATE_SERVER_SIGNAL_INTEREST_ADDED, G_CALLBACK(interest_added), NULL);
 	g_signal_connect(G_OBJECT(server), INDICATE_SERVER_SIGNAL_INTEREST_REMOVED, G_CALLBACK(interest_removed), NULL);
 
+	DbusmenuServer * dmserver = dbusmenu_server_new("/dbusmenu/path");
+	DbusmenuMenuitem * root = dbusmenu_menuitem_new();
+	dbusmenu_server_set_root(dmserver, root);
+	DbusmenuMenuitem * item;
+
+	item = dbusmenu_menuitem_new();
+	dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, "Label 1");
+	dbusmenu_menuitem_child_append(root, item);
+	g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(menuitem_click), "Label 1");
+
+	item = dbusmenu_menuitem_new();
+	dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, "Label 2");
+	dbusmenu_menuitem_child_append(root, item);
+	g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(menuitem_click), "Label 2");
+
+	indicate_server_set_menu(server, dmserver);
+
 	IndicateIndicator * indicator;
 
 	indicator = indicate_indicator_new();
 
=== modified file 'libindicate/listener.c'
--- libindicate/listener.c	2010-02-10 14:44:22 +0000
+++ libindicate/listener.c	2010-02-18 15:29:09 +0000
@@ -712,6 +712,7 @@
 
 typedef enum _get_property_type get_property_type;
 enum _get_property_type {
+	PROPERTY_TYPE_VALUE,
 	PROPERTY_TYPE_STRING,
 	PROPERTY_TYPE_TIME,
 	PROPERTY_TYPE_INT,
@@ -749,6 +750,12 @@
 	}
 
 	switch (get_property_data->type) {
+	case PROPERTY_TYPE_VALUE: {
+		/* Just pass the GValue along. */
+		indicate_listener_get_property_value_cb cb =(indicate_listener_get_property_value_cb)get_property_data->cb;
+		cb(get_property_data->listener, get_property_data->server, get_property_data->indicator, get_property_data->property, &OUT_value, get_property_data->data);
+		break;
+	}
 	case PROPERTY_TYPE_STRING: {
 		/* Just pass the string along. */
 		indicate_listener_get_property_cb cb = (indicate_listener_get_property_cb)get_property_data->cb;
@@ -807,6 +814,27 @@
 }
 
 /**
+	indicate_listener_get_property_value:
+	@listener: The #IndicateListener representing the connection
+	@server: The server that the indicator is on
+	@indicator: Which indicator is being queried
+	@property: Name of the property to get
+	@callback: The callback function to call with the data
+	@data: Arbitrary data to give the callback
+
+	A function to get a property from an indicator on a server
+	and bring it back locally.  This wraps all the hassle of using
+	the DBus API and makes it pretty easy to get properties.
+
+	This function gets the raw gvalue data, without any conversion.
+*/
+void
+indicate_listener_get_property_value (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, indicate_listener_get_property_value_cb callback, gpointer data)
+{
+	return get_property_helper(listener, server, indicator, property, G_CALLBACK(callback), data, PROPERTY_TYPE_VALUE);
+}
+
+/**
 	indicate_listener_get_property:
 	@listener: The #IndicateListener representing the connection
 	@server: The server that the indicator is on
 
=== modified file 'libindicate/listener.h'
--- libindicate/listener.h	2010-02-04 22:41:43 +0000
+++ libindicate/listener.h	2010-02-18 15:29:09 +0000
@@ -111,6 +111,7 @@
 
 GType indicate_listener_get_type (void) G_GNUC_CONST;
 
+typedef void (*indicate_listener_get_property_value_cb) (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, const GValue * propertydata, gpointer data);
 typedef void (*indicate_listener_get_property_cb) (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, const gchar * propertydata, gpointer data);
 typedef void (*indicate_listener_get_property_time_cb) (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, const GTimeVal * propertydata, gpointer data);
 typedef void (*indicate_listener_get_property_int_cb) (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, gint propertydata, gpointer data);
@@ -121,6 +122,12 @@
 /* Create a new listener */
 IndicateListener *    indicate_listener_new                (void);
 IndicateListener *    indicate_listener_ref_default        (void);
+void                  indicate_listener_get_property_value (IndicateListener * listener,
+                                                            IndicateListenerServer * server,
+                                                            IndicateListenerIndicator * indicator,
+                                                            gchar * property,
+                                                            indicate_listener_get_property_value_cb callback,
+                                                            gpointer data);
 void                  indicate_listener_get_property       (IndicateListener * listener,
                                                             IndicateListenerServer * server,
                                                             IndicateListenerIndicator * indicator,
 
=== modified file 'libindicate/server.c'
--- libindicate/server.c	2010-02-10 14:27:48 +0000
+++ libindicate/server.c	2010-02-18 15:29:09 +0000
@@ -52,6 +52,7 @@
 	REMOVE_INTEREST_FAILED,
 	NO_MAX_INDICATORS_SET,
 	MAX_INDICATORS_SET_FAILED,
+	NO_SUCH_PROPERTY,
 	LAST_ERROR
 };
 
@@ -1259,6 +1260,13 @@
 
 	const GValue * ind_property = indicate_indicator_get_property_value(indicator, property);
 	if (ind_property == NULL) {
+		if (error != NULL) {
+			g_set_error(error,
+			            indicate_server_error_quark(),
+			            NO_SUCH_PROPERTY,
+			            "Indicator %d has no property named '%s'",
+			            id, property);
+		}
 		return FALSE;
 	}
 
 
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2010-02-04 22:41:43 +0000
+++ tests/Makefile.am	2010-02-18 15:29:09 +0000
@@ -267,7 +267,7 @@
 
 test-max-indicators-repeat: test-max-indicators-client test-max-indicators-server-repeat Makefile.am
 	@echo "#!/bin/sh" > $@
-	@echo "$(DBUS_RUNNER) --task ./test-max-indicators-client --task-name Client --task ./test-max-indicators-server-repeat --task-name Server" >> $@
+	@echo "$(DBUS_RUNNER) --task ./test-max-indicators-client --task-name Client --task ./test-max-indicators-server-repeat --task-name Server --ignore-return " >> $@
 	@chmod +x $@
 
 test_max_indicators_server_repeat_SOURCES = \