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 From 3f35b1d6707b36b58f9f0d133c1bb9d8ecd60cad Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 6 Feb 2010 10:09:40 -0800 Subject: releasing version 0.0.11-0ubuntu1~ppa2~aicon1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index fa85f09..eb1e973 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-application (0.0.11-0ubuntu1~ppa2~aicon1) UNRELEASED; urgency=low +indicator-application (0.0.11-0ubuntu1~ppa2~aicon1) lucid; urgency=low * Upstream Merge * Fixing grabbing of attention icon - -- Ted Gould Sat, 06 Feb 2010 10:07:40 -0800 + -- Ted Gould Sat, 06 Feb 2010 10:09:39 -0800 indicator-application (0.0.11-0ubuntu1~ppa1) lucid; urgency=low -- cgit v1.2.3 From 53bb57465bf4747f56615242d09df562a8a2c3c7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 6 Feb 2010 10:20:45 -0800 Subject: Reffing the connection so we ensure that we have it even when folks die. --- src/libappindicator/app-indicator.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index 908684f..8d07861 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -330,6 +330,7 @@ app_indicator_init (AppIndicator *self) g_error_free(error); return; } + dbus_g_connection_ref(priv->connection); dbus_g_connection_register_g_object(priv->connection, DEFAULT_ITEM_PATH, @@ -386,6 +387,11 @@ app_indicator_dispose (GObject *object) priv->watcher_proxy = NULL; } + if (priv->connection != NULL) { + dbus_g_connection_unref(priv->connection); + priv->connection = NULL; + } + G_OBJECT_CLASS (app_indicator_parent_class)->dispose (object); return; } -- cgit v1.2.3 From 5f4f1eb3363b74df3715f8ef9328c5c703f5d6b8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 6 Feb 2010 10:34:23 -0800 Subject: Putting the proxy construction in an idle function. --- src/libappindicator/app-indicator.c | 38 ++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index 8d07861..426ee8c 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -690,6 +690,33 @@ dbus_owner_change (DBusGProxy * proxy, const gchar * name, const gchar * prev, c return; } +/* This is an idle function to create the proxy. This is mostly + because start_fallback_timer can get called in the distruction + of a proxy and thus the proxy manager gets confused when creating + a new proxy as part of destroying an old one. This function being + on idle means that we'll just do it outside of the same stack where + the previous proxy is being destroyed. */ +static gboolean +setup_name_owner_proxy (gpointer data) +{ + g_return_val_if_fail(IS_APP_INDICATOR(data), FALSE); + AppIndicatorPrivate * priv = APP_INDICATOR(data)->priv; + + if (priv->dbus_proxy == NULL) { + priv->dbus_proxy = dbus_g_proxy_new_for_name(priv->connection, + DBUS_SERVICE_DBUS, + DBUS_PATH_DBUS, + DBUS_INTERFACE_DBUS); + dbus_g_proxy_add_signal(priv->dbus_proxy, "NameOwnerChanged", + G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, + G_TYPE_INVALID); + dbus_g_proxy_connect_signal(priv->dbus_proxy, "NameOwnerChanged", + G_CALLBACK(dbus_owner_change), data, NULL); + } + + return FALSE; +} + /* A function that will start the fallback timer if it's not already started. It sets up the DBus watcher to see if there is a change. Also, provides an override mode for cases @@ -707,15 +734,8 @@ start_fallback_timer (AppIndicator * self, gboolean disable_timeout) } if (priv->dbus_proxy == NULL) { - priv->dbus_proxy = dbus_g_proxy_new_for_name(priv->connection, - DBUS_SERVICE_DBUS, - DBUS_PATH_DBUS, - DBUS_INTERFACE_DBUS); - dbus_g_proxy_add_signal(priv->dbus_proxy, "NameOwnerChanged", - G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, - G_TYPE_INVALID); - dbus_g_proxy_connect_signal(priv->dbus_proxy, "NameOwnerChanged", - G_CALLBACK(dbus_owner_change), self, NULL); + /* NOTE: Read the comment on setup_name_owner_proxy */ + g_idle_add(setup_name_owner_proxy, self); } if (disable_timeout) { -- cgit v1.2.3 From 87a7acd9fc0069cb2f4fee96e42ee6651b35629f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 6 Feb 2010 10:52:19 -0800 Subject: Making room for a disconnected function. --- src/indicator-application.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/src/indicator-application.c b/src/indicator-application.c index 6c053a9..c7789f1 100644 --- a/src/indicator-application.c +++ b/src/indicator-application.c @@ -95,7 +95,9 @@ static void indicator_application_dispose (GObject *object); static void indicator_application_finalize (GObject *object); static GList * get_entries (IndicatorObject * io); static guint get_location (IndicatorObject * io, IndicatorObjectEntry * entry); -static void connected (IndicatorServiceManager * sm, gboolean connected, IndicatorApplication * application); +void connection_changed (IndicatorServiceManager * sm, gboolean connected, IndicatorApplication * application); +static void connected (IndicatorApplication * application); +static void disconnected (IndicatorApplication * application); static void application_added (DBusGProxy * proxy, const gchar * iconname, gint position, const gchar * dbusaddress, const gchar * dbusobject, const gchar * icon_path, IndicatorApplication * application); static void application_removed (DBusGProxy * proxy, gint position , IndicatorApplication * application); static void application_icon_changed (DBusGProxy * proxy, gint position, const gchar * iconname, IndicatorApplication * application); @@ -149,7 +151,7 @@ indicator_application_init (IndicatorApplication *self) priv->theme_dirs = NULL; priv->sm = indicator_service_manager_new(INDICATOR_APPLICATION_DBUS_ADDR); - g_signal_connect(G_OBJECT(priv->sm), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connected), self); + g_signal_connect(G_OBJECT(priv->sm), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_changed), self); priv->applications = NULL; @@ -205,8 +207,23 @@ indicator_application_finalize (GObject *object) return; } +/* Responds to connection change event from the service manager and + splits it into two. */ void -connected (IndicatorServiceManager * sm, gboolean connected, IndicatorApplication * application) +connection_changed (IndicatorServiceManager * sm, gboolean connect, IndicatorApplication * application) +{ + if (connect) { + connected(application); + } else { + disconnected(application); + } + return; +} + +/* Brings up the connection to a service that has just come onto the + bus, or is atleast new to us. */ +void +connected (IndicatorApplication * application) { IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application); g_debug("Connected to Application Indicator Service."); @@ -278,6 +295,14 @@ connected (IndicatorServiceManager * sm, gboolean connected, IndicatorApplicatio return; } +static void +disconnected (IndicatorApplication * application) +{ + + + return; +} + /* Goes through the list of applications that we're maintaining and pulls out the IndicatorObjectEntry and returns that in a list for the caller. */ -- cgit v1.2.3 From 130e93c1195cad4a74e84602e71b08786cfbd5db Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 6 Feb 2010 10:56:44 -0800 Subject: Changing the proxy to only build if we need it, and not destroy itself on killing the process. There's really no reason for that. --- src/indicator-application.c | 88 +++++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 43 deletions(-) diff --git a/src/indicator-application.c b/src/indicator-application.c index c7789f1..f6fe314 100644 --- a/src/indicator-application.c +++ b/src/indicator-application.c @@ -241,50 +241,52 @@ connected (IndicatorApplication * application) } } + if (priv->service_proxy) { /* Build the service proxy */ - priv->service_proxy = dbus_g_proxy_new_for_name_owner(priv->bus, - INDICATOR_APPLICATION_DBUS_ADDR, - INDICATOR_APPLICATION_DBUS_OBJ, - INDICATOR_APPLICATION_DBUS_IFACE, - &error); - - /* Set up proxy signals */ - g_debug("Setup proxy signals"); - dbus_g_proxy_add_signal(priv->service_proxy, - "ApplicationAdded", - G_TYPE_STRING, - G_TYPE_INT, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_INVALID); - dbus_g_proxy_add_signal(priv->service_proxy, - "ApplicationRemoved", - G_TYPE_INT, - G_TYPE_INVALID); - dbus_g_proxy_add_signal(priv->service_proxy, - "ApplicationIconChanged", - G_TYPE_INT, - G_TYPE_STRING, - G_TYPE_INVALID); - - /* Connect to them */ - g_debug("Connect to them."); - dbus_g_proxy_connect_signal(priv->service_proxy, - "ApplicationAdded", - G_CALLBACK(application_added), - application, - NULL /* Disconnection Signal */); - dbus_g_proxy_connect_signal(priv->service_proxy, - "ApplicationRemoved", - G_CALLBACK(application_removed), - application, - NULL /* Disconnection Signal */); - dbus_g_proxy_connect_signal(priv->service_proxy, - "ApplicationIconChanged", - G_CALLBACK(application_icon_changed), - application, - NULL /* Disconnection Signal */); + priv->service_proxy = dbus_g_proxy_new_for_name(priv->bus, + INDICATOR_APPLICATION_DBUS_ADDR, + INDICATOR_APPLICATION_DBUS_OBJ, + INDICATOR_APPLICATION_DBUS_IFACE, + &error); + + /* Set up proxy signals */ + g_debug("Setup proxy signals"); + dbus_g_proxy_add_signal(priv->service_proxy, + "ApplicationAdded", + G_TYPE_STRING, + G_TYPE_INT, + G_TYPE_STRING, + G_TYPE_STRING, + G_TYPE_STRING, + G_TYPE_INVALID); + dbus_g_proxy_add_signal(priv->service_proxy, + "ApplicationRemoved", + G_TYPE_INT, + G_TYPE_INVALID); + dbus_g_proxy_add_signal(priv->service_proxy, + "ApplicationIconChanged", + G_TYPE_INT, + G_TYPE_STRING, + G_TYPE_INVALID); + + /* Connect to them */ + g_debug("Connect to them."); + dbus_g_proxy_connect_signal(priv->service_proxy, + "ApplicationAdded", + G_CALLBACK(application_added), + application, + NULL /* Disconnection Signal */); + dbus_g_proxy_connect_signal(priv->service_proxy, + "ApplicationRemoved", + G_CALLBACK(application_removed), + application, + NULL /* Disconnection Signal */); + dbus_g_proxy_connect_signal(priv->service_proxy, + "ApplicationIconChanged", + G_CALLBACK(application_icon_changed), + application, + NULL /* Disconnection Signal */); + } /* Query it for existing applications */ g_debug("Request current apps"); -- cgit v1.2.3 From 244021467be1258f89feebcaf76570d1175c253d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 6 Feb 2010 11:07:49 -0800 Subject: Setting up the disconnected helpers and structure. --- src/indicator-application.c | 42 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/src/indicator-application.c b/src/indicator-application.c index f6fe314..2276dda 100644 --- a/src/indicator-application.c +++ b/src/indicator-application.c @@ -78,12 +78,14 @@ struct _IndicatorApplicationPrivate { DBusGProxy * service_proxy; GList * applications; GHashTable * theme_dirs; + guint disconnect_kill; }; typedef struct _ApplicationEntry ApplicationEntry; struct _ApplicationEntry { IndicatorObjectEntry entry; gchar * icon_path; + gboolean old_service; }; #define INDICATOR_APPLICATION_GET_PRIVATE(o) \ @@ -98,6 +100,8 @@ static guint get_location (IndicatorObject * io, IndicatorObjectEntry * entry); void connection_changed (IndicatorServiceManager * sm, gboolean connected, IndicatorApplication * application); static void connected (IndicatorApplication * application); static void disconnected (IndicatorApplication * application); +static void disconnected_helper (gpointer data, gpointer user_data); +static gboolean disconnected_kill (gpointer user_data); static void application_added (DBusGProxy * proxy, const gchar * iconname, gint position, const gchar * dbusaddress, const gchar * dbusobject, const gchar * icon_path, IndicatorApplication * application); static void application_removed (DBusGProxy * proxy, gint position , IndicatorApplication * application); static void application_icon_changed (DBusGProxy * proxy, gint position, const gchar * iconname, IndicatorApplication * application); @@ -149,6 +153,7 @@ indicator_application_init (IndicatorApplication *self) priv->bus = NULL; priv->service_proxy = NULL; priv->theme_dirs = NULL; + priv->disconnect_kill = 0; priv->sm = indicator_service_manager_new(INDICATOR_APPLICATION_DBUS_ADDR); g_signal_connect(G_OBJECT(priv->sm), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_changed), self); @@ -165,6 +170,10 @@ indicator_application_dispose (GObject *object) { IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(object); + if (priv->disconnect_kill != 0) { + g_source_remove(priv->disconnect_kill); + } + while (priv->applications != NULL) { application_removed(priv->service_proxy, 0, @@ -246,8 +255,7 @@ connected (IndicatorApplication * application) priv->service_proxy = dbus_g_proxy_new_for_name(priv->bus, INDICATOR_APPLICATION_DBUS_ADDR, INDICATOR_APPLICATION_DBUS_OBJ, - INDICATOR_APPLICATION_DBUS_IFACE, - &error); + INDICATOR_APPLICATION_DBUS_IFACE); /* Set up proxy signals */ g_debug("Setup proxy signals"); @@ -297,14 +305,41 @@ connected (IndicatorApplication * application) return; } +/* Marks every current application as belonging to the old + service so that we can delete it if it doesn't come back. + Also, sets up a timeout on comming back. */ static void disconnected (IndicatorApplication * application) { + IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application); + g_list_foreach(priv->applications, disconnected_helper, NULL); + /* I'll like this to be a little shorter, but it's a bit + inpractical to make it so. This means that the user will + probably notice a visible glitch. Though, if applications + are disappearing there isn't much we can do. */ + priv->disconnect_kill = g_timeout_add(250, disconnected_kill, application); + return; +} - +/* Marks an entry as being from the old service */ +static void +disconnected_helper (gpointer data, gpointer user_data) +{ + return; } +/* Makes sure the old applications that don't come back + get dropped. */ +static gboolean +disconnected_kill (gpointer user_data) +{ + IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(user_data); + priv->disconnect_kill = 0; + + return FALSE; +} + /* Goes through the list of applications that we're maintaining and pulls out the IndicatorObjectEntry and returns that in a list for the caller. */ @@ -348,6 +383,7 @@ application_added (DBusGProxy * proxy, const gchar * iconname, gint position, co IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application); ApplicationEntry * app = g_new(ApplicationEntry, 1); + app->old_service = FALSE; app->icon_path = NULL; if (icon_path != NULL && icon_path[0] != '\0') { app->icon_path = g_strdup(icon_path); -- cgit v1.2.3 From 85b920fe3b8c51bc5b2e3c1bbd7b6e62cd3b471e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 6 Feb 2010 11:17:05 -0800 Subject: Now we're actively killing. --- src/indicator-application.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/indicator-application.c b/src/indicator-application.c index 2276dda..07e6b86 100644 --- a/src/indicator-application.c +++ b/src/indicator-application.c @@ -102,6 +102,7 @@ static void connected (IndicatorApplication * application); static void disconnected (IndicatorApplication * application); static void disconnected_helper (gpointer data, gpointer user_data); static gboolean disconnected_kill (gpointer user_data); +static void disconnected_kill_helper (gpointer data, gpointer user_data); static void application_added (DBusGProxy * proxy, const gchar * iconname, gint position, const gchar * dbusaddress, const gchar * dbusobject, const gchar * icon_path, IndicatorApplication * application); static void application_removed (DBusGProxy * proxy, gint position , IndicatorApplication * application); static void application_icon_changed (DBusGProxy * proxy, gint position, const gchar * iconname, IndicatorApplication * application); @@ -325,7 +326,8 @@ disconnected (IndicatorApplication * application) static void disconnected_helper (gpointer data, gpointer user_data) { - + ApplicationEntry * entry = (ApplicationEntry *)data; + entry->old_service = TRUE; return; } @@ -336,10 +338,23 @@ disconnected_kill (gpointer user_data) { IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(user_data); priv->disconnect_kill = 0; - + g_list_foreach(priv->applications, disconnected_kill_helper, NULL); return FALSE; } +/* Looks for entries that are still associated with the + old service and removes them. */ +static void +disconnected_kill_helper (gpointer data, gpointer user_data) +{ + IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(user_data); + ApplicationEntry * entry = (ApplicationEntry *)data; + if (entry->old_service) { + application_removed(NULL, g_list_index(priv->applications, data), INDICATOR_APPLICATION(user_data)); + } + return; +} + /* Goes through the list of applications that we're maintaining and pulls out the IndicatorObjectEntry and returns that in a list for the caller. */ -- cgit v1.2.3 From aca327039de27681ae3986f79749f8fe7c5ecd73 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 6 Feb 2010 11:27:51 -0800 Subject: Handling if we get duplicate entries added, just recycling. --- src/indicator-application.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/src/indicator-application.c b/src/indicator-application.c index 07e6b86..ce83d17 100644 --- a/src/indicator-application.c +++ b/src/indicator-application.c @@ -86,6 +86,8 @@ struct _ApplicationEntry { IndicatorObjectEntry entry; gchar * icon_path; gboolean old_service; + gchar * dbusobject; + gchar * dbusaddress; }; #define INDICATOR_APPLICATION_GET_PRIVATE(o) \ @@ -388,6 +390,22 @@ get_location (IndicatorObject * io, IndicatorObjectEntry * entry) return g_list_index(priv->applications, entry); } +/* Searching for ApplicationEntries where the dbusobject and + address are the same. */ +static gint +application_added_search (gconstpointer a, gconstpointer b) +{ + ApplicationEntry * appa = (ApplicationEntry *)a; + ApplicationEntry * appb = (ApplicationEntry *)b; + + if (g_strcmp0(appa->dbusaddress, appb->dbusaddress) == 0 && + g_strcmp0(appa->dbusobject, appb->dbusobject) == 0) { + return 0; + } + + return -1; +} + /* Here we respond to new applications by building up the ApplicationEntry and signaling the indicator host that we've got a new indicator. */ @@ -396,6 +414,20 @@ application_added (DBusGProxy * proxy, const gchar * iconname, gint position, co { g_debug("Building new application entry: %s with icon: %s", dbusaddress, iconname); IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application); + + /* First search to see if we already have this entry */ + ApplicationEntry searchapp; + searchapp.dbusaddress = (gchar *)dbusaddress; /* Casting off const, but it's okay, we're not changing it */ + searchapp.dbusobject = (gchar *)dbusobject; /* Casting off const, but it's okay, we're not changing it */ + + GList * searchpointer = g_list_find_custom(priv->applications, &searchapp, application_added_search); + if (searchpointer != NULL) { + g_debug("\t...Already have that one."); + ApplicationEntry * app = (ApplicationEntry *)searchpointer->data; + app->old_service = FALSE; + return; + } + ApplicationEntry * app = g_new(ApplicationEntry, 1); app->old_service = FALSE; @@ -405,6 +437,9 @@ application_added (DBusGProxy * proxy, const gchar * iconname, gint position, co theme_dir_ref(application, icon_path); } + app->dbusaddress = g_strdup(dbusaddress); + app->dbusobject = g_strdup(dbusobject); + /* We make a long name using the suffix, and if that icon is available we want to use it. Otherwise we'll just use the name we were given. */ @@ -452,6 +487,12 @@ application_removed (DBusGProxy * proxy, gint position, IndicatorApplication * a theme_dir_unref(application, app->icon_path); g_free(app->icon_path); } + if (app->dbusaddress != NULL) { + g_free(app->dbusaddress); + } + if (app->dbusobject != NULL) { + g_free(app->dbusobject); + } if (app->entry.image != NULL) { g_object_unref(G_OBJECT(app->entry.image)); } -- cgit v1.2.3 From ffbe6e8e06ac6c0b536cb14f78c9d6c57bfa4786 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 6 Feb 2010 11:43:18 -0800 Subject: Adding check to look for privates gotten on invalid objects. --- src/indicator-application.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/indicator-application.c b/src/indicator-application.c index ce83d17..e84681a 100644 --- a/src/indicator-application.c +++ b/src/indicator-application.c @@ -224,6 +224,7 @@ indicator_application_finalize (GObject *object) void connection_changed (IndicatorServiceManager * sm, gboolean connect, IndicatorApplication * application) { + g_return_if_fail(IS_INDICATOR_APPLICATION(application)); if (connect) { connected(application); } else { @@ -315,7 +316,7 @@ static void disconnected (IndicatorApplication * application) { IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application); - g_list_foreach(priv->applications, disconnected_helper, NULL); + g_list_foreach(priv->applications, disconnected_helper, application); /* I'll like this to be a little shorter, but it's a bit inpractical to make it so. This means that the user will probably notice a visible glitch. Though, if applications @@ -338,9 +339,10 @@ disconnected_helper (gpointer data, gpointer user_data) static gboolean disconnected_kill (gpointer user_data) { + g_return_val_if_fail(IS_INDICATOR_APPLICATION(user_data), FALSE); IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(user_data); priv->disconnect_kill = 0; - g_list_foreach(priv->applications, disconnected_kill_helper, NULL); + g_list_foreach(priv->applications, disconnected_kill_helper, user_data); return FALSE; } @@ -349,6 +351,7 @@ disconnected_kill (gpointer user_data) static void disconnected_kill_helper (gpointer data, gpointer user_data) { + g_return_if_fail(IS_INDICATOR_APPLICATION(user_data)); IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(user_data); ApplicationEntry * entry = (ApplicationEntry *)data; if (entry->old_service) { @@ -412,6 +415,7 @@ application_added_search (gconstpointer a, gconstpointer b) static void application_added (DBusGProxy * proxy, const gchar * iconname, gint position, const gchar * dbusaddress, const gchar * dbusobject, const gchar * icon_path, IndicatorApplication * application) { + g_return_if_fail(IS_INDICATOR_APPLICATION(application)); g_debug("Building new application entry: %s with icon: %s", dbusaddress, iconname); IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application); @@ -472,6 +476,7 @@ application_added (DBusGProxy * proxy, const gchar * iconname, gint position, co static void application_removed (DBusGProxy * proxy, gint position, IndicatorApplication * application) { + g_return_if_fail(IS_INDICATOR_APPLICATION(application)); IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application); ApplicationEntry * app = (ApplicationEntry *)g_list_nth_data(priv->applications, position); -- cgit v1.2.3 From b3be1723c755a0f1a972bf5f6200a3acbe0b03e5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 6 Feb 2010 11:47:09 -0800 Subject: Boolean again! --- src/indicator-application.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/indicator-application.c b/src/indicator-application.c index e84681a..8d9ae37 100644 --- a/src/indicator-application.c +++ b/src/indicator-application.c @@ -254,7 +254,7 @@ connected (IndicatorApplication * application) } } - if (priv->service_proxy) { + if (priv->service_proxy == NULL) { /* Build the service proxy */ priv->service_proxy = dbus_g_proxy_new_for_name(priv->bus, INDICATOR_APPLICATION_DBUS_ADDR, -- cgit v1.2.3 From 08f04e0260f602442bf7bae6ad113c8f53b8dd96 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Feb 2010 09:30:27 -0600 Subject: releasing version 0.0.11-0ubuntu1~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8561669..908da40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -indicator-application (0.0.11-0ubuntu1~ppa2) UNRELEASED; urgency=low +indicator-application (0.0.11-0ubuntu1~ppa2) lucid; urgency=low * Upstream Merge * Fixing copying of the attention icon * Adding status changing to the example application * Adding a test for status changing getting sent over DBus. - -- Ted Gould Mon, 08 Feb 2010 09:20:56 -0600 + -- Ted Gould Mon, 08 Feb 2010 09:30:24 -0600 indicator-application (0.0.11-0ubuntu1~ppa1) lucid; urgency=low -- cgit v1.2.3 From c21b71ae4bfee0b9c7236f1707184a065b85bf75 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Feb 2010 09:35:16 -0600 Subject: releasing version 0.0.11-0ubuntu1~ppa3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ea7f9b9..7d303d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-application (0.0.11-0ubuntu1~ppa3) UNRELEASED; urgency=low +indicator-application (0.0.11-0ubuntu1~ppa3) lucid; urgency=low * Upstream Merge * Handling the service restarting better by removing the icons @@ -6,7 +6,7 @@ indicator-application (0.0.11-0ubuntu1~ppa3) UNRELEASED; urgency=low * Fixing a crash where a proxy was created while the previous one was being destroyed. - -- Ted Gould Mon, 08 Feb 2010 09:32:07 -0600 + -- Ted Gould Mon, 08 Feb 2010 09:35:14 -0600 indicator-application (0.0.11-0ubuntu1~ppa2) lucid; urgency=low -- cgit v1.2.3 From fb4952bf2d8884ba4ce84db885afb2dc37f653d9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Feb 2010 09:51:25 -0600 Subject: 0.0.12 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 07bff83..152b91b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(indicator-application, 0.0.11, ted@canonical.com) +AC_INIT(indicator-application, 0.0.12, ted@canonical.com) AC_COPYRIGHT([Copyright 2009, 2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-application, 0.0.11) +AM_INIT_AUTOMAKE(indicator-application, 0.0.12) AM_MAINTAINER_MODE -- cgit v1.2.3 From b881da97404a6e1dbecbfb112d2cb1c7f436ab20 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Feb 2010 10:01:46 -0600 Subject: releasing version 0.0.12-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index adbf414..35580c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-application (0.0.12-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-application (0.0.12-0ubuntu1~ppa1) lucid; urgency=low * Upstream release 0.0.12 * Handling the service restarting better by removing the icons @@ -9,7 +9,7 @@ indicator-application (0.0.12-0ubuntu1~ppa1) UNRELEASED; urgency=low * Adding status changing to the example application * Adding a test for status changing getting sent over DBus. - -- Ted Gould Mon, 08 Feb 2010 09:56:35 -0600 + -- Ted Gould Mon, 08 Feb 2010 10:01:42 -0600 indicator-application (0.0.11-0ubuntu1) lucid; urgency=low -- cgit v1.2.3