From 1a8b83c9f2bb8afa7d737f08e6f183ab3e384113 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 5 Feb 2010 17:30:10 -0800 Subject: Adding a test for changing the status. Just a copy of the standard dbus test. --- .bzrignore | 3 + tests/Makefile.am | 43 +++++ tests/test-libappindicator-status-client.c | 260 +++++++++++++++++++++++++++++ tests/test-libappindicator-status-server.c | 59 +++++++ 4 files changed, 365 insertions(+) create mode 100644 tests/test-libappindicator-status-client.c create mode 100644 tests/test-libappindicator-status-server.c 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/tests/Makefile.am b/tests/Makefile.am index 327c8cc..10a5647 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 @@ -62,6 +64,40 @@ test_libappindicator_dbus_server_LDADD = \ $(INDICATOR_LIBS) \ $(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-dbus + ######################################### ## 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..5a7107f --- /dev/null +++ b/tests/test-libappindicator-status-client.c @@ -0,0 +1,260 @@ +/* +Tests for the libappindicator library that are over DBus. This is +the client side of those tests. + +Copyright 2009 Canonical Ltd. + +Authors: + Ted Gould + +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 . +*/ + + +#include +#include +#include +#include "test-defines.h" + +static GMainLoop * mainloop = NULL; +static gboolean passed = TRUE; +static int propcount = 0; + +static void +check_propcount (void) +{ + if (propcount >= 5) { + g_main_loop_quit(mainloop); + } + return; +} + + +static void +prop_id_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * data) +{ + propcount++; + + GError * error = NULL; + GValue value = {0}; + + if (!dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_VALUE, &value, G_TYPE_INVALID)) { + g_warning("Getting ID failed: %s", error->message); + g_error_free(error); + passed = FALSE; + check_propcount(); + return; + } + + if (g_strcmp0(TEST_ID, g_value_get_string(&value))) { + g_debug("Property ID Returned: FAILED"); + passed = FALSE; + } else { + g_debug("Property ID Returned: PASSED"); + } + + check_propcount(); + return; +} + +static void +prop_category_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * data) +{ + propcount++; + + GError * error = NULL; + GValue value = {0}; + + if (!dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_VALUE, &value, G_TYPE_INVALID)) { + g_warning("Getting category failed: %s", error->message); + g_error_free(error); + passed = FALSE; + check_propcount(); + return; + } + + if (g_strcmp0(TEST_CATEGORY_S, g_value_get_string(&value))) { + g_debug("Property category Returned: FAILED"); + passed = FALSE; + } else { + g_debug("Property category Returned: PASSED"); + } + + check_propcount(); + return; +} + +static void +prop_status_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * data) +{ + propcount++; + + GError * error = NULL; + GValue value = {0}; + + if (!dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_VALUE, &value, G_TYPE_INVALID)) { + g_warning("Getting status failed: %s", error->message); + g_error_free(error); + passed = FALSE; + check_propcount(); + return; + } + + if (g_strcmp0(TEST_STATE_S, g_value_get_string(&value))) { + g_debug("Property status Returned: FAILED"); + passed = FALSE; + } else { + g_debug("Property status Returned: PASSED"); + } + + check_propcount(); + return; +} + +static void +prop_icon_name_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * data) +{ + propcount++; + + GError * error = NULL; + GValue value = {0}; + + if (!dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_VALUE, &value, G_TYPE_INVALID)) { + g_warning("Getting icon name failed: %s", error->message); + g_error_free(error); + passed = FALSE; + check_propcount(); + return; + } + + if (g_strcmp0(TEST_ICON_NAME, g_value_get_string(&value))) { + g_debug("Property icon name Returned: FAILED"); + passed = FALSE; + } else { + g_debug("Property icon name Returned: PASSED"); + } + + check_propcount(); + return; +} + +static void +prop_attention_icon_name_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * data) +{ + propcount++; + + GError * error = NULL; + GValue value = {0}; + + if (!dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_VALUE, &value, G_TYPE_INVALID)) { + g_warning("Getting attention icon name failed: %s", error->message); + g_error_free(error); + passed = FALSE; + check_propcount(); + return; + } + + if (g_strcmp0(TEST_ATTENTION_ICON_NAME, g_value_get_string(&value))) { + g_debug("Property attention icon name Returned: FAILED"); + passed = FALSE; + } else { + g_debug("Property attention icon name Returned: PASSED"); + } + + check_propcount(); + return; +} + +gboolean +kill_func (gpointer userdata) +{ + g_main_loop_quit(mainloop); + g_warning("Forced to Kill"); + passed = FALSE; + return FALSE; +} + +gint +main (gint argc, gchar * argv[]) +{ + g_type_init(); + + g_usleep(500000); + + 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; + } + + DBusGProxy * props = dbus_g_proxy_new_for_name_owner(session_bus, + ":1.0", + "/org/ayatana/NotificationItem", + DBUS_INTERFACE_PROPERTIES, + &error); + if (error != NULL) { + g_error("Unable to get property proxy: %s", error->message); + return 1; + } + + dbus_g_proxy_begin_call (props, + "Get", + prop_id_cb, + NULL, NULL, + G_TYPE_STRING, "org.ayatana.indicator.application.NotificationItem", + G_TYPE_STRING, "Id", + G_TYPE_INVALID); + dbus_g_proxy_begin_call (props, + "Get", + prop_category_cb, + NULL, NULL, + G_TYPE_STRING, "org.ayatana.indicator.application.NotificationItem", + G_TYPE_STRING, "Category", + G_TYPE_INVALID); + dbus_g_proxy_begin_call (props, + "Get", + prop_status_cb, + NULL, NULL, + G_TYPE_STRING, "org.ayatana.indicator.application.NotificationItem", + G_TYPE_STRING, "Status", + G_TYPE_INVALID); + dbus_g_proxy_begin_call (props, + "Get", + prop_icon_name_cb, + NULL, NULL, + G_TYPE_STRING, "org.ayatana.indicator.application.NotificationItem", + G_TYPE_STRING, "IconName", + G_TYPE_INVALID); + dbus_g_proxy_begin_call (props, + "Get", + prop_attention_icon_name_cb, + NULL, NULL, + G_TYPE_STRING, "org.ayatana.indicator.application.NotificationItem", + G_TYPE_STRING, "AttentionIconName", + G_TYPE_INVALID); + + g_timeout_add_seconds(2, 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..cc072aa --- /dev/null +++ b/tests/test-libappindicator-status-server.c @@ -0,0 +1,59 @@ +/* +Tests for the libappindicator library that are over DBus. This is +the server side of those tests. + +Copyright 2009 Canonical Ltd. + +Authors: + Ted Gould + +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 . +*/ + + +#include +#include +#include +#include +#include "test-defines.h" + +static GMainLoop * mainloop = NULL; + +gboolean +kill_func (gpointer userdata) +{ + g_main_loop_quit(mainloop); + return FALSE; +} + +gint +main (gint argc, gchar * argv[]) +{ + g_type_init(); + + 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 (TEST_ID, TEST_ICON_NAME, TEST_CATEGORY); + app_indicator_set_status (ci, TEST_STATE); + app_indicator_set_attention_icon (ci, TEST_ATTENTION_ICON_NAME); + + g_timeout_add_seconds(2, kill_func, NULL); + + mainloop = g_main_loop_new(NULL, FALSE); + g_main_loop_run(mainloop); + + g_object_unref(G_OBJECT(ci)); + g_debug("Quiting"); + + return 0; +} -- cgit v1.2.3 From d27570eae3152102ab10633c6127243439b21580 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 5 Feb 2010 17:30:41 -0800 Subject: Typo --- tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 10a5647..03e2091 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -169,7 +169,7 @@ test-libappindicator-status: test-libappindicator-status-client test-libappindic @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-dbus +TESTS += test-libappindicator-status ######################################### ## test-simple-app -- cgit v1.2.3 From 119bd7acf9f3246df348bcce10b99b6ae40c80ae Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 6 Feb 2010 09:22:00 -0800 Subject: Adjusting the status test to watch for toggles --- tests/test-libappindicator-status-client.c | 228 ++++++----------------------- 1 file changed, 46 insertions(+), 182 deletions(-) diff --git a/tests/test-libappindicator-status-client.c b/tests/test-libappindicator-status-client.c index 5a7107f..40f44df 100644 --- a/tests/test-libappindicator-status-client.c +++ b/tests/test-libappindicator-status-client.c @@ -23,165 +23,71 @@ with this program. If not, see . #include #include -#include -#include "test-defines.h" +#include +#include "../src/dbus-shared.h" static GMainLoop * mainloop = NULL; static gboolean passed = TRUE; -static int propcount = 0; +static gboolean watchdog_hit = TRUE; +static gboolean active = FALSE; +static guint toggle_count = 0; -static void -check_propcount (void) -{ - if (propcount >= 5) { - g_main_loop_quit(mainloop); - } - return; -} +#define PASSIVE_STR "Passive" +#define ACTIVE_STR "Active" +#define ATTN_STR "NeedsAttention" - -static void -prop_id_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * data) +static DBusHandlerResult +dbus_filter (DBusConnection * connection, DBusMessage * message, void * user_data) { - propcount++; - - GError * error = NULL; - GValue value = {0}; - - if (!dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_VALUE, &value, G_TYPE_INVALID)) { - g_warning("Getting ID failed: %s", error->message); - g_error_free(error); - passed = FALSE; - check_propcount(); - return; - } - - if (g_strcmp0(TEST_ID, g_value_get_string(&value))) { - g_debug("Property ID Returned: FAILED"); - passed = FALSE; - } else { - g_debug("Property ID Returned: PASSED"); + if (!dbus_message_is_signal(message, NOTIFICATION_ITEM_DBUS_IFACE, "NewStatus")) { + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } - check_propcount(); - return; -} - -static void -prop_category_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * data) -{ - propcount++; - - GError * error = NULL; - GValue value = {0}; - - if (!dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_VALUE, &value, G_TYPE_INVALID)) { - g_warning("Getting category failed: %s", error->message); - g_error_free(error); - passed = FALSE; - check_propcount(); - return; - } + gchar * string; - if (g_strcmp0(TEST_CATEGORY_S, g_value_get_string(&value))) { - g_debug("Property category Returned: FAILED"); - passed = FALSE; - } else { - g_debug("Property category Returned: PASSED"); + 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; } - check_propcount(); - return; -} - -static void -prop_status_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * data) -{ - propcount++; - - GError * error = NULL; - GValue value = {0}; - - if (!dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_VALUE, &value, G_TYPE_INVALID)) { - g_warning("Getting status failed: %s", error->message); - g_error_free(error); - passed = FALSE; - check_propcount(); - return; - } + watchdog_hit = TRUE; - if (g_strcmp0(TEST_STATE_S, g_value_get_string(&value))) { - g_debug("Property status Returned: FAILED"); - passed = FALSE; + 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 { - g_debug("Property status Returned: PASSED"); + active = FALSE; } - check_propcount(); - return; -} - -static void -prop_icon_name_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * data) -{ - propcount++; - - GError * error = NULL; - GValue value = {0}; - - if (!dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_VALUE, &value, G_TYPE_INVALID)) { - g_warning("Getting icon name failed: %s", error->message); - g_error_free(error); - passed = FALSE; - check_propcount(); - return; - } - - if (g_strcmp0(TEST_ICON_NAME, g_value_get_string(&value))) { - g_debug("Property icon name Returned: FAILED"); - passed = FALSE; - } else { - g_debug("Property icon name Returned: PASSED"); - } - - check_propcount(); - return; -} - -static void -prop_attention_icon_name_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * data) -{ - propcount++; + toggle_count++; - GError * error = NULL; - GValue value = {0}; - - if (!dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_VALUE, &value, G_TYPE_INVALID)) { - g_warning("Getting attention icon name failed: %s", error->message); - g_error_free(error); - passed = FALSE; - check_propcount(); - return; - } - - if (g_strcmp0(TEST_ATTENTION_ICON_NAME, g_value_get_string(&value))) { - g_debug("Property attention icon name Returned: FAILED"); - passed = FALSE; - } else { - g_debug("Property attention icon name Returned: PASSED"); + if (toggle_count == 1000) { + g_main_loop_quit(mainloop); } - check_propcount(); - return; + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } gboolean kill_func (gpointer userdata) { - g_main_loop_quit(mainloop); - g_warning("Forced to Kill"); - passed = FALSE; - return FALSE; + if (watchdog_hit == FALSE) { + g_main_loop_quit(mainloop); + g_warning("Forced to Kill"); + passed = FALSE; + return FALSE; + } + watchdog_hit = FALSE; + return TRUE; } gint @@ -198,53 +104,11 @@ main (gint argc, gchar * argv[]) return 1; } - DBusGProxy * props = dbus_g_proxy_new_for_name_owner(session_bus, - ":1.0", - "/org/ayatana/NotificationItem", - DBUS_INTERFACE_PROPERTIES, - &error); - if (error != NULL) { - g_error("Unable to get property proxy: %s", error->message); - return 1; - } - - dbus_g_proxy_begin_call (props, - "Get", - prop_id_cb, - NULL, NULL, - G_TYPE_STRING, "org.ayatana.indicator.application.NotificationItem", - G_TYPE_STRING, "Id", - G_TYPE_INVALID); - dbus_g_proxy_begin_call (props, - "Get", - prop_category_cb, - NULL, NULL, - G_TYPE_STRING, "org.ayatana.indicator.application.NotificationItem", - G_TYPE_STRING, "Category", - G_TYPE_INVALID); - dbus_g_proxy_begin_call (props, - "Get", - prop_status_cb, - NULL, NULL, - G_TYPE_STRING, "org.ayatana.indicator.application.NotificationItem", - G_TYPE_STRING, "Status", - G_TYPE_INVALID); - dbus_g_proxy_begin_call (props, - "Get", - prop_icon_name_cb, - NULL, NULL, - G_TYPE_STRING, "org.ayatana.indicator.application.NotificationItem", - G_TYPE_STRING, "IconName", - G_TYPE_INVALID); - dbus_g_proxy_begin_call (props, - "Get", - prop_attention_icon_name_cb, - NULL, NULL, - G_TYPE_STRING, "org.ayatana.indicator.application.NotificationItem", - G_TYPE_STRING, "AttentionIconName", - G_TYPE_INVALID); + 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); - g_timeout_add_seconds(2, kill_func, NULL); + watchdog_hit = TRUE; + g_timeout_add(100, kill_func, NULL); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); -- cgit v1.2.3 From 39bf2cc8582537e85bf28992cae8450df8312b52 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 6 Feb 2010 09:22:22 -0800 Subject: Loose the timeout --- tests/test-libappindicator-status-client.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/test-libappindicator-status-client.c b/tests/test-libappindicator-status-client.c index 40f44df..e016c81 100644 --- a/tests/test-libappindicator-status-client.c +++ b/tests/test-libappindicator-status-client.c @@ -95,8 +95,6 @@ main (gint argc, gchar * argv[]) { g_type_init(); - g_usleep(500000); - GError * error = NULL; DBusGConnection * session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error); if (error != NULL) { -- cgit v1.2.3 From d004765bf7b546978e708f7ca43efc80e33f0d19 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 6 Feb 2010 09:27:10 -0800 Subject: Now setting status ALOT --- tests/test-libappindicator-status-server.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/tests/test-libappindicator-status-server.c b/tests/test-libappindicator-status-server.c index cc072aa..f2984cd 100644 --- a/tests/test-libappindicator-status-server.c +++ b/tests/test-libappindicator-status-server.c @@ -25,15 +25,30 @@ with this program. If not, see . #include #include #include -#include "test-defines.h" static GMainLoop * mainloop = NULL; +static gboolean active = FALSE; +static guint toggle_count = 0; gboolean -kill_func (gpointer userdata) +toggle (gpointer userdata) { - g_main_loop_quit(mainloop); - return FALSE; + 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 == 1000) { + g_main_loop_quit(mainloop); + return FALSE; + } + + return TRUE; } gint @@ -43,11 +58,10 @@ main (gint argc, gchar * argv[]) 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 (TEST_ID, TEST_ICON_NAME, TEST_CATEGORY); - app_indicator_set_status (ci, TEST_STATE); - app_indicator_set_attention_icon (ci, TEST_ATTENTION_ICON_NAME); + 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_seconds(2, kill_func, NULL); + g_idle_add(toggle, ci); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); -- cgit v1.2.3 From 74c665741d480ab79105345ef9c700ddbf70804f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 6 Feb 2010 09:40:19 -0800 Subject: Lengthening the time a little bit to make sure we don't miss messages. --- tests/test-libappindicator-status-client.c | 3 ++- tests/test-libappindicator-status-server.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/test-libappindicator-status-client.c b/tests/test-libappindicator-status-client.c index e016c81..2e02b8e 100644 --- a/tests/test-libappindicator-status-client.c +++ b/tests/test-libappindicator-status-client.c @@ -83,6 +83,7 @@ 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; } @@ -106,7 +107,7 @@ main (gint argc, gchar * argv[]) 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(100, kill_func, NULL); + g_timeout_add(250, kill_func, NULL); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); diff --git a/tests/test-libappindicator-status-server.c b/tests/test-libappindicator-status-server.c index f2984cd..75b430e 100644 --- a/tests/test-libappindicator-status-server.c +++ b/tests/test-libappindicator-status-server.c @@ -61,7 +61,7 @@ main (gint argc, gchar * argv[]) 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_idle_add(toggle, ci); + g_timeout_add(50, toggle, ci); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); -- cgit v1.2.3 From b9152c356c099d051109fcd03e68c745b34899ec Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 6 Feb 2010 09:41:25 -0800 Subject: Changing to 100 instead of 1000 --- tests/test-libappindicator-status-client.c | 2 +- tests/test-libappindicator-status-server.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test-libappindicator-status-client.c b/tests/test-libappindicator-status-client.c index 2e02b8e..55d85a2 100644 --- a/tests/test-libappindicator-status-client.c +++ b/tests/test-libappindicator-status-client.c @@ -70,7 +70,7 @@ dbus_filter (DBusConnection * connection, DBusMessage * message, void * user_dat toggle_count++; - if (toggle_count == 1000) { + if (toggle_count == 100) { g_main_loop_quit(mainloop); } diff --git a/tests/test-libappindicator-status-server.c b/tests/test-libappindicator-status-server.c index 75b430e..c7a8ecd 100644 --- a/tests/test-libappindicator-status-server.c +++ b/tests/test-libappindicator-status-server.c @@ -43,7 +43,7 @@ toggle (gpointer userdata) toggle_count++; - if (toggle_count == 1000) { + if (toggle_count == 100) { g_main_loop_quit(mainloop); return FALSE; } -- cgit v1.2.3 From 982498c637c6afc0eefca913d3fc875b93ec22cc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 6 Feb 2010 09:44:32 -0800 Subject: Making sure the client has time to setup. --- tests/test-libappindicator-status-server.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/test-libappindicator-status-server.c b/tests/test-libappindicator-status-server.c index c7a8ecd..9e58ba9 100644 --- a/tests/test-libappindicator-status-server.c +++ b/tests/test-libappindicator-status-server.c @@ -21,6 +21,7 @@ with this program. If not, see . */ +#include #include #include #include @@ -56,6 +57,8 @@ 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); -- cgit v1.2.3 From 5b943016a4de4f75eb48f70779b84daac29604a2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 6 Feb 2010 09:58:46 -0800 Subject: Adding a menu item to toggle the attention state. --- example/simple-client.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) 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 . #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); -- cgit v1.2.3 From c2e186c250b9a9b067a0c8d759b64ebebcda55d1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 6 Feb 2010 10:01:17 -0800 Subject: More logging from our app indicator on icon changes --- src/indicator-application.c | 2 ++ 1 file changed, 2 insertions(+) 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); -- cgit v1.2.3 From 987c4b508accb7412b3b401edfd21b34645a8fe2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 6 Feb 2010 10:06:53 -0800 Subject: Getting the wrong string for the Attention Icon when looking at the properties --- src/application-service-appstore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- cgit v1.2.3