* Upstream Merge

  * Fixing grabbing of attention icon

8 files changed, 279 insertions, 1 deletions

diff --git a/.bzrignore b/.bzrignore
index a218817..24a0402 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -90,3 +90,6 @@ src/libappindicator/appindicator-0.1.pc
 tests/test-libappindicator-fallback-item
 tests/test-libappindicator-fallback-watcher
 tests/test-libappindicator-fallback
+tests/test-libappindicator-status
+tests/test-libappindicator-status-client
+tests/test-libappindicator-status-server
diff --git a/debian/changelog b/debian/changelog
index 410324f..fa85f09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+indicator-application (0.0.11-0ubuntu1~ppa2~aicon1) UNRELEASED; urgency=low
+
+  * Upstream Merge
+    * Fixing grabbing of attention icon
+
+ -- Ted Gould <ted@ubuntu.com>  Sat, 06 Feb 2010 10:07:40 -0800
+
 indicator-application (0.0.11-0ubuntu1~ppa1) lucid; urgency=low
 
   * Upstream release 0.0.11
diff --git a/example/simple-client.c b/example/simple-client.c
index 6dcf5d1..f1b8d37 100644
--- a/example/simple-client.c
+++ b/example/simple-client.c
@@ -25,6 +25,24 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "libdbusmenu-glib/menuitem.h"
 
 GMainLoop * mainloop = NULL;
+static gboolean active = TRUE;
+
+static void
+activate_clicked_cb (GtkWidget *widget, gpointer data)
+{
+	AppIndicator * ci = APP_INDICATOR(data);
+
+	if (active) {
+		app_indicator_set_status (ci, APP_INDICATOR_STATUS_ATTENTION);
+		gtk_menu_item_set_label(GTK_MENU_ITEM(widget), "I'm okay now");
+		active = FALSE;
+	} else {
+		app_indicator_set_status (ci, APP_INDICATOR_STATUS_ACTIVE);
+		gtk_menu_item_set_label(GTK_MENU_ITEM(widget), "Get Attention");
+		active = TRUE;
+	}
+
+}
 
 static void
 item_clicked_cb (GtkWidget *widget, gpointer data)
@@ -99,6 +117,12 @@ main (int argc, char ** argv)
         gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 		gtk_widget_show(item);
 
+        item = gtk_menu_item_new_with_label ("Get Attention");
+        g_signal_connect (item, "activate",
+                          G_CALLBACK (activate_clicked_cb), ci);
+        gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+		gtk_widget_show(item);
+
         app_indicator_set_menu (ci, GTK_MENU (menu));
 
 	mainloop = g_main_loop_new(NULL, FALSE);
diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c
index 70fab18..c784495 100644
--- a/src/application-service-appstore.c
+++ b/src/application-service-appstore.c
@@ -224,7 +224,7 @@ get_all_properties_cb (DBusGProxy * proxy, GHashTable * properties, GError * err
 	app->icon = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ICON_NAME));
 	app->menu = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_MENU));
 	if (g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_AICON_NAME) != NULL) {
-		app->aicon = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ICON_NAME));
+		app->aicon = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_AICON_NAME));
 	}
 
 	gpointer icon_path_data = g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ICON_PATH);
