From 6eab8445ea83c4815246f2e6648acda69ea97154 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 4 Dec 2020 10:32:25 +0100 Subject: configure.ac: Drop superfluous square bracket (typo fix). --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1fc0608..8b9e89f 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ AM_INIT_AUTOMAKE([1.11 -Wall tar-pax]) AM_MAINTAINER_MODE([enable]) -AM_SILENT_RULES([yes])] +AM_SILENT_RULES([yes]) # Check for programs AC_PROG_CC -- cgit v1.2.3 From cbf345ed716695b60097689c287536a76d0897f4 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 4 Dec 2020 10:28:55 +0100 Subject: libayatana-indicator/indicator-ng.c: Only run gtk_box_set_spacing() if object to operate on is a GTK_BOX. --- libayatana-indicator/indicator-ng.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libayatana-indicator/indicator-ng.c b/libayatana-indicator/indicator-ng.c index bd2176e..f4db2e6 100644 --- a/libayatana-indicator/indicator-ng.c +++ b/libayatana-indicator/indicator-ng.c @@ -547,7 +547,10 @@ static void indicator_ng_set_label(IndicatorNg *self, const gchar *label) gtk_css_provider_load_from_data(pCssProvider, sCss, -1, NULL); g_free(sCss); g_object_unref(pCssProvider); - gtk_box_set_spacing(GTK_BOX(pParent), nSpacing); + if (GTK_IS_BOX(pParent)) + { + gtk_box_set_spacing(GTK_BOX(pParent), nSpacing); + } gtk_label_set_label(GTK_LABEL (self->entry.label), sLabel); if (label) -- cgit v1.2.3 From fb1450e9af3f5c1221248fdabacc899988545238 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 4 Dec 2020 10:29:39 +0100 Subject: tests/Makefile.am: Wrap test-indicator-ng around Xvfb and dbus-runner. --- tests/Makefile.am | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 3d7ea3b..87430f6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -499,8 +499,20 @@ test_indicator_ng_LDADD = \ -L$(top_builddir)/libayatana-indicator/.libs \ $(INDICATOR_LIB) -TESTS += test-indicator-ng -DISTCLEANFILES += test-indicator-ng + +test-indicator-ng-dbus-runner: test-indicator-ng Makefile.am + @echo "#!/bin/sh" > $@ + @echo $(DBUS_RUNNER) --task ./test-indicator-ng >> $@ + @chmod +x $@ + +test-indicator-ng-tester: test-indicator-ng-dbus-runner Makefile.am + @echo "#!/bin/bash" > $@ + @echo $(XVFB_RUN) >> $@ + @echo gtester -k --verbose -o=$(XML_REPORT) ./test-indicator-ng-dbus-runner >> $@ + @chmod +x $@ + +TESTS += test-indicator-ng-tester +DISTCLEANFILES += test-indicator-ng-tester test-indicator-ng-dbus-runner test-indicator-ng # Mock indicator service check_PROGRAMS += indicator-test-service -- cgit v1.2.3