diff options
author | Ken VanDine <ken.vandine@canonical.com> | 2011-07-15 09:00:15 -0400 |
---|---|---|
committer | Ken VanDine <ken.vandine@canonical.com> | 2011-07-15 09:00:15 -0400 |
commit | 2801a022058b7ea507972a4227b5ba4433f06843 (patch) | |
tree | 5cd2eef07f21b5d86ad37b25f86d820672e81367 /tools | |
parent | b414e0f54fb79b8131f13eb30a7d4e3e33c60472 (diff) | |
parent | 8641c27434f27843185299a6c76e70f2e87ff5d9 (diff) | |
download | libayatana-indicator-2801a022058b7ea507972a4227b5ba4433f06843.tar.gz libayatana-indicator-2801a022058b7ea507972a4227b5ba4433f06843.tar.bz2 libayatana-indicator-2801a022058b7ea507972a4227b5ba4433f06843.zip |
* New upstream release.
* Fix signals with NULL entries in the loader
* Adding a comment for setting up debugging options
* Adding annotations for GIR files
* Fixing watchers hashtable to detect when we have none
* Fix testing so no tests are XFAIL anymore
* Adding a replace mode for testing indicator services
* Watching new services when the name switches
Diffstat (limited to 'tools')
-rw-r--r-- | tools/80indicator-debugging | 3 | ||||
-rw-r--r-- | tools/indicator-loader.c | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/tools/80indicator-debugging b/tools/80indicator-debugging index f21559c..85d0a35 100644 --- a/tools/80indicator-debugging +++ b/tools/80indicator-debugging @@ -4,6 +4,9 @@ # make debugging difficult and are not recommended for # daily use. Development use only! +# To use: either copy or symbolicly link this file to the +# Xsession dictory. Specifically: /etc/X11/Xsession.d + # Timeout after 1 minute export INDICATOR_SERVICE_SHUTDOWN_TIMEOUT=60000 diff --git a/tools/indicator-loader.c b/tools/indicator-loader.c index 027d364..06dd4b4 100644 --- a/tools/indicator-loader.c +++ b/tools/indicator-loader.c @@ -32,7 +32,9 @@ activate_entry (GtkWidget * widget, gpointer user_data) { g_return_if_fail(INDICATOR_IS_OBJECT(user_data)); gpointer entry = g_object_get_data(G_OBJECT(widget), ENTRY_DATA_NAME); - g_return_if_fail(entry == NULL); + if (entry == NULL) { + g_debug("Activation on: (null)"); + } indicator_object_entry_activate(INDICATOR_OBJECT(user_data), (IndicatorObjectEntry *)entry, gtk_get_current_event_time()); return; @@ -99,7 +101,11 @@ entry_removed (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user static void menu_show (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp, gpointer user_data) { - g_debug("Show Menu: %s", entry->label != NULL ? gtk_label_get_text(entry->label) : "No Label"); + if (entry != NULL) { + g_debug("Show Menu: %s", entry->label != NULL ? gtk_label_get_text(entry->label) : "No Label"); + } else { + g_debug("Show Menu: (null)"); + } return; } |