diff --git a/src/indicator-application.c b/src/indicator-application.c
index 6c053a9..269150a 100644
--- a/src/indicator-application.c
+++ b/src/indicator-application.c
@@ -407,8 +407,10 @@ application_icon_changed (DBusGProxy * proxy, gint position, const gchar * iconn
 	   just use the name we were given. */
 	gchar * longname = g_strdup_printf("%s-%s", iconname, PANEL_ICON_SUFFIX);
 	if (gtk_icon_theme_has_icon(gtk_icon_theme_get_default(), longname)) {
+		g_debug("Setting icon on %d to %s", position, longname);
 		gtk_image_set_from_icon_name(app->entry.image, longname, GTK_ICON_SIZE_MENU);
 	} else {
+		g_debug("Setting icon on %d to %s", position, iconname);
 		gtk_image_set_from_icon_name(app->entry.image, iconname, GTK_ICON_SIZE_MENU);
 	}
 	g_free(longname);
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 327c8cc..03e2091 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,6 +3,8 @@ check_PROGRAMS = \
 	test-libappindicator \
 	test-libappindicator-dbus-client \
 	test-libappindicator-dbus-server \
+	test-libappindicator-status-client \
+	test-libappindicator-status-server \
 	test-libappindicator-fallback-watcher \
 	test-libappindicator-fallback-item \
 	test-simple-app
@@ -63,6 +65,40 @@ test_libappindicator_dbus_server_LDADD = \
 	$(top_builddir)/src/libappindicator.la
 
 #########################################
+##  test-libappindicator-status-client
+#########################################
+
+test_libappindicator_status_client_SOURCES = \
+	test-defines.h \
+	test-libappindicator-status-client.c
+
+test_libappindicator_status_client_CFLAGS = \
+	$(INDICATOR_CFLAGS) \
+	-Wall -Werror \
+	-I$(top_srcdir)/src
+
+test_libappindicator_status_client_LDADD = \
+	$(INDICATOR_LIBS) \
+	$(top_builddir)/src/libappindicator.la
+
+#########################################
+##  test-libappindicator-status-server
+#########################################
+
+test_libappindicator_status_server_SOURCES = \
+	test-defines.h \
+	test-libappindicator-status-server.c
+
+test_libappindicator_status_server_CFLAGS = \
+	$(INDICATOR_CFLAGS) \
+	-Wall -Werror \
+	-I$(top_srcdir)/src
+
+test_libappindicator_status_server_LDADD = \
+	$(INDICATOR_LIBS) \
+	$(top_builddir)/src/libappindicator.la
+
+#########################################
 ##  test-libappindicator-fallback
 #########################################
 
@@ -128,6 +164,13 @@ test-libappindicator-dbus: test-libappindicator-dbus-client test-libappindicator
 
 TESTS += test-libappindicator-dbus
 
+test-libappindicator-status: test-libappindicator-status-client test-libappindicator-status-server Makefile.am
+	@echo "#!/bin/sh" > test-libappindicator-status
+	@echo $(DBUS_RUNNER) --task ./test-libappindicator-status-client --task-name Client --task ./test-libappindicator-status-server --task-name Server --ignore-return >> test-libappindicator-status
+	@chmod +x test-libappindicator-status
+
+TESTS += test-libappindicator-status
+
 #########################################
 ##  test-simple-app
 #########################################
diff --git a/tests/test-libappindicator-status-client.c b/tests/test-libappindicator-status-client.c
new file mode 100644
index 0000000..55d85a2
--- /dev/null
+++ b/tests/test-libappindicator-status-client.c
@@ -0,0 +1,123 @@
+/*
+Tests for the libappindicator library that are over DBus.  This is
+the client side of those tests.
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+    Ted Gould <ted@canonical.com>
+
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 3, as published
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranties of
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#include <glib.h>
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
+#include "../src/dbus-shared.h"
+
+static GMainLoop * mainloop = NULL;
+static gboolean passed = TRUE;
+static gboolean watchdog_hit = TRUE;
+static gboolean active = FALSE;
+static guint toggle_count = 0;
+
+#define PASSIVE_STR  "Passive"
+#define ACTIVE_STR   "Active"
+#define ATTN_STR     "NeedsAttention"
+
+static DBusHandlerResult
+dbus_filter (DBusConnection * connection, DBusMessage * message, void * user_data)
+{
+	if (!dbus_message_is_signal(message, NOTIFICATION_ITEM_DBUS_IFACE, "NewStatus")) {
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+
+	gchar * string;
+
+	DBusError derror;
+	dbus_error_init(&derror);
+	if (!dbus_message_get_args(message, &derror,
+				DBUS_TYPE_STRING, &string,
+				DBUS_TYPE_INVALID)) {
+		g_warning("Couldn't get parameters");
+		dbus_error_free(&derror);
+		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+	}
+
+	watchdog_hit = TRUE;
+
+	if (g_strcmp0(string, ACTIVE_STR) == 0) {
+		if (active) {
+			g_warning("Got active when already active");
+			passed = FALSE;
+			return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+		}
+		active = TRUE;
+	} else {
+		active = FALSE;
+	}
+
+	toggle_count++;
+
+	if (toggle_count == 100) {
+		g_main_loop_quit(mainloop);
+	}
+
+	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+}
+
+gboolean
+kill_func (gpointer userdata)
+{
+	if (watchdog_hit == FALSE) {
+		g_main_loop_quit(mainloop);
+		g_warning("Forced to Kill");
+		g_warning("Toggle count: %d", toggle_count);
+		passed = FALSE;
+		return FALSE;
+	}
+	watchdog_hit = FALSE;
+	return TRUE;
+}
+
+gint
+main (gint argc, gchar * argv[])
+{
+	g_type_init();
+
+	GError * error = NULL;
+	DBusGConnection * session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+	if (error != NULL) {
+		g_error("Unable to get session bus: %s", error->message);
+		return 1;
+	}
+
+	dbus_connection_add_filter(dbus_g_connection_get_connection(session_bus), dbus_filter, NULL, NULL);
+	dbus_bus_add_match(dbus_g_connection_get_connection(session_bus), "type='signal',interface='" NOTIFICATION_ITEM_DBUS_IFACE "',member='NewStatus'", NULL);
+
+	watchdog_hit = TRUE;
+	g_timeout_add(250, kill_func, NULL);
+
+	mainloop = g_main_loop_new(NULL, FALSE);
+	g_main_loop_run(mainloop);
+
+	if (passed) {
+		g_debug("Quiting");
+		return 0;
+	} else {
+		g_debug("Quiting as we're a failure");
+		return 1;
+	}
+	return 0;
+}
diff --git a/tests/test-libappindicator-status-server.c b/tests/test-libappindicator-status-server.c
new file mode 100644
index 0000000..9e58ba9
--- /dev/null
+++ b/tests/test-libappindicator-status-server.c
@@ -0,0 +1,76 @@
+/*
+Tests for the libappindicator library that are over DBus.  This is
+the server side of those tests.
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+    Ted Gould <ted@canonical.com>
+
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 3, as published
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranties of
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#include <stdlib.h>
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
+#include <glib.h>
+#include <libappindicator/app-indicator.h>
+
+static GMainLoop * mainloop = NULL;
+static gboolean active = FALSE;
+static guint toggle_count = 0;
+
+gboolean
+toggle (gpointer userdata)
+{
+	if (active) {
+		app_indicator_set_status (APP_INDICATOR(userdata), APP_INDICATOR_STATUS_ATTENTION);
+		active = FALSE;
+	} else {
+		app_indicator_set_status (APP_INDICATOR(userdata), APP_INDICATOR_STATUS_ACTIVE);
+		active = TRUE;
+	}
+
+	toggle_count++;
+
+	if (toggle_count == 100) {
+		g_main_loop_quit(mainloop);
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+gint
+main (gint argc, gchar * argv[])
+{
+	g_type_init();
+
+	g_usleep(100000);
+
+	g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(dbus_g_bus_get(DBUS_BUS_SESSION, NULL))));
+
+	AppIndicator * ci = app_indicator_new ("my-id", "my-icon-name", APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
+	app_indicator_set_attention_icon (ci, "my-attention-icon");
+
+	g_timeout_add(50, toggle, ci);
+
+	mainloop = g_main_loop_new(NULL, FALSE);
+	g_main_loop_run(mainloop);
+
+	g_object_unref(G_OBJECT(ci));
+	g_debug("Quiting");
+
+	return 0;
+}