aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/80indicator-debugging3
-rw-r--r--tools/Makefile.am2
-rw-r--r--tools/indicator-loader.c10
3 files changed, 12 insertions, 3 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/Makefile.am b/tools/Makefile.am
index 287d34f..cefd944 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -34,7 +34,7 @@ indicator_loader3_SOURCES = $(indicator_loader_SOURCES)
indicator_loader3_CFLAGS = $(indicator_loader_CFLAGS)
indicator_loader3_LDADD = $(indicator_loader_LDADD)
-xsessiondir = $(sysconfdir)/X11/Xsession.d
+xsessiondir = $(pkgdatadir)
xsession_DATA = 80indicator-debugging
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;
}