From 9d1b39fa6a02985a613604826997f0d7b969a40d Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 6 Nov 2015 14:46:09 +0000 Subject: Fork libayatana-indicator from Ubuntu's libindicator shared library. --- tests/Makefile.am | 62 +++++++++++++-------------- tests/com.canonical.indicator.no-such-service | 3 -- tests/com.canonical.indicator.test | 6 --- tests/com.canonical.indicator.test.service.in | 3 -- tests/dummy-indicator-blank.c | 2 +- tests/dummy-indicator-entry-func.h | 4 +- tests/dummy-indicator-null.c | 4 +- tests/dummy-indicator-signaler.c | 4 +- tests/dummy-indicator-simple.c | 4 +- tests/dummy-indicator-visible.c | 4 +- tests/indicator-test-service.c | 8 ++-- tests/org.ayatana.indicator.no-such-service | 3 ++ tests/org.ayatana.indicator.test | 6 +++ tests/org.ayatana.indicator.test.service.in | 3 ++ tests/test-indicator-ng.c | 12 +++--- tests/test-loader.c | 2 +- 16 files changed, 65 insertions(+), 65 deletions(-) delete mode 100644 tests/com.canonical.indicator.no-such-service delete mode 100644 tests/com.canonical.indicator.test delete mode 100644 tests/com.canonical.indicator.test.service.in create mode 100644 tests/org.ayatana.indicator.no-such-service create mode 100644 tests/org.ayatana.indicator.test create mode 100644 tests/org.ayatana.indicator.test.service.in (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index 96825f3..93fcd14 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,7 +1,7 @@ if USE_GTK3 -INDICATOR_LIB = -lindicator3 +INDICATOR_LIB = -layatana-indicator3 else -INDICATOR_LIB = -lindicator +INDICATOR_LIB = -layatana-indicator endif TESTS = @@ -27,7 +27,7 @@ EXTRA_DIST = \ service-manager-connect.service.in \ service-version-bad.service.in \ service-version-good.service.in \ - com.canonical.indicator.test.service.in + org.ayatana.indicator.test.service.in ############################# # Test Loader @@ -45,7 +45,7 @@ test_loader_CFLAGS = \ test_loader_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libindicator/.libs \ + -L$(top_builddir)/libayatana-indicator/.libs \ $(INDICATOR_LIB) ############################# @@ -65,7 +65,7 @@ test_desktop_shortcuts_CFLAGS = \ test_desktop_shortcuts_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libindicator/.libs \ + -L$(top_builddir)/libayatana-indicator/.libs \ $(INDICATOR_LIB) DS_XML_REPORT = desktop-shortcuts-check-results.xml @@ -97,7 +97,7 @@ libdummy_indicator_blank_la_CFLAGS = \ libdummy_indicator_blank_la_LIBADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libindicator/.libs \ + -L$(top_builddir)/libayatana-indicator/.libs \ $(INDICATOR_LIB) libdummy_indicator_blank_la_LDFLAGS = \ @@ -117,7 +117,7 @@ libdummy_indicator_null_la_CFLAGS = \ libdummy_indicator_null_la_LIBADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libindicator/.libs \ + -L$(top_builddir)/libayatana-indicator/.libs \ $(INDICATOR_LIB) libdummy_indicator_null_la_LDFLAGS = \ @@ -137,7 +137,7 @@ libdummy_indicator_signaler_la_CFLAGS = \ libdummy_indicator_signaler_la_LIBADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libindicator/.libs \ + -L$(top_builddir)/libayatana-indicator/.libs \ $(INDICATOR_LIB) libdummy_indicator_signaler_la_LDFLAGS = \ @@ -157,7 +157,7 @@ libdummy_indicator_simple_la_CFLAGS = \ libdummy_indicator_simple_la_LIBADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libindicator/.libs \ + -L$(top_builddir)/libayatana-indicator/.libs \ $(INDICATOR_LIB) libdummy_indicator_simple_la_LDFLAGS = \ @@ -178,7 +178,7 @@ libdummy_indicator_entry_func_la_CFLAGS = \ libdummy_indicator_entry_func_la_LIBADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libindicator/.libs \ + -L$(top_builddir)/libayatana-indicator/.libs \ $(INDICATOR_LIB) libdummy_indicator_entry_func_la_LDFLAGS = \ @@ -198,7 +198,7 @@ libdummy_indicator_visible_la_CFLAGS = \ libdummy_indicator_visible_la_LIBADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libindicator/.libs \ + -L$(top_builddir)/libayatana-indicator/.libs \ $(INDICATOR_LIB) libdummy_indicator_visible_la_LDFLAGS = \ @@ -220,7 +220,7 @@ service_shutdown_timeout_CFLAGS = \ service_shutdown_timeout_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libindicator/.libs \ + -L$(top_builddir)/libayatana-indicator/.libs \ $(INDICATOR_LIB) service-shutdown-timeout-tester: service-shutdown-timeout Makefile @@ -246,7 +246,7 @@ service_manager_no_connect_CFLAGS = \ service_manager_no_connect_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libindicator/.libs \ + -L$(top_builddir)/libayatana-indicator/.libs \ $(INDICATOR_LIB) service-manager-no-connect-tester: service-manager-no-connect Makefile.am @@ -262,10 +262,10 @@ DISTCLEANFILES += service-manager-no-connect-tester ############################# session.conf: $(srcdir)/session.conf.in Makefile.am - sed -e "s|\@servicedir\@|$(abspath $(builddir))|" $< > $@ + sed -e "s|\@servicedir\@|$(abs_builddir)|" $< > $@ service-manager-connect.service: $(srcdir)/service-manager-connect.service.in Makefile.am - sed -e "s|\@builddir\@|$(abspath $(builddir))|" $< > $@ + sed -e "s|\@builddir\@|$(abs_builddir)|" $< > $@ check_PROGRAMS += service-manager-connect @@ -278,7 +278,7 @@ service_manager_connect_CFLAGS = \ service_manager_connect_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libindicator/.libs \ + -L$(top_builddir)/libayatana-indicator/.libs \ $(INDICATOR_LIB) check_PROGRAMS += service-manager-connect-service @@ -292,7 +292,7 @@ service_manager_connect_service_CFLAGS = \ service_manager_connect_service_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libindicator/.libs \ + -L$(top_builddir)/libayatana-indicator/.libs \ $(INDICATOR_LIB) service-manager-connect-tester: service-manager-connect service-manager-connect-service session.conf service-manager-connect.service Makefile.am @@ -308,10 +308,10 @@ DISTCLEANFILES += service-manager-connect-tester session.conf service-manager-co ############################# service-version-good.service: $(srcdir)/service-version-good.service.in Makefile.am - sed -e "s|\@builddir\@|$(abspath $(builddir))|" $< > $@ + sed -e "s|\@builddir\@|$(abs_builddir)|" $< > $@ service-version-bad.service: $(srcdir)/service-version-bad.service.in Makefile.am - sed -e "s|\@builddir\@|$(abspath $(builddir))|" $< > $@ + sed -e "s|\@builddir\@|$(abs_builddir)|" $< > $@ check_PROGRAMS += service-version-manager @@ -325,7 +325,7 @@ service_version_manager_CFLAGS = \ service_version_manager_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libindicator/.libs \ + -L$(top_builddir)/libayatana-indicator/.libs \ $(INDICATOR_LIB) check_PROGRAMS += service-version-bad-service @@ -340,7 +340,7 @@ service_version_bad_service_CFLAGS = \ service_version_bad_service_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libindicator/.libs \ + -L$(top_builddir)/libayatana-indicator/.libs \ $(INDICATOR_LIB) check_PROGRAMS += service-version-good-service @@ -355,7 +355,7 @@ service_version_good_service_CFLAGS = \ service_version_good_service_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libindicator/.libs \ + -L$(top_builddir)/libayatana-indicator/.libs \ $(INDICATOR_LIB) service-version-tester: service-version-manager service-version-bad-service service-version-good-service session.conf service-version-bad.service service-version-good.service Makefile.am @@ -382,7 +382,7 @@ service_version_multiwatch_manager_CFLAGS = \ service_version_multiwatch_manager_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libindicator/.libs \ + -L$(top_builddir)/libayatana-indicator/.libs \ $(INDICATOR_LIB) check_PROGRAMS += service-version-multiwatch-manager-impolite @@ -397,7 +397,7 @@ service_version_multiwatch_manager_impolite_CFLAGS = \ service_version_multiwatch_manager_impolite_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libindicator/.libs \ + -L$(top_builddir)/libayatana-indicator/.libs \ $(INDICATOR_LIB) check_PROGRAMS += service-version-multiwatch-service @@ -412,7 +412,7 @@ service_version_multiwatch_service_CFLAGS = \ service_version_multiwatch_service_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libindicator/.libs \ + -L$(top_builddir)/libayatana-indicator/.libs \ $(INDICATOR_LIB) service-version-multiwatch-tester: service-version-multiwatch-manager service-version-multiwatch-service service-version-multiwatch-manager-impolite Makefile.am @@ -438,7 +438,7 @@ service_manager_nostart_connect_CFLAGS = \ service_manager_nostart_connect_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libindicator/.libs \ + -L$(top_builddir)/libayatana-indicator/.libs \ $(INDICATOR_LIB) service-manager-connect-nostart-tester: service-manager-nostart-connect service-manager-connect-service Makefile.am @@ -473,8 +473,8 @@ DISTCLEANFILES += $(XML_REPORT) $(HTML_REPORT) if USE_GTK3 -com.canonical.indicator.test.service: com.canonical.indicator.test.service.in Makefile.am - sed -e "s|\@builddir\@|$(abspath $(builddir))|" $< > $@ +org.ayatana.indicator.test.service: org.ayatana.indicator.test.service.in Makefile.am + sed -e "s|\@builddir\@|$(abs_builddir)|" $< > $@ check_PROGRAMS += test-indicator-ng @@ -489,7 +489,7 @@ test_indicator_ng_CFLAGS = \ test_indicator_ng_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libindicator/.libs \ + -L$(top_builddir)/libayatana-indicator/.libs \ $(INDICATOR_LIB) TESTS += test-indicator-ng @@ -502,8 +502,8 @@ indicator_test_service_SOURCES = indicator-test-service.c indicator_test_service_CFLAGS = $(LIBINDICATOR_CFLAGS) indicator_test_service_LDADD = $(LIBINDICATOR_LIBS) -EXTRA_indicator_test_service_DEPENDENCIES = com.canonical.indicator.test.service +EXTRA_indicator_test_service_DEPENDENCIES = org.ayatana.indicator.test.service -DISTCLEANFILES += indicator-test-service com.canonical.indicator.test.service +DISTCLEANFILES += indicator-test-service org.ayatana.indicator.test.service endif diff --git a/tests/com.canonical.indicator.no-such-service b/tests/com.canonical.indicator.no-such-service deleted file mode 100644 index 54cc4fd..0000000 --- a/tests/com.canonical.indicator.no-such-service +++ /dev/null @@ -1,3 +0,0 @@ -[Indicator Service] -Name=indicator-test -ObjectPath=/com/canonical/indicator/test diff --git a/tests/com.canonical.indicator.test b/tests/com.canonical.indicator.test deleted file mode 100644 index 0c7122f..0000000 --- a/tests/com.canonical.indicator.test +++ /dev/null @@ -1,6 +0,0 @@ -[Indicator Service] -Name=indicator-test -ObjectPath=/com/canonical/indicator/test - -[desktop] -ObjectPath=/com/canonical/indicator/test/desktop diff --git a/tests/com.canonical.indicator.test.service.in b/tests/com.canonical.indicator.test.service.in deleted file mode 100644 index 3fdbe76..0000000 --- a/tests/com.canonical.indicator.test.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=com.canonical.indicator.test -Exec=@builddir@/indicator-test-service diff --git a/tests/dummy-indicator-blank.c b/tests/dummy-indicator-blank.c index 874284b..dcbb99f 100644 --- a/tests/dummy-indicator-blank.c +++ b/tests/dummy-indicator-blank.c @@ -21,7 +21,7 @@ License along with this library. If not, see */ -#include "libindicator/indicator.h" +#include "libayatana-indicator/indicator.h" INDICATOR_SET_VERSION diff --git a/tests/dummy-indicator-entry-func.h b/tests/dummy-indicator-entry-func.h index f5c8264..c1fa8d3 100644 --- a/tests/dummy-indicator-entry-func.h +++ b/tests/dummy-indicator-entry-func.h @@ -26,8 +26,8 @@ License along with this library. If not, see #include #include -#include "libindicator/indicator.h" -#include "libindicator/indicator-object.h" +#include "libayatana-indicator/indicator.h" +#include "libayatana-indicator/indicator-object.h" G_BEGIN_DECLS diff --git a/tests/dummy-indicator-null.c b/tests/dummy-indicator-null.c index 8aec668..5eb8716 100644 --- a/tests/dummy-indicator-null.c +++ b/tests/dummy-indicator-null.c @@ -24,8 +24,8 @@ License along with this library. If not, see #include #include -#include "libindicator/indicator.h" -#include "libindicator/indicator-object.h" +#include "libayatana-indicator/indicator.h" +#include "libayatana-indicator/indicator-object.h" #define DUMMY_INDICATOR_NULL_TYPE (dummy_indicator_null_get_type ()) #define DUMMY_INDICATOR_NULL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DUMMY_INDICATOR_NULL_TYPE, DummyIndicatorNull)) diff --git a/tests/dummy-indicator-signaler.c b/tests/dummy-indicator-signaler.c index a4206d0..f73f35e 100644 --- a/tests/dummy-indicator-signaler.c +++ b/tests/dummy-indicator-signaler.c @@ -23,8 +23,8 @@ License along with this library. If not, see #include #include -#include "libindicator/indicator.h" -#include "libindicator/indicator-object.h" +#include "libayatana-indicator/indicator.h" +#include "libayatana-indicator/indicator-object.h" #define DUMMY_INDICATOR_SIGNALER_TYPE (dummy_indicator_signaler_get_type ()) #define DUMMY_INDICATOR_SIGNALER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DUMMY_INDICATOR_SIGNALER_TYPE, DummyIndicatorSignaler)) diff --git a/tests/dummy-indicator-simple.c b/tests/dummy-indicator-simple.c index 1aab711..69a9c1d 100644 --- a/tests/dummy-indicator-simple.c +++ b/tests/dummy-indicator-simple.c @@ -23,8 +23,8 @@ License along with this library. If not, see #include #include -#include "libindicator/indicator.h" -#include "libindicator/indicator-object.h" +#include "libayatana-indicator/indicator.h" +#include "libayatana-indicator/indicator-object.h" #define DUMMY_INDICATOR_SIMPLE_TYPE (dummy_indicator_simple_get_type ()) #define DUMMY_INDICATOR_SIMPLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DUMMY_INDICATOR_SIMPLE_TYPE, DummyIndicatorSimple)) diff --git a/tests/dummy-indicator-visible.c b/tests/dummy-indicator-visible.c index 42cb59c..05bc9ad 100644 --- a/tests/dummy-indicator-visible.c +++ b/tests/dummy-indicator-visible.c @@ -23,8 +23,8 @@ License along with this library. If not, see #include #include -#include "libindicator/indicator.h" -#include "libindicator/indicator-object.h" +#include "libayatana-indicator/indicator.h" +#include "libayatana-indicator/indicator-object.h" #define DUMMY_INDICATOR_VISIBLE_TYPE (dummy_indicator_visible_get_type ()) #define DUMMY_INDICATOR_VISIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DUMMY_INDICATOR_VISIBLE_TYPE, DummyIndicatorVisible)) diff --git a/tests/indicator-test-service.c b/tests/indicator-test-service.c index a40945f..2aa973e 100644 --- a/tests/indicator-test-service.c +++ b/tests/indicator-test-service.c @@ -19,7 +19,7 @@ bus_acquired (GDBusConnection *connection, GError *error = NULL; indicator->actions_export_id = g_dbus_connection_export_action_group (connection, - "/com/canonical/indicator/test", + "/org/ayatana/indicator/test", G_ACTION_GROUP (indicator->actions), &error); if (indicator->actions_export_id == 0) @@ -30,7 +30,7 @@ bus_acquired (GDBusConnection *connection, } indicator->menu_export_id = g_dbus_connection_export_menu_model (connection, - "/com/canonical/indicator/test/desktop", + "/org/ayatana/indicator/test/desktop", G_MENU_MODEL (indicator->menu), &error); if (indicator->menu_export_id == 0) @@ -83,13 +83,13 @@ main (int argc, char **argv) submenu = g_menu_new (); g_menu_append (submenu, "Show", "indicator.show"); item = g_menu_item_new (NULL, "indicator._header"); - g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.indicator.root"); + g_menu_item_set_attribute (item, "x-canonical-type", "s", "org.ayatana.indicator.root"); g_menu_item_set_submenu (item, G_MENU_MODEL (submenu)); indicator.menu = g_menu_new (); g_menu_append_item (indicator.menu, item); g_bus_own_name (G_BUS_TYPE_SESSION, - "com.canonical.indicator.test", + "org.ayatana.indicator.test", G_BUS_NAME_OWNER_FLAGS_NONE, bus_acquired, NULL, diff --git a/tests/org.ayatana.indicator.no-such-service b/tests/org.ayatana.indicator.no-such-service new file mode 100644 index 0000000..d6b0aef --- /dev/null +++ b/tests/org.ayatana.indicator.no-such-service @@ -0,0 +1,3 @@ +[Indicator Service] +Name=indicator-test +ObjectPath=/org/ayatana/indicator/test diff --git a/tests/org.ayatana.indicator.test b/tests/org.ayatana.indicator.test new file mode 100644 index 0000000..f2ba7d9 --- /dev/null +++ b/tests/org.ayatana.indicator.test @@ -0,0 +1,6 @@ +[Indicator Service] +Name=indicator-test +ObjectPath=/org/ayatana/indicator/test + +[desktop] +ObjectPath=/org/ayatana/indicator/test/desktop diff --git a/tests/org.ayatana.indicator.test.service.in b/tests/org.ayatana.indicator.test.service.in new file mode 100644 index 0000000..bf8ec46 --- /dev/null +++ b/tests/org.ayatana.indicator.test.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.ayatana.indicator.test +Exec=@builddir@/indicator-test-service diff --git a/tests/test-indicator-ng.c b/tests/test-indicator-ng.c index 296e00b..4e38c6e 100644 --- a/tests/test-indicator-ng.c +++ b/tests/test-indicator-ng.c @@ -36,7 +36,7 @@ test_non_existing (void) IndicatorNg *indicator; GError *error = NULL; - indicator = indicator_ng_new (SRCDIR "/com.canonical.does.not.exist.indicator", &error); + indicator = indicator_ng_new (SRCDIR "/org.ayatana.does.not.exist.indicator", &error); g_assert (indicator == NULL); g_assert_error (error, G_FILE_ERROR, G_FILE_ERROR_NOENT); @@ -50,11 +50,11 @@ test_instantiation (void) GError *error = NULL; GMainLoop *loop; - indicator = indicator_ng_new (SRCDIR "/com.canonical.indicator.no-such-service", &error); + indicator = indicator_ng_new (SRCDIR "/org.ayatana.indicator.no-such-service", &error); g_assert (indicator); g_assert (error == NULL); - g_assert_cmpstr (indicator_ng_get_service_file (indicator), ==, SRCDIR "/com.canonical.indicator.no-such-service"); + g_assert_cmpstr (indicator_ng_get_service_file (indicator), ==, SRCDIR "/org.ayatana.indicator.no-such-service"); g_assert_cmpstr (indicator_ng_get_profile (indicator), ==, "desktop"); { @@ -65,7 +65,7 @@ test_instantiation (void) "profile", &profile, NULL); - g_assert_cmpstr (service_file, ==, SRCDIR "/com.canonical.indicator.no-such-service"); + g_assert_cmpstr (service_file, ==, SRCDIR "/org.ayatana.indicator.no-such-service"); g_assert_cmpstr (profile, ==, "desktop"); g_free (service_file); @@ -89,7 +89,7 @@ test_instantiation_with_profile (void) IndicatorNg *indicator; GError *error = NULL; - indicator = indicator_ng_new_for_profile (SRCDIR "/com.canonical.indicator.test", "greeter", &error); + indicator = indicator_ng_new_for_profile (SRCDIR "/org.ayatana.indicator.test", "greeter", &error); g_assert (indicator); g_assert (error == NULL); @@ -133,7 +133,7 @@ test_menu (void) GList *entries; IndicatorObjectEntry *entry; - indicator = indicator_ng_new (SRCDIR "/com.canonical.indicator.test", &error); + indicator = indicator_ng_new (SRCDIR "/org.ayatana.indicator.test", &error); g_assert (indicator); g_assert (error == NULL); diff --git a/tests/test-loader.c b/tests/test-loader.c index 28187ad..5f9b8d3 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -21,7 +21,7 @@ License along with this library. If not, see */ #include -#include "libindicator/indicator-object.h" +#include "libayatana-indicator/indicator-object.h" #include "dummy-indicator-entry-func.h" -- cgit v1.2.3