aboutsummaryrefslogtreecommitdiff
path: root/tools/indicator-loader.c
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-07-12 10:54:18 -0500
committerTed Gould <ted@gould.cx>2011-07-12 10:54:18 -0500
commit3d6738fd9d121eb66fcaa1fd57f78dd9b4db378b (patch)
tree8bebcbd55e330d2a0e0fb75864939dbaa5d90d08 /tools/indicator-loader.c
parent8b9fa1810e3eece7da088e8246d182d7cadab495 (diff)
parent0c3a68569683c34c08ae9bf8183bcd360c175fb7 (diff)
downloadlibayatana-indicator-3d6738fd9d121eb66fcaa1fd57f78dd9b4db378b.tar.gz
libayatana-indicator-3d6738fd9d121eb66fcaa1fd57f78dd9b4db378b.tar.bz2
libayatana-indicator-3d6738fd9d121eb66fcaa1fd57f78dd9b4db378b.zip
* Upstream Merge
* Fix signals with NULL entries in the loader * Adding a comment for setting up debugging options * Adding annotations for GIR files
Diffstat (limited to 'tools/indicator-loader.c')
-rw-r--r--tools/indicator-loader.c10
1 files changed, 8 insertions, 2 deletions
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;
}