aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.am60
-rw-r--r--test/Makefile.in362
-rw-r--r--test/test-gactionmuxer.cpp365
-rw-r--r--test/test-gtest.cpp12
4 files changed, 506 insertions, 293 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index 1d28dc4..4671446 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,8 +1,8 @@
check_LIBRARIES = libgtest.a
-check_PROGRAMS = test-gtest
+check_PROGRAMS = test-gactionmuxer
-TESTS =
+TESTS = $(check_PROGRAMS)
AM_CPPFLAGS = $(GTEST_CPPFLAGS) \
-I${top_srcdir}/src
@@ -11,23 +11,22 @@ nodist_libgtest_a_SOURCES = \
$(GTEST_SOURCE)/src/gtest-all.cc \
$(GTEST_SOURCE)/src/gtest_main.cc
libgtest_a_CPPFLAGS = \
- $(GTEST_CPPFLAGS) -w
+ $(GTEST_CPPFLAGS) -w \
+ $(AM_CPPFLAGS)
libgtest_a_CXXFLAGS = \
$(AM_CXXFLAGS)
-libgtest_a_CPPFLAGS = \
- $(AM_CPPFLAGS)
-TESTS += test-gtest
-test_gtest_SOURCES = \
- test-gtest.cpp
-test_gtest_CPPFLAGS = \
+test_gactionmuxer_SOURCES = \
+ test-gactionmuxer.cpp
+
+test_gactionmuxer_CPPFLAGS = \
$(APPLET_CFLAGS) \
$(AM_CPPFLAGS)
-test_gtest_LDFLAGS = -pthread
-test_gtest_LDADD = \
+
+test_gactionmuxer_LDADD = \
$(APPLET_LIBS) \
- $(top_builddir)/src/.libs/libindicator-messages-status-provider.la \
+ libindicator-messages-service.la \
libgtest.a
@@ -35,31 +34,17 @@ test_gtest_LDADD = \
# Lib containing code under test
######################################
-lib_LTLIBRARIES = \
+noinst_LTLIBRARIES = \
libindicator-messages-service.la
-libindicator_messages_service_la_HEADERS = \
- $(top_srcdir)/src/default-applications.h \
- $(top_srcdir)/src/messages-service-dbus.h \
- $(top_srcdir)/src/gen-messages-service.xml.h \
- $(top_srcdir)/src/im-menu-item.h \
- $(top_srcdir)/src/app-menu-item.h \
- $(top_srcdir)/src/launcher-menu-item.h \
- $(top_srcdir)/src/seen-db.h \
- $(top_srcdir)/src/dirs.h \
- $(top_srcdir)/src/dbus-data.h \
- $(top_srcdir)/src/status-items.h
-
libindicator_messages_service_la_SOURCES = \
- $(top_srcdir)/src/default-applications.c \
- $(top_srcdir)/src/messages-service.c \
- $(top_srcdir)/src/messages-service-dbus.c \
- $(top_srcdir)/src/gen-messages-service.xml.c \
- $(top_srcdir)/src/im-menu-item.c \
- $(top_srcdir)/src/app-menu-item.c \
- $(top_srcdir)/src/launcher-menu-item.c \
- $(top_srcdir)/src/seen-db.c \
- $(top_srcdir)/src/status-items.c
+ $(top_builddir)/src/indicator-messages-service.c \
+ $(top_builddir)/src/indicator-messages-service.h \
+ $(top_srcdir)/src/app-section.c \
+ $(top_srcdir)/src/app-section.h \
+ $(top_srcdir)/src/gactionmuxer.c \
+ $(top_srcdir)/src/gactionmuxer.h
+ $(top_srcdir)/src/dbus-data.h
libindicator_messages_service_ladir = \
$(includedir)/libindicator-messages-service/
@@ -67,17 +52,16 @@ libindicator_messages_service_ladir = \
libindicator_messages_service_la_CFLAGS = \
$(APPLET_CFLAGS) \
$(COVERAGE_CFLAGS) \
+ -I$(top_builddir)/src \
-Wall \
-Wl,-Bsymbolic-functions \
-Wl,-z,defs \
-Wl,--as-needed \
-Werror \
- -DG_LOG_DOMAIN=\"Indicator-Messages\" \
- -DSTATUS_PROVIDER_DIR=\"$(STATUS_PROVIDER_DIR)\"
+ -DG_LOG_DOMAIN=\"Indicator-Messages\"
libindicator_messages_service_la_LIBADD = \
- $(APPLET_LIBS) \
- $(top_builddir)/src/.libs/libindicator-messages-status-provider.la
+ $(APPLET_LIBS)
libindicator_messages_service_la_LDFLAGS = \
$(COVERAGE_LDFLAGS)
diff --git a/test/Makefile.in b/test/Makefile.in
index 4815fa0..f4e25be 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,8 +15,24 @@
@SET_MAKE@
-
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -35,16 +51,11 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-check_PROGRAMS = test-gtest$(EXEEXT)
-TESTS = test-gtest$(EXEEXT)
+check_PROGRAMS = test-gactionmuxer$(EXEEXT)
subdir = test
-DIST_COMMON = $(libindicator_messages_service_la_HEADERS) \
- $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gcov.m4 \
$(top_srcdir)/m4/gtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -64,49 +75,12 @@ libgtest_a_LIBADD =
nodist_libgtest_a_OBJECTS = libgtest_a-gtest-all.$(OBJEXT) \
libgtest_a-gtest_main.$(OBJEXT)
libgtest_a_OBJECTS = $(nodist_libgtest_a_OBJECTS)
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
-am__installdirs = "$(DESTDIR)$(libdir)" \
- "$(DESTDIR)$(libindicator_messages_service_ladir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
+LTLIBRARIES = $(noinst_LTLIBRARIES)
am__DEPENDENCIES_1 =
-libindicator_messages_service_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(top_builddir)/src/.libs/libindicator-messages-status-provider.la
-am_libindicator_messages_service_la_OBJECTS = \
- libindicator_messages_service_la-default-applications.lo \
- libindicator_messages_service_la-messages-service.lo \
- libindicator_messages_service_la-messages-service-dbus.lo \
- libindicator_messages_service_la-gen-messages-service.xml.lo \
- libindicator_messages_service_la-im-menu-item.lo \
- libindicator_messages_service_la-app-menu-item.lo \
- libindicator_messages_service_la-launcher-menu-item.lo \
- libindicator_messages_service_la-seen-db.lo \
- libindicator_messages_service_la-status-items.lo
+libindicator_messages_service_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_libindicator_messages_service_la_OBJECTS = libindicator_messages_service_la-indicator-messages-service.lo \
+ libindicator_messages_service_la-app-section.lo \
+ libindicator_messages_service_la-gactionmuxer.lo
libindicator_messages_service_la_OBJECTS = \
$(am_libindicator_messages_service_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
@@ -116,14 +90,11 @@ libindicator_messages_service_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(libindicator_messages_service_la_CFLAGS) $(CFLAGS) \
$(libindicator_messages_service_la_LDFLAGS) $(LDFLAGS) -o $@
-am_test_gtest_OBJECTS = test_gtest-test-gtest.$(OBJEXT)
-test_gtest_OBJECTS = $(am_test_gtest_OBJECTS)
-test_gtest_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(top_builddir)/src/.libs/libindicator-messages-status-provider.la \
- libgtest.a
-test_gtest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(test_gtest_LDFLAGS) $(LDFLAGS) -o $@
+am_test_gactionmuxer_OBJECTS = \
+ test_gactionmuxer-test-gactionmuxer.$(OBJEXT)
+test_gactionmuxer_OBJECTS = $(am_test_gactionmuxer_OBJECTS)
+test_gactionmuxer_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ libindicator-messages-service.la libgtest.a
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -165,10 +136,14 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(nodist_libgtest_a_SOURCES) \
$(libindicator_messages_service_la_SOURCES) \
- $(test_gtest_SOURCES)
+ $(test_gactionmuxer_SOURCES)
DIST_SOURCES = $(libindicator_messages_service_la_SOURCES) \
- $(test_gtest_SOURCES)
-HEADERS = $(libindicator_messages_service_la_HEADERS)
+ $(test_gactionmuxer_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
ETAGS = etags
CTAGS = ctags
am__tty_colors = \
@@ -216,12 +191,22 @@ FGREP = @FGREP@
GCOVR = @GCOVR@
GENHTML = @GENHTML@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIO_CFLAGS = @GIO_CFLAGS@
+GIO_LIBS = @GIO_LIBS@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOMELOCALEDIR = @GNOMELOCALEDIR@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTEST_CPPFLAGS = @GTEST_CPPFLAGS@
GTEST_SOURCE = @GTEST_SOURCE@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+HTML_DIR = @HTML_DIR@
INDICATORDIR = @INDICATORDIR@
INDICATORICONSDIR = @INDICATORICONSDIR@
INSTALL = @INSTALL@
@@ -239,6 +224,14 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
LCOV = @LCOV@
LD = @LD@
LDFLAGS = @LDFLAGS@
@@ -282,14 +275,6 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SHTOOL = @SHTOOL@
-STATUS_PROVIDER_EMESENE_CFLAGS = @STATUS_PROVIDER_EMESENE_CFLAGS@
-STATUS_PROVIDER_EMESENE_LIBS = @STATUS_PROVIDER_EMESENE_LIBS@
-STATUS_PROVIDER_MC5_CFLAGS = @STATUS_PROVIDER_MC5_CFLAGS@
-STATUS_PROVIDER_MC5_LIBS = @STATUS_PROVIDER_MC5_LIBS@
-STATUS_PROVIDER_PIDGIN_CFLAGS = @STATUS_PROVIDER_PIDGIN_CFLAGS@
-STATUS_PROVIDER_PIDGIN_LIBS = @STATUS_PROVIDER_PIDGIN_LIBS@
-STATUS_PROVIDER_TELEPATHY_CFLAGS = @STATUS_PROVIDER_TELEPATHY_CFLAGS@
-STATUS_PROVIDER_TELEPATHY_LIBS = @STATUS_PROVIDER_TELEPATHY_LIBS@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
@@ -319,6 +304,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -350,6 +336,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
check_LIBRARIES = libgtest.a
+TESTS = $(check_PROGRAMS)
AM_CPPFLAGS = $(GTEST_CPPFLAGS) \
-I${top_srcdir}/src
@@ -358,53 +345,38 @@ nodist_libgtest_a_SOURCES = \
$(GTEST_SOURCE)/src/gtest_main.cc
libgtest_a_CPPFLAGS = \
+ $(GTEST_CPPFLAGS) -w \
$(AM_CPPFLAGS)
libgtest_a_CXXFLAGS = \
$(AM_CXXFLAGS)
-test_gtest_SOURCES = \
- test-gtest.cpp
+test_gactionmuxer_SOURCES = \
+ test-gactionmuxer.cpp
-test_gtest_CPPFLAGS = \
+test_gactionmuxer_CPPFLAGS = \
$(APPLET_CFLAGS) \
$(AM_CPPFLAGS)
-test_gtest_LDFLAGS = -pthread
-test_gtest_LDADD = \
+test_gactionmuxer_LDADD = \
$(APPLET_LIBS) \
- $(top_builddir)/src/.libs/libindicator-messages-status-provider.la \
+ libindicator-messages-service.la \
libgtest.a
######################################
# Lib containing code under test
######################################
-lib_LTLIBRARIES = \
+noinst_LTLIBRARIES = \
libindicator-messages-service.la
-libindicator_messages_service_la_HEADERS = \
- $(top_srcdir)/src/default-applications.h \
- $(top_srcdir)/src/messages-service-dbus.h \
- $(top_srcdir)/src/gen-messages-service.xml.h \
- $(top_srcdir)/src/im-menu-item.h \
- $(top_srcdir)/src/app-menu-item.h \
- $(top_srcdir)/src/launcher-menu-item.h \
- $(top_srcdir)/src/seen-db.h \
- $(top_srcdir)/src/dirs.h \
- $(top_srcdir)/src/dbus-data.h \
- $(top_srcdir)/src/status-items.h
-
libindicator_messages_service_la_SOURCES = \
- $(top_srcdir)/src/default-applications.c \
- $(top_srcdir)/src/messages-service.c \
- $(top_srcdir)/src/messages-service-dbus.c \
- $(top_srcdir)/src/gen-messages-service.xml.c \
- $(top_srcdir)/src/im-menu-item.c \
- $(top_srcdir)/src/app-menu-item.c \
- $(top_srcdir)/src/launcher-menu-item.c \
- $(top_srcdir)/src/seen-db.c \
- $(top_srcdir)/src/status-items.c
+ $(top_builddir)/src/indicator-messages-service.c \
+ $(top_builddir)/src/indicator-messages-service.h \
+ $(top_srcdir)/src/app-section.c \
+ $(top_srcdir)/src/app-section.h \
+ $(top_srcdir)/src/gactionmuxer.c \
+ $(top_srcdir)/src/gactionmuxer.h
libindicator_messages_service_ladir = \
$(includedir)/libindicator-messages-service/
@@ -412,17 +384,16 @@ libindicator_messages_service_ladir = \
libindicator_messages_service_la_CFLAGS = \
$(APPLET_CFLAGS) \
$(COVERAGE_CFLAGS) \
+ -I$(top_builddir)/src \
-Wall \
-Wl,-Bsymbolic-functions \
-Wl,-z,defs \
-Wl,--as-needed \
-Werror \
- -DG_LOG_DOMAIN=\"Indicator-Messages\" \
- -DSTATUS_PROVIDER_DIR=\"$(STATUS_PROVIDER_DIR)\"
+ -DG_LOG_DOMAIN=\"Indicator-Messages\"
libindicator_messages_service_la_LIBADD = \
- $(APPLET_LIBS) \
- $(top_builddir)/src/.libs/libindicator-messages-status-provider.la
+ $(APPLET_LIBS)
libindicator_messages_service_la_LDFLAGS = \
$(COVERAGE_LDFLAGS)
@@ -468,39 +439,17 @@ libgtest.a: $(libgtest_a_OBJECTS) $(libgtest_a_DEPENDENCIES) $(EXTRA_libgtest_a_
$(AM_V_at)-rm -f libgtest.a
$(AM_V_AR)$(libgtest_a_AR) libgtest.a $(libgtest_a_OBJECTS) $(libgtest_a_LIBADD)
$(AM_V_at)$(RANLIB) libgtest.a
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
- list2=; for p in $$list; do \
- if test -f $$p; then \
- list2="$$list2 $$p"; \
- else :; fi; \
- done; \
- test -z "$$list2" || { \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
- }
-
-uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
- for p in $$list; do \
- $(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
- done
-clean-libLTLIBRARIES:
- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
test "$$dir" != "$$p" || dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
libindicator-messages-service.la: $(libindicator_messages_service_la_OBJECTS) $(libindicator_messages_service_la_DEPENDENCIES) $(EXTRA_libindicator_messages_service_la_DEPENDENCIES)
- $(AM_V_CCLD)$(libindicator_messages_service_la_LINK) -rpath $(libdir) $(libindicator_messages_service_la_OBJECTS) $(libindicator_messages_service_la_LIBADD) $(LIBS)
+ $(AM_V_CCLD)$(libindicator_messages_service_la_LINK) $(libindicator_messages_service_la_OBJECTS) $(libindicator_messages_service_la_LIBADD) $(LIBS)
clean-checkPROGRAMS:
@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
@@ -510,9 +459,9 @@ clean-checkPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
-test-gtest$(EXEEXT): $(test_gtest_OBJECTS) $(test_gtest_DEPENDENCIES) $(EXTRA_test_gtest_DEPENDENCIES)
- @rm -f test-gtest$(EXEEXT)
- $(AM_V_CXXLD)$(test_gtest_LINK) $(test_gtest_OBJECTS) $(test_gtest_LDADD) $(LIBS)
+test-gactionmuxer$(EXEEXT): $(test_gactionmuxer_OBJECTS) $(test_gactionmuxer_DEPENDENCIES) $(EXTRA_test_gactionmuxer_DEPENDENCIES)
+ @rm -f test-gactionmuxer$(EXEEXT)
+ $(AM_V_CXXLD)$(CXXLINK) $(test_gactionmuxer_OBJECTS) $(test_gactionmuxer_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -522,16 +471,10 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgtest_a-gtest-all.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgtest_a-gtest_main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator_messages_service_la-app-menu-item.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator_messages_service_la-default-applications.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator_messages_service_la-gen-messages-service.xml.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator_messages_service_la-im-menu-item.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator_messages_service_la-launcher-menu-item.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator_messages_service_la-messages-service-dbus.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator_messages_service_la-messages-service.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator_messages_service_la-seen-db.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator_messages_service_la-status-items.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gtest-test-gtest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator_messages_service_la-app-section.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator_messages_service_la-gactionmuxer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libindicator_messages_service_la-indicator-messages-service.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gactionmuxer-test-gactionmuxer.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -554,68 +497,26 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-libindicator_messages_service_la-default-applications.lo: $(top_srcdir)/src/default-applications.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_messages_service_la_CFLAGS) $(CFLAGS) -MT libindicator_messages_service_la-default-applications.lo -MD -MP -MF $(DEPDIR)/libindicator_messages_service_la-default-applications.Tpo -c -o libindicator_messages_service_la-default-applications.lo `test -f '$(top_srcdir)/src/default-applications.c' || echo '$(srcdir)/'`$(top_srcdir)/src/default-applications.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator_messages_service_la-default-applications.Tpo $(DEPDIR)/libindicator_messages_service_la-default-applications.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/default-applications.c' object='libindicator_messages_service_la-default-applications.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_messages_service_la_CFLAGS) $(CFLAGS) -c -o libindicator_messages_service_la-default-applications.lo `test -f '$(top_srcdir)/src/default-applications.c' || echo '$(srcdir)/'`$(top_srcdir)/src/default-applications.c
-
-libindicator_messages_service_la-messages-service.lo: $(top_srcdir)/src/messages-service.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_messages_service_la_CFLAGS) $(CFLAGS) -MT libindicator_messages_service_la-messages-service.lo -MD -MP -MF $(DEPDIR)/libindicator_messages_service_la-messages-service.Tpo -c -o libindicator_messages_service_la-messages-service.lo `test -f '$(top_srcdir)/src/messages-service.c' || echo '$(srcdir)/'`$(top_srcdir)/src/messages-service.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator_messages_service_la-messages-service.Tpo $(DEPDIR)/libindicator_messages_service_la-messages-service.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/messages-service.c' object='libindicator_messages_service_la-messages-service.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_messages_service_la_CFLAGS) $(CFLAGS) -c -o libindicator_messages_service_la-messages-service.lo `test -f '$(top_srcdir)/src/messages-service.c' || echo '$(srcdir)/'`$(top_srcdir)/src/messages-service.c
-
-libindicator_messages_service_la-messages-service-dbus.lo: $(top_srcdir)/src/messages-service-dbus.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_messages_service_la_CFLAGS) $(CFLAGS) -MT libindicator_messages_service_la-messages-service-dbus.lo -MD -MP -MF $(DEPDIR)/libindicator_messages_service_la-messages-service-dbus.Tpo -c -o libindicator_messages_service_la-messages-service-dbus.lo `test -f '$(top_srcdir)/src/messages-service-dbus.c' || echo '$(srcdir)/'`$(top_srcdir)/src/messages-service-dbus.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator_messages_service_la-messages-service-dbus.Tpo $(DEPDIR)/libindicator_messages_service_la-messages-service-dbus.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/messages-service-dbus.c' object='libindicator_messages_service_la-messages-service-dbus.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_messages_service_la_CFLAGS) $(CFLAGS) -c -o libindicator_messages_service_la-messages-service-dbus.lo `test -f '$(top_srcdir)/src/messages-service-dbus.c' || echo '$(srcdir)/'`$(top_srcdir)/src/messages-service-dbus.c
-
-libindicator_messages_service_la-gen-messages-service.xml.lo: $(top_srcdir)/src/gen-messages-service.xml.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_messages_service_la_CFLAGS) $(CFLAGS) -MT libindicator_messages_service_la-gen-messages-service.xml.lo -MD -MP -MF $(DEPDIR)/libindicator_messages_service_la-gen-messages-service.xml.Tpo -c -o libindicator_messages_service_la-gen-messages-service.xml.lo `test -f '$(top_srcdir)/src/gen-messages-service.xml.c' || echo '$(srcdir)/'`$(top_srcdir)/src/gen-messages-service.xml.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator_messages_service_la-gen-messages-service.xml.Tpo $(DEPDIR)/libindicator_messages_service_la-gen-messages-service.xml.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/gen-messages-service.xml.c' object='libindicator_messages_service_la-gen-messages-service.xml.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_messages_service_la_CFLAGS) $(CFLAGS) -c -o libindicator_messages_service_la-gen-messages-service.xml.lo `test -f '$(top_srcdir)/src/gen-messages-service.xml.c' || echo '$(srcdir)/'`$(top_srcdir)/src/gen-messages-service.xml.c
-
-libindicator_messages_service_la-im-menu-item.lo: $(top_srcdir)/src/im-menu-item.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_messages_service_la_CFLAGS) $(CFLAGS) -MT libindicator_messages_service_la-im-menu-item.lo -MD -MP -MF $(DEPDIR)/libindicator_messages_service_la-im-menu-item.Tpo -c -o libindicator_messages_service_la-im-menu-item.lo `test -f '$(top_srcdir)/src/im-menu-item.c' || echo '$(srcdir)/'`$(top_srcdir)/src/im-menu-item.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator_messages_service_la-im-menu-item.Tpo $(DEPDIR)/libindicator_messages_service_la-im-menu-item.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/im-menu-item.c' object='libindicator_messages_service_la-im-menu-item.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_messages_service_la_CFLAGS) $(CFLAGS) -c -o libindicator_messages_service_la-im-menu-item.lo `test -f '$(top_srcdir)/src/im-menu-item.c' || echo '$(srcdir)/'`$(top_srcdir)/src/im-menu-item.c
-
-libindicator_messages_service_la-app-menu-item.lo: $(top_srcdir)/src/app-menu-item.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_messages_service_la_CFLAGS) $(CFLAGS) -MT libindicator_messages_service_la-app-menu-item.lo -MD -MP -MF $(DEPDIR)/libindicator_messages_service_la-app-menu-item.Tpo -c -o libindicator_messages_service_la-app-menu-item.lo `test -f '$(top_srcdir)/src/app-menu-item.c' || echo '$(srcdir)/'`$(top_srcdir)/src/app-menu-item.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator_messages_service_la-app-menu-item.Tpo $(DEPDIR)/libindicator_messages_service_la-app-menu-item.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/app-menu-item.c' object='libindicator_messages_service_la-app-menu-item.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_messages_service_la_CFLAGS) $(CFLAGS) -c -o libindicator_messages_service_la-app-menu-item.lo `test -f '$(top_srcdir)/src/app-menu-item.c' || echo '$(srcdir)/'`$(top_srcdir)/src/app-menu-item.c
-
-libindicator_messages_service_la-launcher-menu-item.lo: $(top_srcdir)/src/launcher-menu-item.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_messages_service_la_CFLAGS) $(CFLAGS) -MT libindicator_messages_service_la-launcher-menu-item.lo -MD -MP -MF $(DEPDIR)/libindicator_messages_service_la-launcher-menu-item.Tpo -c -o libindicator_messages_service_la-launcher-menu-item.lo `test -f '$(top_srcdir)/src/launcher-menu-item.c' || echo '$(srcdir)/'`$(top_srcdir)/src/launcher-menu-item.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator_messages_service_la-launcher-menu-item.Tpo $(DEPDIR)/libindicator_messages_service_la-launcher-menu-item.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/launcher-menu-item.c' object='libindicator_messages_service_la-launcher-menu-item.lo' libtool=yes @AMDEPBACKSLASH@
+libindicator_messages_service_la-indicator-messages-service.lo: $(top_builddir)/src/indicator-messages-service.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_messages_service_la_CFLAGS) $(CFLAGS) -MT libindicator_messages_service_la-indicator-messages-service.lo -MD -MP -MF $(DEPDIR)/libindicator_messages_service_la-indicator-messages-service.Tpo -c -o libindicator_messages_service_la-indicator-messages-service.lo `test -f '$(top_builddir)/src/indicator-messages-service.c' || echo '$(srcdir)/'`$(top_builddir)/src/indicator-messages-service.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator_messages_service_la-indicator-messages-service.Tpo $(DEPDIR)/libindicator_messages_service_la-indicator-messages-service.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_builddir)/src/indicator-messages-service.c' object='libindicator_messages_service_la-indicator-messages-service.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_messages_service_la_CFLAGS) $(CFLAGS) -c -o libindicator_messages_service_la-launcher-menu-item.lo `test -f '$(top_srcdir)/src/launcher-menu-item.c' || echo '$(srcdir)/'`$(top_srcdir)/src/launcher-menu-item.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_messages_service_la_CFLAGS) $(CFLAGS) -c -o libindicator_messages_service_la-indicator-messages-service.lo `test -f '$(top_builddir)/src/indicator-messages-service.c' || echo '$(srcdir)/'`$(top_builddir)/src/indicator-messages-service.c
-libindicator_messages_service_la-seen-db.lo: $(top_srcdir)/src/seen-db.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_messages_service_la_CFLAGS) $(CFLAGS) -MT libindicator_messages_service_la-seen-db.lo -MD -MP -MF $(DEPDIR)/libindicator_messages_service_la-seen-db.Tpo -c -o libindicator_messages_service_la-seen-db.lo `test -f '$(top_srcdir)/src/seen-db.c' || echo '$(srcdir)/'`$(top_srcdir)/src/seen-db.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator_messages_service_la-seen-db.Tpo $(DEPDIR)/libindicator_messages_service_la-seen-db.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/seen-db.c' object='libindicator_messages_service_la-seen-db.lo' libtool=yes @AMDEPBACKSLASH@
+libindicator_messages_service_la-app-section.lo: $(top_srcdir)/src/app-section.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_messages_service_la_CFLAGS) $(CFLAGS) -MT libindicator_messages_service_la-app-section.lo -MD -MP -MF $(DEPDIR)/libindicator_messages_service_la-app-section.Tpo -c -o libindicator_messages_service_la-app-section.lo `test -f '$(top_srcdir)/src/app-section.c' || echo '$(srcdir)/'`$(top_srcdir)/src/app-section.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator_messages_service_la-app-section.Tpo $(DEPDIR)/libindicator_messages_service_la-app-section.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/app-section.c' object='libindicator_messages_service_la-app-section.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_messages_service_la_CFLAGS) $(CFLAGS) -c -o libindicator_messages_service_la-seen-db.lo `test -f '$(top_srcdir)/src/seen-db.c' || echo '$(srcdir)/'`$(top_srcdir)/src/seen-db.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_messages_service_la_CFLAGS) $(CFLAGS) -c -o libindicator_messages_service_la-app-section.lo `test -f '$(top_srcdir)/src/app-section.c' || echo '$(srcdir)/'`$(top_srcdir)/src/app-section.c
-libindicator_messages_service_la-status-items.lo: $(top_srcdir)/src/status-items.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_messages_service_la_CFLAGS) $(CFLAGS) -MT libindicator_messages_service_la-status-items.lo -MD -MP -MF $(DEPDIR)/libindicator_messages_service_la-status-items.Tpo -c -o libindicator_messages_service_la-status-items.lo `test -f '$(top_srcdir)/src/status-items.c' || echo '$(srcdir)/'`$(top_srcdir)/src/status-items.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator_messages_service_la-status-items.Tpo $(DEPDIR)/libindicator_messages_service_la-status-items.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/status-items.c' object='libindicator_messages_service_la-status-items.lo' libtool=yes @AMDEPBACKSLASH@
+libindicator_messages_service_la-gactionmuxer.lo: $(top_srcdir)/src/gactionmuxer.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_messages_service_la_CFLAGS) $(CFLAGS) -MT libindicator_messages_service_la-gactionmuxer.lo -MD -MP -MF $(DEPDIR)/libindicator_messages_service_la-gactionmuxer.Tpo -c -o libindicator_messages_service_la-gactionmuxer.lo `test -f '$(top_srcdir)/src/gactionmuxer.c' || echo '$(srcdir)/'`$(top_srcdir)/src/gactionmuxer.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libindicator_messages_service_la-gactionmuxer.Tpo $(DEPDIR)/libindicator_messages_service_la-gactionmuxer.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/gactionmuxer.c' object='libindicator_messages_service_la-gactionmuxer.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_messages_service_la_CFLAGS) $(CFLAGS) -c -o libindicator_messages_service_la-status-items.lo `test -f '$(top_srcdir)/src/status-items.c' || echo '$(srcdir)/'`$(top_srcdir)/src/status-items.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libindicator_messages_service_la_CFLAGS) $(CFLAGS) -c -o libindicator_messages_service_la-gactionmuxer.lo `test -f '$(top_srcdir)/src/gactionmuxer.c' || echo '$(srcdir)/'`$(top_srcdir)/src/gactionmuxer.c
.cc.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -666,19 +567,19 @@ libgtest_a-gtest_main.obj: $(GTEST_SOURCE)/src/gtest_main.cc
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgtest_a_CPPFLAGS) $(CPPFLAGS) $(libgtest_a_CXXFLAGS) $(CXXFLAGS) -c -o libgtest_a-gtest_main.obj `if test -f '$(GTEST_SOURCE)/src/gtest_main.cc'; then $(CYGPATH_W) '$(GTEST_SOURCE)/src/gtest_main.cc'; else $(CYGPATH_W) '$(srcdir)/$(GTEST_SOURCE)/src/gtest_main.cc'; fi`
-test_gtest-test-gtest.o: test-gtest.cpp
-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_gtest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_gtest-test-gtest.o -MD -MP -MF $(DEPDIR)/test_gtest-test-gtest.Tpo -c -o test_gtest-test-gtest.o `test -f 'test-gtest.cpp' || echo '$(srcdir)/'`test-gtest.cpp
-@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_gtest-test-gtest.Tpo $(DEPDIR)/test_gtest-test-gtest.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='test-gtest.cpp' object='test_gtest-test-gtest.o' libtool=no @AMDEPBACKSLASH@
+test_gactionmuxer-test-gactionmuxer.o: test-gactionmuxer.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_gactionmuxer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_gactionmuxer-test-gactionmuxer.o -MD -MP -MF $(DEPDIR)/test_gactionmuxer-test-gactionmuxer.Tpo -c -o test_gactionmuxer-test-gactionmuxer.o `test -f 'test-gactionmuxer.cpp' || echo '$(srcdir)/'`test-gactionmuxer.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_gactionmuxer-test-gactionmuxer.Tpo $(DEPDIR)/test_gactionmuxer-test-gactionmuxer.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='test-gactionmuxer.cpp' object='test_gactionmuxer-test-gactionmuxer.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_gtest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_gtest-test-gtest.o `test -f 'test-gtest.cpp' || echo '$(srcdir)/'`test-gtest.cpp
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_gactionmuxer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_gactionmuxer-test-gactionmuxer.o `test -f 'test-gactionmuxer.cpp' || echo '$(srcdir)/'`test-gactionmuxer.cpp
-test_gtest-test-gtest.obj: test-gtest.cpp
-@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_gtest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_gtest-test-gtest.obj -MD -MP -MF $(DEPDIR)/test_gtest-test-gtest.Tpo -c -o test_gtest-test-gtest.obj `if test -f 'test-gtest.cpp'; then $(CYGPATH_W) 'test-gtest.cpp'; else $(CYGPATH_W) '$(srcdir)/test-gtest.cpp'; fi`
-@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_gtest-test-gtest.Tpo $(DEPDIR)/test_gtest-test-gtest.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='test-gtest.cpp' object='test_gtest-test-gtest.obj' libtool=no @AMDEPBACKSLASH@
+test_gactionmuxer-test-gactionmuxer.obj: test-gactionmuxer.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_gactionmuxer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_gactionmuxer-test-gactionmuxer.obj -MD -MP -MF $(DEPDIR)/test_gactionmuxer-test-gactionmuxer.Tpo -c -o test_gactionmuxer-test-gactionmuxer.obj `if test -f 'test-gactionmuxer.cpp'; then $(CYGPATH_W) 'test-gactionmuxer.cpp'; else $(CYGPATH_W) '$(srcdir)/test-gactionmuxer.cpp'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_gactionmuxer-test-gactionmuxer.Tpo $(DEPDIR)/test_gactionmuxer-test-gactionmuxer.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='test-gactionmuxer.cpp' object='test_gactionmuxer-test-gactionmuxer.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_gtest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_gtest-test-gtest.obj `if test -f 'test-gtest.cpp'; then $(CYGPATH_W) 'test-gtest.cpp'; else $(CYGPATH_W) '$(srcdir)/test-gtest.cpp'; fi`
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_gactionmuxer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_gactionmuxer-test-gactionmuxer.obj `if test -f 'test-gactionmuxer.cpp'; then $(CYGPATH_W) 'test-gactionmuxer.cpp'; else $(CYGPATH_W) '$(srcdir)/test-gactionmuxer.cpp'; fi`
.cpp.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -706,24 +607,6 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
-install-libindicator_messages_service_laHEADERS: $(libindicator_messages_service_la_HEADERS)
- @$(NORMAL_INSTALL)
- test -z "$(libindicator_messages_service_ladir)" || $(MKDIR_P) "$(DESTDIR)$(libindicator_messages_service_ladir)"
- @list='$(libindicator_messages_service_la_HEADERS)'; test -n "$(libindicator_messages_service_ladir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libindicator_messages_service_ladir)'"; \
- $(INSTALL_HEADER) $$files "$(DESTDIR)$(libindicator_messages_service_ladir)" || exit $$?; \
- done
-
-uninstall-libindicator_messages_service_laHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(libindicator_messages_service_la_HEADERS)'; test -n "$(libindicator_messages_service_ladir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(libindicator_messages_service_ladir)'; $(am__uninstall_files_from_dir)
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -904,11 +787,8 @@ check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) $(check_LIBRARIES) $(check_PROGRAMS)
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES)
installdirs:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libindicator_messages_service_ladir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -942,7 +822,7 @@ maintainer-clean-generic:
clean: clean-am
clean-am: clean-checkLIBRARIES clean-checkPROGRAMS clean-generic \
- clean-libLTLIBRARIES clean-libtool mostlyclean-am
+ clean-libtool clean-noinstLTLIBRARIES mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -962,13 +842,13 @@ info: info-am
info-am:
-install-data-am: install-libindicator_messages_service_laHEADERS
+install-data-am:
install-dvi: install-dvi-am
install-dvi-am:
-install-exec-am: install-libLTLIBRARIES
+install-exec-am:
install-html: install-html-am
@@ -1008,29 +888,25 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-libLTLIBRARIES \
- uninstall-libindicator_messages_service_laHEADERS
+uninstall-am:
.MAKE: check-am install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
clean-checkLIBRARIES clean-checkPROGRAMS clean-generic \
- clean-libLTLIBRARIES clean-libtool ctags distclean \
+ clean-libtool clean-noinstLTLIBRARIES ctags distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \
install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am \
- install-libLTLIBRARIES \
- install-libindicator_messages_service_laHEADERS install-man \
+ install-html-am install-info install-info-am install-man \
install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-libLTLIBRARIES \
- uninstall-libindicator_messages_service_laHEADERS
+ pdf pdf-am ps ps-am tags uninstall uninstall-am
+ $(top_srcdir)/src/dbus-data.h
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/test/test-gactionmuxer.cpp b/test/test-gactionmuxer.cpp
new file mode 100644
index 0000000..6304853
--- /dev/null
+++ b/test/test-gactionmuxer.cpp
@@ -0,0 +1,365 @@
+
+#include <glib.h>
+#include <gio/gio.h>
+#include <gtest/gtest.h>
+
+extern "C" {
+#include "app-section.h"
+#include "gactionmuxer.h"
+}
+
+static gboolean
+strv_contains (gchar **str_array,
+ const gchar *str)
+{
+ gchar **it;
+
+ for (it = str_array; *it; it++) {
+ if (!g_strcmp0 (*it, str))
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+TEST(GActionMuxerTest, Sanity) {
+ GActionMuxer *muxer;
+
+ g_type_init ();
+
+ g_action_muxer_insert (NULL, NULL, NULL);
+ g_action_muxer_remove (NULL, NULL);
+
+ muxer = g_action_muxer_new ();
+
+ g_action_muxer_insert (muxer, NULL, NULL);
+ g_action_muxer_remove (muxer, NULL);
+ EXPECT_FALSE (g_action_group_has_action (G_ACTION_GROUP (muxer), NULL));
+ EXPECT_FALSE (g_action_group_get_action_enabled (G_ACTION_GROUP (muxer), NULL));
+ EXPECT_FALSE (g_action_group_query_action (G_ACTION_GROUP (muxer), NULL, NULL, NULL, NULL, NULL, NULL));
+ g_action_group_activate_action (G_ACTION_GROUP (muxer), NULL, NULL);
+
+ g_object_unref (muxer);
+}
+
+TEST(GActionMuxerTest, Empty) {
+ GActionMuxer *muxer;
+ gchar **actions;
+
+ g_type_init ();
+
+ muxer = g_action_muxer_new ();
+
+ actions = g_action_group_list_actions (G_ACTION_GROUP (muxer));
+ EXPECT_EQ (0, g_strv_length (actions));
+
+ g_strfreev (actions);
+ g_object_unref (muxer);
+}
+
+TEST(GActionMuxerTest, AddAndRemove) {
+ const GActionEntry entries1[] = { { "one" }, { "two" }, { "three" } };
+ const GActionEntry entries2[] = { { "gb" }, { "es" }, { "fr" } };
+ const GActionEntry entries3[] = { { "foo" }, { "bar" } };
+ GSimpleActionGroup *group1;
+ GSimpleActionGroup *group2;
+ GSimpleActionGroup *group3;
+ GActionMuxer *muxer;
+ gchar **actions;
+
+ g_type_init ();
+
+ group1 = g_simple_action_group_new ();
+ g_simple_action_group_add_entries (group1,
+ entries1,
+ G_N_ELEMENTS (entries1),
+ NULL);
+
+ group2 = g_simple_action_group_new ();
+ g_simple_action_group_add_entries (group2,
+ entries2,
+ G_N_ELEMENTS (entries2),
+ NULL);
+
+ group3 = g_simple_action_group_new ();
+ g_simple_action_group_add_entries (group3,
+ entries3,
+ G_N_ELEMENTS (entries3),
+ NULL);
+
+ muxer = g_action_muxer_new ();
+ g_action_muxer_insert (muxer, "first", G_ACTION_GROUP (group1));
+ g_action_muxer_insert (muxer, "second", G_ACTION_GROUP (group2));
+ g_action_muxer_insert (muxer, NULL, G_ACTION_GROUP (group3));
+
+ actions = g_action_group_list_actions (G_ACTION_GROUP (muxer));
+ EXPECT_TRUE (g_action_group_has_action (G_ACTION_GROUP (muxer), "first.one"));
+ EXPECT_FALSE (g_action_group_has_action (G_ACTION_GROUP (muxer), "one"));
+ EXPECT_EQ (8, g_strv_length (actions));
+ EXPECT_TRUE (strv_contains (actions, "first.one"));
+ EXPECT_TRUE (strv_contains (actions, "first.two"));
+ EXPECT_TRUE (strv_contains (actions, "first.three"));
+ EXPECT_TRUE (strv_contains (actions, "second.gb"));
+ EXPECT_TRUE (strv_contains (actions, "second.es"));
+ EXPECT_TRUE (strv_contains (actions, "second.fr"));
+ EXPECT_TRUE (strv_contains (actions, "foo"));
+ EXPECT_TRUE (strv_contains (actions, "bar"));
+ g_strfreev (actions);
+
+ g_action_muxer_remove (muxer, NULL);
+ EXPECT_FALSE (g_action_group_has_action (G_ACTION_GROUP (muxer), "foo"));
+ EXPECT_TRUE (g_action_group_has_action (G_ACTION_GROUP (muxer), "first.one"));
+ actions = g_action_group_list_actions (G_ACTION_GROUP (muxer));
+ EXPECT_EQ (6, g_strv_length (actions));
+ EXPECT_FALSE (strv_contains (actions, "foo"));
+ EXPECT_TRUE (strv_contains (actions, "first.one"));
+ g_strfreev (actions);
+
+ g_action_muxer_remove (muxer, "first");
+ EXPECT_FALSE (g_action_group_has_action (G_ACTION_GROUP (muxer), "first.two"));
+ EXPECT_TRUE (g_action_group_has_action (G_ACTION_GROUP (muxer), "second.es"));
+ actions = g_action_group_list_actions (G_ACTION_GROUP (muxer));
+ EXPECT_EQ (3, g_strv_length (actions));
+ EXPECT_FALSE (strv_contains (actions, "first.two"));
+ EXPECT_TRUE (strv_contains (actions, "second.es"));
+ g_strfreev (actions);
+
+ g_action_muxer_insert (muxer, "second", G_ACTION_GROUP (group2));
+ actions = g_action_group_list_actions (G_ACTION_GROUP (muxer));
+ EXPECT_EQ (3, g_strv_length (actions));
+ g_strfreev (actions);
+
+ g_action_muxer_insert (muxer, NULL, G_ACTION_GROUP (group3));
+ actions = g_action_group_list_actions (G_ACTION_GROUP (muxer));
+ EXPECT_EQ (5, g_strv_length (actions));
+ g_strfreev (actions);
+
+ g_object_unref (muxer);
+ g_object_unref (group1);
+ g_object_unref (group2);
+ g_object_unref (group3);
+}
+
+static gboolean
+g_variant_equal0 (gconstpointer one,
+ gconstpointer two)
+{
+ if (one == NULL)
+ return two == NULL;
+ else
+ return g_variant_equal (one, two);
+}
+
+TEST(GActionMuxerTest, ActionAttributes) {
+ GSimpleActionGroup *group;
+ GSimpleAction *action;
+ GActionMuxer *muxer;
+ gboolean enabled[2];
+ const GVariantType *param_type[2];
+ const GVariantType *state_type[2];
+ GVariant *state_hint[2];
+ GVariant *state[2];
+
+ g_type_init ();
+
+ group = g_simple_action_group_new ();
+ action = g_simple_action_new ("one", G_VARIANT_TYPE_STRING);
+ g_simple_action_group_insert (group, G_ACTION (action));
+
+ muxer = g_action_muxer_new ();
+ g_action_muxer_insert (muxer, "first", G_ACTION_GROUP (group));
+
+ /* test two of the convenience functions */
+ EXPECT_TRUE (g_action_group_get_action_enabled (G_ACTION_GROUP (muxer), "first.one"));
+ g_simple_action_set_enabled (action, FALSE);
+ EXPECT_FALSE (g_action_group_get_action_enabled (G_ACTION_GROUP (muxer), "first.one"));
+
+ EXPECT_STREQ ((gchar *) g_action_group_get_action_parameter_type (G_ACTION_GROUP (muxer), "first.one"),
+ (gchar *) G_VARIANT_TYPE_STRING);
+
+ /* query_action */
+ g_action_group_query_action (G_ACTION_GROUP (group), "one",
+ &enabled[0], &param_type[0], &state_type[0], &state_hint[0], &state[0]);
+ g_action_group_query_action (G_ACTION_GROUP (muxer), "first.one",
+ &enabled[1], &param_type[1], &state_type[1], &state_hint[1], &state[1]);
+ EXPECT_EQ (enabled[0], enabled[1]);
+ EXPECT_STREQ ((gchar *) param_type[0], (gchar *) param_type[1]);
+ EXPECT_STREQ ((gchar *) state_type[0], (gchar *) state_type[1]);
+ EXPECT_TRUE (g_variant_equal0 ((gconstpointer) state_hint[0], (gconstpointer) state_hint[1]));
+ EXPECT_TRUE (g_variant_equal0 ((gconstpointer) state[0], (gconstpointer) state[1]));
+
+ g_object_unref (action);
+ g_object_unref (group);
+ g_object_unref (muxer);
+}
+
+typedef struct {
+ gboolean signal_ran;
+ const gchar *name;
+} TestSignalClosure;
+
+static void
+action_added (GActionGroup *group,
+ gchar *action_name,
+ gpointer user_data)
+{
+ TestSignalClosure *c = (TestSignalClosure *)user_data;
+ EXPECT_STREQ (c->name, action_name);
+ c->signal_ran = TRUE;
+}
+
+static void
+action_enabled_changed (GActionGroup *group,
+ gchar *action_name,
+ gboolean enabled,
+ gpointer user_data)
+{
+ TestSignalClosure *c = (TestSignalClosure *)user_data;
+ EXPECT_EQ (enabled, FALSE);
+ c->signal_ran = TRUE;
+}
+
+static void
+action_state_changed (GActionGroup *group,
+ gchar *action_name,
+ GVariant *value,
+ gpointer user_data)
+{
+ TestSignalClosure *c = (TestSignalClosure *)user_data;
+ EXPECT_STREQ (g_variant_get_string (value, NULL), "off");
+ c->signal_ran = TRUE;
+}
+
+static void
+action_removed (GActionGroup *group,
+ gchar *action_name,
+ gpointer user_data)
+{
+ TestSignalClosure *c = (TestSignalClosure *)user_data;
+ EXPECT_STREQ (c->name, action_name);
+ c->signal_ran = TRUE;
+}
+
+TEST(GActionMuxerTest, Signals) {
+ GSimpleActionGroup *group;
+ GSimpleAction *action;
+ GActionMuxer *muxer;
+ TestSignalClosure closure;
+
+ group = g_simple_action_group_new ();
+
+ action = g_simple_action_new ("one", G_VARIANT_TYPE_STRING);
+ g_simple_action_group_insert (group, G_ACTION (action));
+ g_object_unref (action);
+
+ muxer = g_action_muxer_new ();
+
+ g_signal_connect (muxer, "action-added",
+ G_CALLBACK (action_added), (gpointer) &closure);
+ g_signal_connect (muxer, "action-enabled-changed",
+ G_CALLBACK (action_enabled_changed), (gpointer) &closure);
+ g_signal_connect (muxer, "action-state-changed",
+ G_CALLBACK (action_state_changed), (gpointer) &closure);
+ g_signal_connect (muxer, "action-removed",
+ G_CALLBACK (action_removed), (gpointer) &closure);
+
+ /* add the group with "one" action and check whether the signal is emitted */
+ closure.signal_ran = FALSE;
+ closure.name = "first.one";
+ g_action_muxer_insert (muxer, "first", G_ACTION_GROUP (group));
+ EXPECT_TRUE (closure.signal_ran);
+
+ /* add a second action after the group was added to the muxer */
+ closure.signal_ran = FALSE;
+ closure.name = "first.two";
+ action = g_simple_action_new_stateful ("two", G_VARIANT_TYPE_STRING,
+ g_variant_new_string ("on"));
+ g_simple_action_group_insert (group, G_ACTION (action));
+ EXPECT_TRUE (closure.signal_ran);
+
+ /* disable the action */
+ closure.signal_ran = FALSE;
+ g_simple_action_set_enabled (action, FALSE);
+ EXPECT_TRUE (closure.signal_ran);
+
+ /* change its state */
+ closure.signal_ran = FALSE;
+ g_simple_action_set_state (action, g_variant_new_string ("off"));
+ EXPECT_TRUE (closure.signal_ran);
+ g_object_unref (action);
+
+ /* remove the first action */
+ closure.signal_ran = FALSE;
+ closure.name = "first.one";
+ g_simple_action_group_remove (group, "one");
+ EXPECT_TRUE (closure.signal_ran);
+
+ /* remove the whole group, should be notified about "first.two" */
+ closure.signal_ran = FALSE;
+ closure.name = "first.two";
+ g_action_muxer_remove (muxer, "first");
+ EXPECT_TRUE (closure.signal_ran);
+
+ g_object_unref (group);
+ g_object_unref (muxer);
+}
+
+static void
+action_activated (GSimpleAction *simple,
+ GVariant *parameter,
+ gpointer user_data)
+{
+ gboolean *signal_ran = (gboolean *)user_data;
+
+ EXPECT_STREQ (g_variant_get_string (parameter, NULL), "value");
+ *signal_ran = TRUE;
+}
+
+static void
+action_change_state (GSimpleAction *simple,
+ GVariant *value,
+ gpointer user_data)
+{
+ gboolean *signal_ran = (gboolean *)user_data;
+
+ EXPECT_STREQ (g_variant_get_string (value, NULL), "off");
+ *signal_ran = TRUE;
+}
+
+TEST(GActionMuxerTest, ActivateAction) {
+ GSimpleActionGroup *group;
+ GSimpleAction *action;
+ GActionMuxer *muxer;
+ gboolean signal_ran;
+
+ group = g_simple_action_group_new ();
+
+ action = g_simple_action_new ("one", G_VARIANT_TYPE_STRING);
+ g_simple_action_group_insert (group, G_ACTION (action));
+ g_signal_connect (action, "activate",
+ G_CALLBACK (action_activated), (gpointer) &signal_ran);
+ g_object_unref (action);
+
+ action = g_simple_action_new_stateful ("two", NULL,
+ g_variant_new_string ("on"));
+ g_simple_action_group_insert (group, G_ACTION (action));
+ g_signal_connect (action, "change-state",
+ G_CALLBACK (action_change_state), (gpointer) &signal_ran);
+ g_object_unref (action);
+
+ muxer = g_action_muxer_new ();
+ g_action_muxer_insert (muxer, "first", G_ACTION_GROUP (group));
+
+ signal_ran = FALSE;
+ g_action_group_activate_action (G_ACTION_GROUP (muxer), "first.one",
+ g_variant_new_string ("value"));
+ EXPECT_TRUE (signal_ran);
+
+ signal_ran = FALSE;
+ g_action_group_change_action_state (G_ACTION_GROUP (muxer), "first.two",
+ g_variant_new_string ("off"));
+ EXPECT_TRUE (signal_ran);
+
+ g_object_unref (group);
+ g_object_unref (muxer);
+}
diff --git a/test/test-gtest.cpp b/test/test-gtest.cpp
deleted file mode 100644
index 1cc97be..0000000
--- a/test/test-gtest.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-
-#include <glib.h>
-#include <gtest/gtest.h>
-
-extern "C" {
- #include "launcher-menu-item.h"
-}
-
-TEST(LauncherMenuItem, NameInitialized) {
- g_type_init();
- EXPECT_TRUE(true);
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 05:26:46 +0000