diff options
| author | Ted Gould <ted@gould.cx> | 2011-07-14 13:33:11 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-07-14 13:33:11 -0500 |
| commit | 6032a847e527d10641396268dfe4d0db176d3b56 (patch) | |
| tree | 62d2efca4b4ce17c6dd57e38a6822f5d71bb2e87 /tools | |
| parent | c1034173faf54120c693c984123f343968621359 (diff) | |
| parent | c6d763c2fa431fefd0869d381b15c25364e8972f (diff) | |
| download | libayatana-indicator-6032a847e527d10641396268dfe4d0db176d3b56.tar.gz libayatana-indicator-6032a847e527d10641396268dfe4d0db176d3b56.tar.bz2 libayatana-indicator-6032a847e527d10641396268dfe4d0db176d3b56.zip | |
Import upstream version 0.3.91
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/80indicator-debugging | 3 | ||||
| -rw-r--r-- | tools/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/Makefile.in | 2 | ||||
| -rw-r--r-- | tools/indicator-loader.c | 14 |
4 files changed, 17 insertions, 4 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/Makefile.in b/tools/Makefile.in index e01a0d4..0d46485 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -281,7 +281,7 @@ indicator_loader_LDADD = \ 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 EXTRA_DIST = $(xsession_DATA) all: all-am diff --git a/tools/indicator-loader.c b/tools/indicator-loader.c index 0cdf1ff..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; @@ -44,7 +46,11 @@ entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_d g_debug("Signal: Entry Added"); GtkWidget * menuitem = gtk_menu_item_new(); +#if GTK_CHECK_VERSION(3,0,0) GtkWidget * hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3); +#else + GtkWidget * hbox = gtk_hbox_new(FALSE, 3); +#endif if (entry->image != NULL) { gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(entry->image), FALSE, FALSE, 0); @@ -95,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; } |