From dedf43d1fcdf9c40643d581592728cf56e063e3d Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 7 Jul 2011 10:09:23 -0400 Subject: Changed to help message for --with-gtk to reflect the new default --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1188b04..bc11ce3 100644 --- a/configure.ac +++ b/configure.ac @@ -47,7 +47,7 @@ GIO_UNIX_REQUIRED_VERSION=2.22 AC_ARG_WITH([gtk], [AS_HELP_STRING([--with-gtk], - [Which version of gtk to use @<:@default=2@:>@])], + [Which version of gtk to use @<:@default=3@:>@])], [], [with_gtk=3]) AS_IF([test "x$with_gtk" = x3], -- cgit v1.2.3 From d23b4e89cdc6f95ff8e14d8a9fcb89ce2d8682d5 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 7 Jul 2011 10:38:35 -0400 Subject: Make xsessiondir = $(pkgdatadir) --- tools/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From 801419bd8a07b7870fc7dcaa5b154c5d2c028c98 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Fri, 8 Jul 2011 10:39:59 +1000 Subject: Annotate the return value of indicator_object_get_entries so that the type in the list is known, also fix typo in docstring --- libindicator/indicator-object.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index 2fe8dd1..a563ebe 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -447,15 +447,15 @@ get_entries_default (IndicatorObject * io) } /** - indicator_object_get_entires: + indicator_object_get_entries: @io: #IndicatorObject to query This function looks on the class for the object and calls it's #IndicatorObjectClass::get_entries function. The list should be owned by the caller, but the individual - enteries should not be. + entries should not be. - Return value: A list if #IndicatorObjectEntry structures or + Return value: (element-type IndicatorObjectEntry) (transfer container): A list if #IndicatorObjectEntry structures or NULL if there is an error. */ GList * -- cgit v1.2.3 From ee271867c1390ff9438158a3b88387432cd24f37 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 11 Jul 2011 16:00:12 -0500 Subject: Handle NULL entries without crashing --- tools/indicator-loader.c | 10 ++++++++-- 1 file 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; } -- cgit v1.2.3 From 0c3a68569683c34c08ae9bf8183bcd360c175fb7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 11 Jul 2011 16:06:10 -0500 Subject: Add the PC file instead of replace it --- libindicator/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index 4433655..f9fb011 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -22,7 +22,7 @@ INDICATOR_API_VERSION = 4 -e "s|\@indicator_abi_version\@|$(INDICATOR_ABI_VERSION)|" \ $< > $@ -CLEANFILES = indicator$(VER)-0.$(INDICATOR_API_VERSION).pc +CLEANFILES += indicator$(VER)-0.$(INDICATOR_API_VERSION).pc include $(top_srcdir)/Makefile.am.marshal -- cgit v1.2.3