diff options
| author | Ted Gould <ted@gould.cx> | 2009-11-24 16:40:47 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2009-11-24 16:40:47 -0600 |
| commit | acbab334ce6b9cef6d80c94d29aac7fb35534b4d (patch) | |
| tree | cd5cbf08a4b4a6acd7c4d6b31d91f36ce805e996 | |
| parent | 4b23fc39d2fed996dd651d101dc1fb0a5b76d8f0 (diff) | |
| parent | f23c54ff5fee5587c31ecb8bf176b58fa3d4be1d (diff) | |
| download | libayatana-appindicator-acbab334ce6b9cef6d80c94d29aac7fb35534b4d.tar.gz libayatana-appindicator-acbab334ce6b9cef6d80c94d29aac7fb35534b4d.tar.bz2 libayatana-appindicator-acbab334ce6b9cef6d80c94d29aac7fb35534b4d.zip | |
Merging in changes on trunk. Resolving a conflict.
| -rw-r--r-- | .bzrignore | 1 | ||||
| -rw-r--r-- | src/libcustomindicator/custom-indicator.c | 5 | ||||
| -rw-r--r-- | tests/Makefile.am | 15 |
3 files changed, 11 insertions, 10 deletions
@@ -36,3 +36,4 @@ example/.deps example/.libs example/simple-client src/libcustom_la-custom-service-marshal.lo +tests/libcustomindicator-tests-gtester diff --git a/src/libcustomindicator/custom-indicator.c b/src/libcustomindicator/custom-indicator.c index b2d1384..6ade629 100644 --- a/src/libcustomindicator/custom-indicator.c +++ b/src/libcustomindicator/custom-indicator.c @@ -261,7 +261,6 @@ static void custom_indicator_init (CustomIndicator *self) { CustomIndicatorPrivate * priv = CUSTOM_INDICATOR_GET_PRIVATE(self); - g_return_if_fail(priv != NULL); priv->id = NULL; priv->category = CUSTOM_INDICATOR_CATEGORY_OTHER; @@ -311,7 +310,6 @@ custom_indicator_dispose (GObject *object) g_return_if_fail(self != NULL); CustomIndicatorPrivate * priv = CUSTOM_INDICATOR_GET_PRIVATE(self); - g_return_if_fail(priv != NULL); if (priv->status != CUSTOM_INDICATOR_STATUS_PASSIVE) { custom_indicator_set_status(self, CUSTOM_INDICATOR_STATUS_PASSIVE); @@ -342,7 +340,6 @@ custom_indicator_finalize (GObject *object) g_return_if_fail(self != NULL); CustomIndicatorPrivate * priv = CUSTOM_INDICATOR_GET_PRIVATE(self); - g_return_if_fail(priv != NULL); if (priv->status != CUSTOM_INDICATOR_STATUS_PASSIVE) { g_warning("Finalizing Custom Status with the status set to: %d", priv->status); @@ -377,7 +374,6 @@ custom_indicator_set_property (GObject * object, guint prop_id, const GValue * v g_return_if_fail(self != NULL); CustomIndicatorPrivate * priv = CUSTOM_INDICATOR_GET_PRIVATE(self); - g_return_if_fail(priv != NULL); switch (prop_id) { /* *********************** */ @@ -495,7 +491,6 @@ custom_indicator_get_property (GObject * object, guint prop_id, GValue * value, g_return_if_fail(self != NULL); CustomIndicatorPrivate * priv = CUSTOM_INDICATOR_GET_PRIVATE(self); - g_return_if_fail(priv != NULL); switch (prop_id) { /* *********************** */ diff --git a/tests/Makefile.am b/tests/Makefile.am index 39cd3a6..0b771db 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -65,13 +65,18 @@ test_libcustomindicator_dbus_server_LDADD = \ XML_REPORT = libcustomindicator-check-results.xml HTML_REPORT = libcustomindicator-check-results.html -libcustomindicator-tests: test-libcustomindicator - @echo "#!/bin/sh" > libcustomindicator-tests - @echo gtester -k --verbose -o=$(XML_REPORT) ./test-libcustomindicator >> libcustomindicator-tests - @chmod +x libcustomindicator-tests +libcustomindicator-tests: libcustomindicator-tests-gtester Makefile.am + @echo "#!/bin/sh" > $@ + @echo $(DBUS_RUNNER) --task ./libcustomindicator-tests-gtester >> $@ + @chmod +x $@ + +libcustomindicator-tests-gtester: test-libcustomindicator Makefile.am + @echo "#!/bin/sh" > $@ + @echo gtester -k --verbose -o=$(XML_REPORT) ./test-libcustomindicator >> $@ + @chmod +x $@ TESTS += libcustomindicator-tests -DISTCLEANFILES += $(XML_REPORT) $(HTML_REPORT) +DISTCLEANFILES += $(XML_REPORT) $(HTML_REPORT) libcustomindicator-tests-gtester DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf |