libayatana-indicator-0.9.4/AUTHORS0000644000000000000000000000344414566140211013546 0ustar Alexander Schlarb Allan LeSage Aurelien Gateau Charles Kerr Cody Russell Colin Watson Daniel d'Andrada Dani Llewellyn Didier Roche Didier Roche Eitan Isaacson Evgeni Golov György Balló Hernando Torque Iain Lane Iain Lane Javier Jardón Jonathan Riddell Karl Ken VanDine Lars Uebernickel Łukasz 'sil2100' Zemczak Luke Yelavich Marco Trevisan (Treviño) Marius Gripsgard Martin Pitt Mathieu Trudel-Lapierre Michael Terry Michael Terry Mike Gabriel Mikkel Kamstrup Erlandsen Neil Jagdish Patel Robert Ancell Robert Carr Robert Collins Robert Tari seb128 Sebastien Bacher Steve Langasek Ted Gould Ted Gould Ted Gould Till Maas Timo Jyrinki unknown William Hua libayatana-indicator-0.9.4/.build.yml0000644000000000000000000001304514566140211014374 0ustar ########################################################## # THE FOLLOWING LINES IS USED BY docker-build ########################################################## requires: archlinux: - autoconf-archive - clang - gcc - git - make - startup-notification - which - pacman - cmake - cmake-extras - gtk3 - glib2 # - ayatana-ido - gobject-introspection - gtk-doc - vala debian: # Useful URL: https://salsa.debian.org/debian-ayatana-team/libayatana-indicator - clang - clang-tools - cppcheck - git - libtool - cmake - cmake-extras - at-spi2-core - intltool - gtk-doc-tools - libglib2.0-dev - libgtk2.0-dev - libgtk-3-dev # - libayatana-ido3-dev - gobject-introspection - libgirepository1.0-dev - libx11-dev - libxi-dev - valac - dbus-test-runner - xauth - xvfb ubuntu: - clang - clang-tools - git - libtool - cmake - cmake-extras - at-spi2-core - intltool - gtk-doc-tools - libglib2.0-dev - libgtk2.0-dev - libgtk-3-dev # - libayatana-ido3-dev - gobject-introspection - libgirepository1.0-dev - libx11-dev - libxi-dev - valac variables: - 'CHECKERS=" -enable-checker deadcode.DeadStores -enable-checker alpha.deadcode.UnreachableCode -enable-checker alpha.core.CastSize -enable-checker alpha.core.CastToStruct -enable-checker alpha.core.IdenticalExpr -enable-checker alpha.core.SizeofPtr -enable-checker alpha.security.ArrayBoundV2 -enable-checker alpha.security.MallocOverflow -enable-checker alpha.security.ReturnPtrRange -enable-checker alpha.unix.SimpleStream -enable-checker alpha.unix.cstring.BufferOverlap -enable-checker alpha.unix.cstring.NotNullTerminated -enable-checker alpha.unix.cstring.OutOfBounds -enable-checker alpha.core.FixedAddr -enable-checker security.insecureAPI.strcpy"' before_scripts: - cd ${START_DIR} - if [ ! -d ayatana-ido-build ]; then - git clone --depth 1 https://github.com/AyatanaIndicators/ayatana-ido.git ayatana-ido-build - fi - cd ayatana-ido-build - cmake . -DCMAKE_INSTALL_PREFIX=/usr - make - make install - cd - - rm -Rf ayatana-ido-build/ build_scripts: - if [ ${DISTRO_NAME} == "debian" ];then - cppcheck --enable=warning,style,performance,portability,information,missingInclude . - fi - - mkdir build-gtk3/ - cd build-gtk3/ - if [ ${DISTRO_NAME} == "debian" ];then - scan-build $CHECKERS cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON -DFLAVOUR_GTK3=ON -DENABLE_WERROR=ON - else - scan-build $CHECKERS cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DFLAVOUR_GTK3=ON -DENABLE_WERROR=ON - fi - - if [ $CPU_COUNT -gt 1 ]; then - if [ ${DISTRO_NAME} == "debian" ];then - scan-build $CHECKERS --keep-cc --use-cc=clang --use-c++=clang++ -o html-report make -j $CPU_COUNT - make clean - fi - scan-build $CHECKERS --keep-cc -o html-report make -j $CPU_COUNT - else - if [ ${DISTRO_NAME} == "debian" ];then - scan-build $CHECKERS --keep-cc --use-cc=clang --use-c++=clang++ -o html-report make - make clean - fi - scan-build $CHECKERS --keep-cc -o html-report make - fi - cd ../ - - mkdir build-gtk3-no-IDO/ - cd build-gtk3-no-IDO/ - if [ ${DISTRO_NAME} == "debian" ];then - scan-build $CHECKERS cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON -DFLAVOUR_GTK3=ON -DENABLE_IDO=OFF -DENABLE_WERROR=ON - else - scan-build $CHECKERS cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DFLAVOUR_GTK3=ON -DENABLE_IDO=OFF -DENABLE_WERROR=ON - fi - - if [ $CPU_COUNT -gt 1 ]; then - if [ ${DISTRO_NAME} == "debian" ];then - scan-build $CHECKERS --keep-cc --use-cc=clang --use-c++=clang++ -o html-report make -j $CPU_COUNT - make clean - fi - scan-build $CHECKERS --keep-cc -o html-report make -j $CPU_COUNT - else - if [ ${DISTRO_NAME} == "debian" ];then - scan-build $CHECKERS --keep-cc --use-cc=clang --use-c++=clang++ -o html-report make - make clean - fi - scan-build $CHECKERS --keep-cc -o html-report make - fi - cd ../ - - mkdir build-gtk2/ - cd build-gtk2/ - if [ ${DISTRO_NAME} == "debian" ];then - scan-build $CHECKERS cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON -DFLAVOUR_GTK2=ON - else - scan-build $CHECKERS cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DFLAVOUR_GTK2=ON - fi - - if [ $CPU_COUNT -gt 1 ]; then - if [ ${DISTRO_NAME} == "debian" ];then - scan-build $CHECKERS --keep-cc --use-cc=clang --use-c++=clang++ -o html-report make -j $CPU_COUNT - make clean - fi - scan-build $CHECKERS --keep-cc -o html-report make -j $CPU_COUNT - else - if [ ${DISTRO_NAME} == "debian" ];then - scan-build $CHECKERS --keep-cc --use-cc=clang --use-c++=clang++ -o html-report make - make clean - fi - scan-build $CHECKERS --keep-cc -o html-report make - fi - cd ../ - - if [ ${DISTRO_NAME} == "debian" ];then - cd build-gtk3/ - ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test - cd ../ - cd build-gtk3-no-IDO/ - ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test - cd ../ - cd build-gtk2/ - ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test - cd ../ - fi libayatana-indicator-0.9.4/ChangeLog0000644000000000000000000055766214566140211014270 0ustar 2023-10-13 Mike Gabriel * release 0.9.4 (HEAD -> main, tag: 0.9.4) 2023-09-06 Robert Tari * Merge branch 'tyll-executable_so' (0d5eaeb) 2023-09-05 Till Maas * cmake: Install library as library (05e4368) 2022-10-26 Mike Gabriel * src/indicator-service.c: Fix Robert's lastname in license header. (bae7a9c) * release 0.9.3 (a62e8ca) (tag: 0.9.3) 2022-10-08 Mike Gabriel * Merge branch 'tari01-pr/fix-tooltip' (bf432c5) 2022-10-04 Robert Tari * src/indicator-ng.c: Do not show tooltip on labels while the menu is open (3ae6943) 2022-09-15 Mike Gabriel * release 0.9.2 (d9ca686) (tag: 0.9.2) 2022-07-15 Mike Gabriel * Merge branch 'tari01-pr/add-tooltips' (ad8abda) 2022-07-13 Robert Tari * src/indicator-ng.c: Add tooltip support (c065f45) 2022-07-15 Mike Gabriel * Merge branch 'tari01-pr/enable-werror' (4f306dd) 2022-07-13 Robert Tari * .build.yml: Build the GTK3 flavour with -Werror (a7b1463) 2022-07-15 Mike Gabriel * Merge branch 'tari01-pr/crash-on-session-error' (88a19ee) 2022-07-13 Robert Tari * src/indicator-service.c: Make failure to connect to the session DBus fatal (3db4f03) * Whitespace fix (755ee95) 2022-02-17 Mike Gabriel * release 0.9.1 (80dae40) (tag: 0.9.1) * Merge branch 'tari01-pr/cleanup-compile-flags' (4231e8b) 2022-02-17 Robert Tari * .build.yml: Drop extra compilation flags (cf542e4) * Clean up compilation flags (4b442de) 2022-02-08 Robert Tari * .travis.yml: Run CI builds on Travis CI's Ubuntu focal base system (47244a9) 2021-11-18 Robert Tari * Merge branch 'sunweaver-pr/dont-export-private-symbols' (7c5e41b) 2021-11-18 Mike Gabriel * debian/libayatana-indicator*-7.symbols: Drop private symbols again. (ceb487f) * src/{CMakeLists.txt,indicator.symbols}: Don't export private symbols. Immitate symbol exports as previously done with libtool. (7cfded8) 2021-11-17 Mike Gabriel * d/changelog: Raise upstream version of DEB builds, due to wrong package revision in 0.9.0 release. (659cc9c) * release 0.9.0 (6a16c6f) (tag: 0.9.0) 2021-11-10 Mike Gabriel * Merge branch 'tari01-pr/check-menu-item-name-null' (c118af3) 2021-11-05 Robert Tari * src/indicator-ng.c: Make sure old menu item name is not NULL before comparison (40e310b) 2021-11-01 Robert Tari * Merge branch 'sunweaver-pr/travis-cleanup' (71b39fb) 2021-10-26 Mike Gabriel * .build.yml: Remove source code of locally built dependency after it has been installed. (e43c209) * .build.yml: Run unit tests in build_scripts: target. (7839b52) * .build.yml: Drop autotools dependencies. (d995a6e) 2021-10-22 Robert Tari * Merge branch 'sunweaver-pr/gtk2-flavour-build-fix' (c9063c6) 2021-10-22 Mike Gabriel * debian/rules: Use one spelling for 'flavour'. (c15189f) * CMakeLists.txt: Don't build GTK2 flavour against GTK3. (bde82da) 2021-10-21 Mike Gabriel * Merge branch 'diddledani-icon-scaling' (99649c5) 2021-10-15 Dani Llewellyn * Scale icons when loading from filename (7e02a15) 2021-10-20 Robert Tari * .travis.yml: Temporarily disable ppc64le builds (1904f33) 2021-10-19 Robert Tari * Merge branch 'sunweaver-pr/different-folders-for-include-files-based-on-GTK-flavour' (79db730) 2021-09-20 Robert Tari * Fix copyright headers (eecd9dd) 2021-09-02 Robert Tari * Fix Travis status image (0b69ab9) 2021-10-19 Mike Gabriel * debian/libayatana-indicator*-dev.install: Ship include header files correctly in two separate dev:pkgs. (548d13a) * src/CMakeLists.txt: Use different include paths for GTK-2 and GTK-3 builds (even if header files are indentical). (6721575) 2021-09-20 Robert Tari * Fix copyright headers (7a377a1) 2021-09-02 Robert Tari * Fix Travis status image (4e7a5b1) 2021-08-29 Mike Gabriel * debian/{control,compat}: Bump to level 10. (18eade4) * debian/rules: Enable unit tests. (7f3efa9) 2021-08-28 Mike Gabriel * .travis.yml: Use Ayatana Indicators project's dev-scripts repo. (3c111d0) 2021-08-10 Mike Gabriel * Merge branch 'tari01-pr/add-enable-werror-option' (cb74130) 2021-08-09 Robert Tari * Add ENABLE_WERROR option (cb0c07e) 2021-06-27 Mike Gabriel * README.md: Add missing parenthesis close. (304b8b8) 2021-06-17 Mike Gabriel * debian/control: Drop B-D: dh-exec. Not needed anymore since removal of ayatana-indicator-common bin:pkg. (0275b35) * debian/rules: Drop remnants of ayatana-indicator-common (found in dh_install and dh_missing overrides). (3ccffba) 2021-06-16 Mike Gabriel * Merge branch 'tari01-pr/drop-ayatana-indicators-target' (9b15f3c) 2021-06-15 Robert Tari * debian/: Drop bin:pkg ayatana-indicator-common (moved to src:pkg libayatana-common). (1343147) * .build.yml: Remove systemd dependency. (888ceb9) * data/: Drop ayatana-indicators.target (moved to libayatana-common). (cbca7c3) 2021-06-10 Mike Gabriel * Merge branch 'tari01-pr/disable-loader' (0523726) 2021-06-10 Robert Tari * Add option to disable Loader build/installation (777d748) 2021-06-09 Mike Gabriel * Merge branch 'tari01-pr/cmake-install-full' (a25c5f1) 2021-06-08 Robert Tari * Use CMAKE_INSTALL_FULL_*DIR locations (dea96dd) 2021-06-08 Mike Gabriel * debian/control: Add D (libayatana-indicator3-dev): libayatana-ido3-dev. (912f071) 2021-05-25 Mike Gabriel * README.md: Slight adjustment to the .desktop file comparison. (f2b907a) * Merge branch 'tari01-pr/update-docs' (cd7c85d) 2021-05-24 Robert Tari * README: Drop old file (b4cb3aa) * Add documentation files (77c690f) 2021-05-17 Robert Tari * Merge branch 'sunweaver-pr/support-disabling-IDO' (a129e90) 2021-05-17 Mike Gabriel * Travis CI: Also test GTK+-3.0 builds with IDO support disabled. (99f8f1f) * CMakeLists.txt: Report more build parameters to stdout when CMake configures the build. (80253cf) * {,**/}CMakeLists.txt: Support builds against GTK+-3.0 with IDO support disabled. (b28e807) 2021-05-17 Robert Tari * Merge branch 'tari01-pr/fix-tests-and-coverage' (f6baada) 2021-05-16 Mike Gabriel * CMakeLists.txt: Fix coverage report. We need to reference the test executables here, not the test wrappers. (a914848) * tests/CMakeLists.txt: Rewrite to fix tests and coverage (49d522e) * Revert "tests/run-xvfb.sh: Drop file, not required with CMake." (9c35f2f) 2021-03-16 Robert Tari * tests/org.ayatana.indicator.test.service.in: Fix placeholder (629f2a7) * tests/service-manager-connect.service.in: Fix placeholder (e37c1b8) * tests/service-version-good.service.in: Fix placeholder (4a5c707) * tests/service-version-bad.service.in: Fix placeholder (b9842a3) * tests/session.conf.in: Fix placeholder (94ee3f9) * tests/test-indicator-ng.c: Enable all tests (8fe500d) 2021-05-14 Robert Tari * Merge branch 'sunweaver-pr/bring-back-gtk2-builds' (763acde) 2021-05-12 Mike Gabriel * Travis CI: Drop autotools support, build and test GTK+-2.0 and GTK+-3.0 flavours. (173f104) * debian/libayatana-indicator3-tools.install: Install ayatana-indicator3-loader test tool to LIBEXECDIR. (b2214f2) * debian/libayatana-indicator*-dev.install: No .a files shipped anymore. (08a856c) * debian/*.symbols: Update symbols files. (8eec783) * debian/rules: Run GTK2/GTK3 unit tests sequentially. (262df76) * debian/rules: Explicitly enable tests at build time. (0371084) * debian/rules: Adjust to CMake based build. (Fixes DEB builds after CMake switch). (73e6c3a) * debian/control: Adjust B-Ds for CMake based build. (1140a11) * CMakeLists.txt: Always builds indicator3 loader tool (not just when ENABLE_TESTS is set). (0a9b030) * Bring back GTK+-2.0 and GTK+-3.0 build flavours. (bfb679d) * tests/run-xvfb.sh: Drop file, not required with CMake. (c7a152a) * trim-lcov.py: Drop file, not required anymore with CMake. (e2d3331) */Makefile.am: Drop more remnants of autotools. (eb53143) * Merge branch 'tari01-pr/move-to-cmake' (025c376) 2021-02-10 Robert Tari * Append us to copyright headers (c277aa6) 2021-02-11 Robert Tari * Remove Automake-related files (e20daf6) * Add CMakeLists.txt files + tests/test-loader.c: fix library paths + Fix include paths (1fa174f) * tests/test-indicator-ng.c: disable menu test for now, it will not work with GCovr (729e95b) 2021-02-10 Robert Tari * Whitespace fix (1cba923) * Add ayatana-indicator3-0.4.pc.in to data (25c2922) * Move source files to src (b8b206c) 2021-05-06 Mike Gabriel * Travis CI: Also support CMake based CI builds. (13c1c80) 2021-05-06 Robert Tari * Merge branch 'sunweaver-pr/travis-ci-with-cmake-support' (aa6723b) 2021-05-06 Mike Gabriel * Travis CI: Also support CMake based CI builds. (bc6886f) 2021-05-04 Robert Tari * Merge branch 'sunweaver-pr/travis-ci' (d68a7de) 2021-05-04 Mike Gabriel * .build.yml: Build ayatana-ido from upstream Git rather than using the possibly outdate packaged version of ayatana-ido. (f2b0b01) * .travis.yml: Don't run autotools builds twice (once via script, once directly). (c58c269) * .travis.yml: Also do CI builds against Debian stable. (89db74c) * .travis.yml: Temporarily disable CI builds on ubuntu:rolling. Ubuntu's I series is not ready yet as docker container. (195c450) */Makefile.am: Drop -Werror compiler flag for now. Not helpful when setting up CI builds for dirty code. (246f41f) 2021-04-21 Mike Gabriel * .build.yml: Drop distcheck target. Not required. (1760be4) * .build.yml: Enable unit tests during configure. (a7375c8) * .build.yml: Output test-suite.log at the end of unit testings. (9b913f0) * .build.yml: No tests are run on Archlinux, neither are they run on Ubuntu. (962eea0) * .build.yml: Unit tests require xvfb (and xauth). (a849b4a) 2021-04-20 Mike Gabriel * tools/indicator-loader.c: Silence unused parameter warnings/errors for various functions. (1911cb3) * libayatana-indicator/indicator-service{,-manager}.c: Drop return statements and g_error_free() calls that never get reached. (8338069) * libayatana-indicator/indicator-ng.c: Stricter type usage when comparing Integer like variable. (ade4d68) * libayatana-indicator/indicator-ng.c: Silence unused parameter warnings/errors for various functions. (ad0e922) * libayatana-indicator/indicator-service-manager.c: Silence unused parameter warnings/errors for various functions. (432174b) * libayatana-indicator/indicator-service.c: Avoid error: use of GNU old-style field designator extension. (cc7f8ce) * libayatana-indicator/indicator-service.c: Silence unused parameter warnings/errors for callback functions. (995b2cd) * libayatana-indicator/indicator-image-helper.c: Silence unused parameter warnings/errors for callback functions. (b829a57) * libayatana-indicator/indicator-desktop-shortcuts.c: Avoid comparison of integers of different signs. Thanks to scan-build on Travis-CI. (7e70eb7) * Travis-CI: Also build against Ubuntu 20.04 (for Ubuntu Touch's sake). (4880df3) * Travis-CI: temporarily disable archlinux:latest CI builds. (e86d11e) * TRAVIS: Initial attempt to get TRAVIS CI working for this project. (5424403) 2021-02-03 Mike Gabriel * debian/rules: Don't build/run unit tests parallely. (5cd5b0c) * debian/control: Add B-D at-spi2-core. Fix FTBFS during unit tests. (9b1ca2a) 2021-02-03 Robert Tari * Merge branch 'sunweaver-pr/drop-Werror-flag-from-unit-test-builds' (84b7a79) 2021-02-03 Mike Gabriel * tests/Makefile.am: Drop -Werror from unit test builds. (800747d) 2021-01-25 Mike Gabriel * release 0.8.4 (9a887fb) (tag: 0.8.4) * Makefile.am: Set DISTCHECK_CONFIGURE_FLAGS. (d0abfc5) * debian/*: Update from official Debian packaging. (dec55b8) 2020-12-04 Robert Tari * Merge branch 'sunweaver-pr/debian-build-with-unit-tests' (6935c68) 2020-12-04 Mike Gabriel * configure.ac: Drop superfluous square bracket (typo fix). (0321918) * tests/Makefile.am: Wrap test-indicator-ng around Xvfb and dbus-runner. (d6b4c6b) * libayatana-indicator/indicator-ng.c: Only run gtk_box_set_spacing() if object to operate on is a GTK_BOX. (29f118a) 2020-12-04 Robert Tari * Merge branch 'sunweaver-pr/fix-typo-in-configure-ac' (fbb8dbe) 2020-12-04 Mike Gabriel * tests/Makefile.am: Wrap test-indicator-ng around Xvfb and dbus-runner. (fb1450e) * libayatana-indicator/indicator-ng.c: Only run gtk_box_set_spacing() if object to operate on is a GTK_BOX. (cbf345e) 2020-12-04 Robert Tari * Merge branch 'sunweaver-pr/fix-test-indicator-ng' (1f54cb3) 2020-12-04 Mike Gabriel * debian/rules: Enable unit tests after build. (fb9db8a) * configure.ac: Drop superfluous square bracket (typo fix). (6eab844) * tests/Makefile.am: Wrap test-indicator-ng around Xvfb and dbus-runner. (1a62e1e) * libayatana-indicator/indicator-ng.c: Only run gtk_box_set_spacing() if object to operate on is a GTK_BOX. (770efbc) 2020-11-09 Mike Gabriel * release 0.8.3 (4489b12) (tag: 0.8.3) 2020-10-30 Mike Gabriel * Merge branch 'tari01-pr/fix-menu-resizing' (2806da0) 2020-10-30 Robert Tari * indicator-ng.c: Fix menu resizing for all themes (f5663d0) 2020-09-10 Mike Gabriel * release 0.8.2 (afa8c6a) (tag: 0.8.2) * Merge branch 'tari01-pr/trim-lcov-py3' (cce52a7) 2020-09-10 Robert Tari * trim-lcov.py: Port trim-lcov to Python 3 (c310b42) 2020-09-08 Mike Gabriel * Merge branch 'tari01-pr/disable-menu-arrows' (6b0ca37) 2020-08-26 Robert Tari * Disable menu arrows (1df0f1d) 2020-09-08 Mike Gabriel * Merge branch 'tari01-pr/blank-label-padding-spacing' (2130f28) 2020-09-05 Robert Tari * indicator-ng.c: Fix padding and spacing for hidden indicator item labels (73fd4da) 2020-09-05 Mike Gabriel * Merge branch 'tari01-pr/blank-label' (cba1c3c) 2020-09-05 Robert Tari * indicator-ng.c: Do not hide image when toggling label visibility (d8b5315) * Whitespace fix (8c8822d) * Whitespace fix (8ccd3bc) 2020-09-05 Mike Gabriel * Merge branch 'tari01-pr/duplicate-locations' (242b20b) 2020-09-02 Robert Tari * Fix duplicate location in the datetime indicator. (6e5ab2c) 2020-08-26 Mike Gabriel * release 0.8.1 (f89575e) (tag: 0.8.1) * Merge branch 'tari01-pr/fix-menu-scrolling' (7ad3a78) 2020-08-25 Robert Tari * Enable menu scrolling + reset offset on popup (6de1c02) 2020-08-17 Mike Gabriel * Merge branch 'tari01-pr/multiple-messaging-clients' (cb4cf54) 2020-08-16 Robert Tari * Fix IDO insertion index in Indicator Messages with multiple clients (b6fd2c1) 2020-08-14 Mike Gabriel * release 0.8.0 (8beffb3) (tag: 0.8.0) * debian/control: Let ayatana-indicator-common break system indicators before 0.8.0 (except power indicator, that one before 2.1.0). (d87433d) * debian/control: Update versioned B-D on libayatana-ido3-dev to 0.8.0-0~. (758b74d) * configure.ac: Bump IDO_REQUIRED_VERSION to 0.8.0. (5afd8bf) 2020-08-14 Robert Tari * Fix width of menu panes. (0a798f3) 2020-08-13 Robert Tari * Merge branch 'sunweaver-pr/ayatanamenuitemfactory-from-ido' Attributes GH PR #15: https://github.com/AyatanaIndicators/libayatana-indicator/pull/15 (e9902ad) 2020-08-13 Mike Gabriel * Use ayatanamenuitemfactory.(c|h) from ayatana-ido. Reduce code duplications. (e34f12e) * Merge branch 'tari01-pr/ido-insertion-error-handling' (573e40f) 2020-08-13 Robert Tari * Try to prevent cascading failure if IDO creation fails (f0ee1df) 2020-08-11 Mike Gabriel * Merge branch 'tari01-pr/replace-x-canonical-attributes' (27f00a5) 2020-08-11 Robert Tari * Replace x-canonical attributes (004ae04) 2020-08-10 Mike Gabriel * debian/ayatana-indicator-common.links: Add FIXME/reminder to drop manual symlinking of systemd user service file once DH compat level is raised to a level above 12. (f57637e) * Merge branch 'ubports-fix-systemd' (985f492) 2020-08-09 Marius Gripsgard * Use indicators.target as the systemd lifecycle unit (42358cc) 2020-08-08 Robert Tari * Fix tests and deprecations (fixes #1) (7ceee62) 2020-07-31 Robert Tari * Merge pull request #5 from tari01/master (a5b1374) * Resize open menus as items change (e528ee8) 2020-07-28 Mike Gabriel * release 0.7.1 (74cfb21) (tag: 0.7.1) 2020-07-27 Robert Tari * Merge pull request #4 from tari01/master (a7c9a35) * Display and connect the Indicator Messages widgets (208176b) 2020-07-24 Mike Gabriel * debian/*: Update from official Debian packaging. (9a41af8) 2020-07-23 Mike Gabriel * release 0.7.0 (87e85c2) (tag: 0.7.0) 2020-07-22 Mike Gabriel * debian/libayatana-indicator3-7.symbols: Add new symbols, already targetting next upstream release. (e32b9d0) * libayatana-indicator/Makefile.am: Make sure, ayatanamenuitemfactory.c gets built during GTK-3 builds. (1917f00) 2020-07-22 Robert Tari * Display IDO widgets/Use own action muxer/Allow IDO CSS styling (b619354) 2020-07-22 Mike Gabriel * Merge branch 'ntninja-master' (c984cc5) 2019-12-12 Alexander Schlarb * Make building of `ayatana-indicator-loader3` optional (c6f93fe) 2019-11-20 Mike Gabriel * release 0.6.3 (faf2784) (tag: 0.6.3) * debian/rules: Switch from dh_install --fail-missing to dh_missing --fail-missing. (a5bc467) **/Makefile.am: Set -DGTK_DISABLE_DEPRECATED for gtk2 builds. Fixes FTBFS against Glib2.0 >= 2.62. (dd16c4c) 2019-08-29 Mike Gabriel * libayatana-indicator/indicator-object.c: Typo fix in comment. (b4a069f) 2018-11-05 Mike Gabriel * GObject private API/ABI: Get rid of g_type_class_add_private() and use DEFINE_TYPE_WITH_PRIVATE(). (a734066) * debian/control: Switch B-D from libayatana-ido3-0.4-dev -> libayatana-ido3-dev. (e8073fd) 2018-03-20 Mike Gabriel * release 0.6.2 (3927e0f) (tag: 0.6.2) * libayatana-indicator/indicator-ng.c: Type cast assignments from g_object_ref_sink(). (34b4321) * debian/control: Drop unneeded D (libayatana-indicator3-dev): libayatana-indicator-dev. (3b3c265) 2017-10-26 Mike Gabriel * Makefile.am: Drop distcheck features. (8de3f59) 2017-10-22 Mike Gabriel * debian/changelog: Fix source project name in most recent changelog stanza. (cffab72) 2017-09-27 Mike Gabriel * debian/changelog: post-release fix in date strings (2) (fb3d8fe) * debian/changelog: post-release fix in date strings (for 0.6.0 and 0.6.1) (7a2f684) 2017-09-23 Mike Gabriel * post-release fix-up of debian/changelog (4f355a3) 2017-09-22 Mike Gabriel * debian/rules: Drop dh_install call for bin:pkg -plibayatana-indicator-tools. We don't ship that anymore. (6233943) * debian/ayatana-indicator-common.install: Set x-bit on file permissions. (7222339) * release 0.6.1 (20640dd) (tag: 0.6.1) * debian/control: Add B-D systemd [linux-any]. (df6c2e9) * debian/{control,ayatana-indicators-common}: Leave ayatana-indicators-commin bin:package empty on non-systemd systems. (7bd1d1d) * configure.ac: Support pkg-config (<< 0.27). (afba9ad) * autotools: Make systemd dependency optional. This makes libayatana-indicator available on Debian GNU/kFreeBSD and Debian GNU/Hurd. (2b5c1b0) 2017-05-22 Mike Gabriel * debian/*: Adopt packaging improvements from official Debian package. (5ff7174) * release 0.6.0 (4fd7ae8) (tag: 0.6.0) * Add empty NEWS file to prevent FTBFS. (c49b409) * Update AUTHORS file. (9029a50) * Move NEWS -> NEWS.Canonical. (0409f01) * autogen.sh: Add 'ayatana-' to the PKG_NAME value. (820f332) * README: Update, don't mention Unity. We are non-Ubuntu centric. Also adapt path where indicator service files have to be placed. (6523f70) 2017-05-16 Mike Gabriel * Fix up for previous commit. (8c2a254) 2017-05-15 Mike Gabriel * One step back... Mimick Canonical's API. Use their namespace for item attributes. (ac3c960) * tools/80indicator-debugging: Adapt comment header to our fork. (9c42187) 2017-05-15 Ted Gould * ayatana-indicator-common: Add a package to hold shared systemd targets for systemd user session. (0f68605) 2017-05-15 Mike Gabriel * drop buildcruft file (4ab9812) * build system: Switch from gnome-common to mate-common. (c4a411d) 2016-02-19 Iain Lane * Add -lm via LDADD to resolve FTBFS in Ubuntu 16.04 and Debian stretch/unstable. (0871d14) 2015-11-16 Mike Gabriel * Use x-ayatanaindicator-* instead of x-canonical-*. (c9b08c1) * Makefile.am: Replace dist-hook for Bazaar based VCS repo against dist-hook for a Git based VCS repo. (1748add) 2015-11-11 Mike Gabriel * debian/libayatana-indicator*.symbols: Add .symbols files for shared libraries. (35fbed9) * debian/rules: Remove builddir/ and build-aux/ directories when auto-cleaning up package. (9469b6e) * Drop .bzrignore file. (ed550aa) 2015-11-10 Mike Gabriel * debian/changelog: Use a Debianinc revision in the package version (0.6.0 -> 0.6.0-0). (3682a7c) * debian/control: Fix build-dep issue for libayatana-ido3-0.4-dev. (9c0552f) 2015-11-07 Mike Gabriel * Various fixes for making the library name change complete. (fc142ac) 2015-11-06 Mike Gabriel * Fork libayatana-indicator from Ubuntu's libindicator shared library. (9d1b39f) 2014-09-22 CI bot * Releasing 12.10.2+14.10.20140922-0ubuntu1 (b1f280a) 2014-09-22 Marco Trevisan (Treviño) * IndicatorNG: Reverse the scroll delta on left scroll events (5ae6789) 2014-07-16 Marco Trevisan (Treviño) * IndicatorNG: Reverse the scroll delta on left scroll events (19b7298) * IndicatorLoader: convert gtk scroll events to indicator object events (1a211d6) * IndicatorLoader: add scroll-entry support (515f717) 2014-04-02 CI bot * Releasing 12.10.2+14.04.20140402-0ubuntu1 (14a8261) 2014-04-02 William Hua * Don't load using the icon info structure if it's a GBytesIcon. Fixes: 1293548 (e662c87) 2014-03-29 William Hua * Don't load using the icon info structure if it's a bytes icon. (68a5ec6) 2014-03-04 CI bot * Releasing 12.10.2+14.04.20140304-0ubuntu1 (1dc288c) 2014-03-04 Marco Trevisan (Treviño) * IndicatorImageHelper: always try to use a GIcon or the filename as source of the GdkImage (a0a0b28) 2014-03-03 Marco Trevisan (Treviño) * IndicatorImageHelper: let's use the actual icon file if its height is less than ICON_SIZE (844e1b5) * IndicatorLoader: Make sure that we load the icon at its original size, if not higher than IMAGE_SIZE (8a1bdd7) 2014-02-28 Marco Trevisan (Treviño) * ImageHelper: set image from icon name if we have the filename (acf1752) * IndicatorImageHelper: always try to use a GIcon or the file-name as source of the Gdk image (12db08f) 2014-02-18 CI bot * Releasing 12.10.2+14.04.20140218-0ubuntu1 (517d1b4) 2014-02-18 Marco Trevisan (Treviño) * IndicatorObject: add parent_window parameter to IndicatorEntry (31d0819) 2014-02-13 Marco Trevisan (Treviño) * IndicatorObject: add parent_window parameter to IndicatorEntry (9affd1f) 2014-01-29 CI bot * Releasing 12.10.2+14.04.20140129-0ubuntu1 (a7660e5) 2014-01-29 Lars Uebernickel * indicator-ng: support "submenu-action" on root menu items Fixes: 793450 (ced7687) * indicator-ng: support "submenu-action" on root menu items (239817c) 2014-01-17 Łukasz 'sil2100' Zemczak * Sync trunk with what's in the archive (759fdd8) 2013-12-20 Colin Watson * Use named icons rather than (deprecated) stock items. Fixes: https://bugs.launchpad.net/bugs/1262626. (b7f9938) * Use named icons rather than (deprecated) stock items. (a1e5383) 2013-12-19 Lars Uebernickel * Don't treat deprecation warnings as errors and fix indicator-ng test for gtk 3.10. Fixes: https://bugs.launchpad.net/bugs/1262626. (f6b60f1) * test-indicator-ng: adapt to new gtkmodelmenuitem widget structure (b2d4deb) * Don't treat deprecation warnings as errors (ef145fc) 2013-11-25 Automatic PS uploader * Releasing 12.10.2+14.04.20131125-0ubuntu1 (revision 517 from lp:libindicator). (a1318f0) * Releasing 12.10.2+14.04.20131125-0ubuntu1, based on r517 (cef38fd) 2013-10-31 Timo Jyrinki * Sync changelog from what's in archive. (69132b0) 2013-10-29 Lars Uebernickel * Allow setting different positions for each profile in indicator files (cf5ac5e) 2013-10-24 Charles Kerr * When we can't get a handle to the bus, exit gracefully instead of crashing. Fixes: https://bugs.launchpad.net/bugs/1218222. (773d09b) 2013-10-23 Charles Kerr * minor cleanup in the dispose() and finalize() functions (2d8ee13) * When we can't get a handle to the system bus, exit gracefully instead of crashing. (40b4288) 2013-10-17 Lars Uebernickel * indicator-ng: always create entry.label and entry.image (de95588) * indicator-ng: always create entry.label and entry.image (244d618) * Warn when an indicator doesn't get respawned anymore. (ccf83ad) 2013-10-16 Lars Uebernickel * Warn when an indicator doesn't get respawned anymore (0a9a95f) 2013-10-10 Lars Uebernickel * Allow setting per-profile positions in indicator files (478ea09) 2013-09-13 Automatic PS uploader * Releasing 12.10.2+13.10.20130913-0ubuntu1 (revision 511 from lp:libindicator). (a52033e) * Releasing 12.10.2+13.10.20130913-0ubuntu1, based on r511 (f5e4716) 2013-09-09 Lars Uebernickel * Expose scrolling and middle clicking to fix bug #1221242 and #1204036 (make scrolling and middle clicking work on the sound indicator). Fixes: https://bugs.launchpad.net/bugs/1204036, https://bugs.launchpad.net/bugs/1221242. (5878e6b) * Remove debug message (9e857c3) * Support x-canonical-secondary action (bb39362) * Support "x-canonical-scroll-action" (f4fa566) 2013-08-23 Automatic PS uploader * Releasing 12.10.2+13.10.20130823-0ubuntu1 (revision 509 from lp:libindicator). (86f3d9e) * Releasing 12.10.2+13.10.20130823-0ubuntu1, based on r509 (415565b) 2013-08-22 Marco Trevisan (Treviño) * IndicatorDesktopShortcuts: add support to Path key for shortcut items. Fixes: https://bugs.launchpad.net/bugs/1113883. (b47e0f1) * IndicatorDesktopShortcut: fix indentation (59a242d) * IndicatorDesktopShortcuts: restore previous working dir if we changed it (427b5d5) 2013-08-09 Marco Trevisan (Treviño) * IndicatorDesktopShortcuts: use g_key_file_get_string for path (6d93aba) 2013-08-08 Marco Trevisan (Treviño) * IndicatorDesktopShortcuts: add support to Path key for shortcut items (c0bb294) 2013-07-31 Automatic PS uploader * Releasing 12.10.2+13.10.20130731-0ubuntu1 (revision 507 from lp:libindicator). (f695712) * Releasing 12.10.2+13.10.20130731-0ubuntu1, based on r507 (a8df6b3) 2013-07-30 Charles Kerr * in indicator-loader3, if we're looking at an ng-style indicator, show all of its profiles instead of just one. (ae7687c) 2013-07-26 Charles Kerr * explicitly set UBUNTU_MENUPROXY to 0 (e430061) * more copyediting. why am I awake? (f842a80) * copyediting: fix linewraps (5acc284) 2013-07-25 Charles Kerr * plug a keyfile leak (7f61992) * in indicator-loader, show =all= the profiles (083af7d) 2013-07-19 Automatic PS uploader * Releasing 12.10.2+13.10.20130719-0ubuntu1 (revision 505 from lp:libindicator). (ce7a42f) * Releasing 12.10.2+13.10.20130719-0ubuntu1, based on r505 (ed00a13) 2013-07-18 Marco Trevisan (Treviño) * IndicatorDesktopShortcuts: fix memory leak, free groupheader. (0c4921a) 2013-07-17 Marco Trevisan (Treviño) * IndicatorDesktopShortcuts: free groupheader (598c4b7) 2013-07-02 Automatic PS uploader * Releasing 12.10.2+13.10.20130702-0ubuntu1 to ubuntu. (507e694) * Releasing 12.10.2+13.10.20130702-0ubuntu1, based on r503 (4cacb64) 2013-06-28 Lars Uebernickel * Add support for indicators to tell the panel where they'd like to appear (4ec8c2f) * indicator-object: g_return_if_fail -> g_return_val_if_fail (e7e2b63) * README: include information about the new Position key in indicator files (9090409) * Allow indicators to tell the panel where they want to appear (e744e38) 2013-06-28 Automatic PS uploader * Releasing 12.10.2+13.10.20130628-0ubuntu1 to ubuntu. (3470db7) * Releasing 12.10.2+13.10.20130628-0ubuntu1, based on r501 (55e85a1) 2013-06-27 Charles Kerr * Fixes a crasher bug in ng's parsing of the response to org.freedesktop.DBus.StartServiceByName: The result's variant format is "(u)", not "u". (b4ea3e7) * in indicator_ng_service_started(), the result's variant type should be parsed as '(u)' rather than 'u' (104bcd6) 2013-06-19 Automatic PS uploader * Releasing 12.10.2daily13.06.19.1-0ubuntu1 to ubuntu. (7bd4548) * Releasing 12.10.2daily13.06.19.1-0ubuntu1, based on r499 (0bb928f) 2013-06-19 Didier Roche * Add missing conflicts/replaces (1b0f90a) 2013-06-17 Charles Kerr * in indicator_ng_update_entry, unconditionally call set_label, set_icon, set_accessible. Previously these were only called if the respective fields weren't NULL, which made it impossible to, for example, turn off a label or icon once it had been set. (20c7b65) 2013-06-16 Charles Kerr * in indicator_ng_update_entry, unconditionally call set_label, set_icon, set_accessible. Previously these were only called if the respective fields weren't NULL, which made it impossible to, for example, turn off a label or icon once it had been set. (d5d01f6) 2013-06-07 Lars Uebernickel * indicator-ng: properly fail when keyfile doesn't exist. (d5fd946) 2013-06-07 Ted Gould * Remove the GTK2 version of the tools. (b094931) * Gone. (1c70a2e) * Move the debugging environment variables into the other tools package (277ba85) * Don't build the GTK2 tools (3c96b99) 2013-06-07 Lars Uebernickel * indicator-ng: properly fail when keyfile doesn't exist (2014454) * Merge lp:~larsu/call-ido-init (1d4bcdd) * Merge lp:~larsu/new-indicator-file-format (12cc75f) 2013-06-07 Automatic PS uploader * Releasing 12.10.2daily13.06.07-0ubuntu1 to ubuntu. (060711f) * Releasing 12.10.2daily13.06.07-0ubuntu1, based on r492 (2edf591) 2013-06-04 Lars Uebernickel * Revert r490 (4adb2af) 2013-05-29 Lars Uebernickel * indicator-ng: fix crash (0d3ebcb) 2013-05-29 Marco Trevisan (Treviño) * tests: fix compilation and make check. (8b78ada) * IndicatorDesktopShortcuts: Use the proper way to create an AppInfo from command-line (ab3b6ee) 2013-05-29 Ted Gould * Migrating away from deprecated gtk_icon_info_free(). (d652787) * Handling the deprecation of gtk_icon_info_free() (b46f29a) 2013-05-27 Lars Uebernickel * debian/control: add ido dependency (f9c0971) 2013-05-24 Lars Uebernickel * IndicatorNg: update indicator file format (9627530) * refactor indicator_ng_initable_init (2712010) 2013-05-23 Lars Uebernickel * Depend on ido and call ido_init() in indicator-loader (a591305) * indicator-image-helper: stop using deprecated gtk_icon_info_free() (f77f41e) 2013-05-22 William Hua * Use GIcon's serialization/deserialization interface for indicator icons so that we can load icons as PNG data transmitted over the bus. (ae198af) 2013-05-19 William Hua * Code clean-up. (176ea14) 2013-05-03 Automatic PS uploader * Releasing 12.10.2daily13.05.02-0ubuntu1 to ubuntu. (5cac96c) 2013-05-02 Automatic PS uploader * Releasing 12.10.2daily13.05.02-0ubuntu1, based on r487 (0496a1f) 2013-05-02 Mathieu Trudel-Lapierre * Merge changelog changes from /13.04 branch for saucy. (3022eec) * Merge changelog changes from /13.04 branch for saucy. (4d59f6f) 2013-04-26 William Hua * Clean up error checking. (bab64c4) * Don't free label and accessible_desc. (83fef72) * Remove changelog entry. (5d6adee) 2013-04-22 William Hua * [ William Hua ]; debian/control: - Bump GLib to 2.37. configure.ac: - Bump GLib to 2.37. libindicator/indicator-image-helper.c: - Support display of GBytesIcons.; libindicator/indicator-ng.c: - Change action state icon type to GVariant. (19ec649) 2013-04-19 Marco Trevisan (Treviño) * IndicatorDesktopShortcuts: some code cleanup (f88266a) 2013-04-12 Marco Trevisan (Treviño) * tests: fix compilation and make check. (5c5f778) * IndicatorDesktopShortcuts: initialize flags using the default define (7f0c703) * IndicatorDesktopShortcuts: Use the proper way to create an AppInfo from command-line (0312ffa) 2013-04-09 Marco Trevisan (Treviño) * IndicatorDestkopShortcuts: add StartupNotify parameter in our internal fake .desktop file (4d64b71) * IndicatorDestkopShortcuts: add StartupNotify parameter in our internal fake .desktop file (bd9abfc) 2013-04-05 Marco Trevisan (Treviño) * IndicatorDestkopShortcuts: add indicator_desktop_shortcuts_nick_exec_with_context (2d418a6) * IndicatorDestkopShortcuts: fix indentation (07652a3) * IndicatorDestkopShortcuts: add missing include and deprecate old function (c539c37) * IndicatorDestkopShortcuts: add indicator_desktop_shortcuts_nick_exec_with_context (2fba148) 2013-03-25 Lars Uebernickel * indicator-ng: allow a dictionary as the root action's state (ffbb3c1) 2013-03-25 Charles Kerr * indicator-loader: add command line option to specify profile (b046c93) 2013-03-22 Charles Kerr * init the GError pointer to NULL (f25cc33) * introduce tab damage for consistency with the rest of indicator-loader.c (98cae79) * add the option to specify the profile from the command line (22d673c) 2013-03-21 Lars Uebernickel * indicator-ng: allow a dictionary as the root action's state (8232ab0) 2013-03-18 Mathieu Trudel-Lapierre * Revert "indicator-ng: allow a dictionary as the root action's state". (61d0f80) * Revert: indicator-ng: allow a dictionary as the root action's state (c5f002f) 2013-03-13 Lars Uebernickel * indicator-ng: allow a dictionary as the root action's state (daf0dc9) * indicator-ng: allow a dictionary as the root action's state (610b2cc) 2013-02-25 Automatic PS uploader * Releasing 12.10.2daily13.02.25-0ubuntu1 to ubuntu. (208d1ba) * Releasing 12.10.2daily13.02.25-0ubuntu1, based on r479 (5074c9d) 2013-02-22 Iain Lane * Install the gtk2 library into the multiarch directory. Fixes: https://bugs.launchpad.net/bugs/1131708. (3a73f29) * Use $(COMMON_CONFIGURE_FLAGS) instead of hardcoding (319a606) * Install shared library into correct (multiarch) directory (286882c) * Disable silent rules for more useful build logs (31368ce) 2013-02-19 Automatic PS uploader * Releasing 12.10.2daily13.02.19-0ubuntu1 to ubuntu. (150610d) * Releasing 12.10.2daily13.02.19-0ubuntu1, based on r477 (da40ae8) 2013-02-15 Michael Terry * Multiarch for most of libindicator is fine. But the indicators themselves should continue to be installed in the same (non-multiarch) directory, for historical reasons. Fixes: https://bugs.launchpad.net/bugs/1126360. (d24848f) * hard-code indicatordir to not use multiarch locations (6aea07d) 2013-02-15 Automatic PS uploader * Releasing 12.10.2daily13.02.15-0ubuntu1 to ubuntu. (85c8d1c) * Releasing 12.10.2daily13.02.15-0ubuntu1, based on r475 (cdfa9f5) 2013-02-14 Lars Uebernickel * Add IndicatorNg. (d05835e) * indicator-ng: add license header (40d7c42) 2013-02-06 Lars Uebernickel * indicator-ng: don't hide the indicator if the service is already running (88aa74b) * indicator-ng: try to restart the service when it crashes (f9f86fb) 2013-01-30 Lars Uebernickel * indicator-ng: simplify flow in initable_init (8ff25e5) 2013-01-25 Lars Uebernickel * trim-lcov.py: add license header (dce947b) * indicator-ng: use strlen instead of hard coding the length (c02297d) * indicator-ng: use indicator_image_helper (9c857a3) * indicator-ng: lazily allocate entry.label and entry.image (7048092) * indicator-ng: require header item to have x-canonical-type set (82ecfaa) 2013-01-24 Lars Uebernickel * indicator-ng: check return value of g_menu_model_get_item_attribute (f02ca5a) * indicator-ng: document error conditions in menu_changed (db1caf2) * indicator-ng: save unnecessary allocations by using "&" in g_variant_get (088b36b) * indicator-ng: show broken image when g_icon_for_string returns NULL (05535f5) * indicator-ng: use an IndicatorObjectEntry internally (f3f4e1f) 2013-01-23 Lars Uebernickel * Add trim-lcov.py (e096111) * indicator-ng: test indicator_ng_get_property (af0137c) * indicator-ng: more elaborate testing (0996bce) * indicator-ng: set name hint to the value of the service file's "Name" field (e07deff) * indicator-ng: use base->get_entries to get the invisible ones, too (739daae) * indicator-ng: auto start service if it's not running (ac0c809) 2013-01-22 Lars Uebernickel * indicator-ng: properly unset action group when the service disappears (67323d4) 2013-01-21 Lars Uebernickel * Add basic tests for indicator-ng (d84d6f7) * Make sure indicator-ng.h is installed (36e0fea) * indicator-ng: add getters (1585adb) * indicator-ng: add indicator_ng_new_for_profile (4b301ff) * indicator-ng: fix crash (tried to free a string with g_object_unref) (869d977) * indicator-ng: always set an accessible description to avoid imminent warning (af3ac65) * indicator-ng.h: use local include (ca52243) 2013-01-18 Lars Uebernickel * Bump gtk3 dependency for gtk_widget_insert_action_group (3822cf9) * Only build and use IndicatorNg in the gtk3 build (aaae4aa) * Add IndicatorNg (3a33240) 2012-11-26 Didier Roche * Add bootstrap message. (e796648) * add bootstrap message (7b8e551) 2012-11-26 Ted Gould * Import debian/ from lp:~ubuntu-desktop/libindicator/ubuntu. (810eada) 2012-11-22 Mathieu Trudel-Lapierre * Add and export DPKG_GENSYMBOLS_CHECK_LEVEL. (f77d6dd) * Add the proper Pre-Depends: multiarch to libindicator3-7. (93e0bd1) * - Use calls to dh_install per-package to use the right source directories.; debian/*.install: drop the debian/tmp/gtk* path elements and update for multiarch. (5576bf0) * debian/compat: bump compat level to 9. (094593a) * Update Vcs-Bzr, Vcs-Browser and add a notice to uploaders. (1d6bc1d) 2012-11-21 Mathieu Trudel-Lapierre * Add a Build-Depends on gnome-common. (e16a126) * Override dh_autoreconf to run autogen.sh and not call configure. (5680639) * Drop Build-Depends on cdbs. (d1e3acb) * debian/rules: - Convert to using the dh9 sequencer. (3d69e24) * Bump debhelper Build-Depends to (>= 9). (9ec2a25) * debian/control: - Reorganize Build-Depends for clarity. - Update style to be consistent with other indicator stack packages. (30aa94e) * Specify to bzr-builddeb to build the package in split mode. (7a3c457) * Import debian/ from lp:~ubuntu-desktop/libindicator/ubuntu (ac60524) 2012-09-19 Ken VanDine * releasing version 12.10.1-0ubuntu1 (85dbd2d) * Import upstream version 12.10.1 (96f010d) 2012-09-19 Charles Kerr * 12.10.1 (341548e) 2012-09-17 Didier Roche * releasing version 12.10.0-0ubuntu2 (2f35a94) * Backport a fix so that libroffice doesn't hang on on startup (LP: #1045372) (0dc2913) 2012-09-12 Charles Kerr * In libindicator, remove the cloak/decloak code in IndicatorObject to address Bug #1045372. (667fbaf) 2012-09-11 Charles Kerr * In tests/test-loader and tests/dummy-indicator-visible.c, support hiding & re-showing IndicatorObjectEntries by caching their parent widgetry instead of using gtk_widget_destroy() (00d0556) * No newline at end of file (ee19af5) * remove the cloak/decloak widget logic (bf9cf29) 2012-07-12 Sebastien Bacher * releasing version 12.10.0-0ubuntu1 (bdeeb47) * New upstream release. (d739399) * Import upstream version 12.10.0 (edcdb07) 2012-07-11 Charles Kerr * bump version to 12.10.0 (b1beb2c) 2012-06-19 Lars Uebernickel * merge lp:~charlesk/libindicator/fix-test-sources (d2f8fce) 2012-06-18 Charles Kerr * merge lp:~evgeni/libindicator/multiarch-same-devheaders so that we don't include build-time filenames in comments of the enum header files. (20cafa4) * fix copy-and-paste error in specifying the tests' source files (26dcee4) 2012-06-10 Evgeni Golov * don't include build-time filenames in comments of the enum header files (5d3f97c) 2012-04-23 Charles Kerr * merge lp:~charlesk/libindicator/cxx to constify the constructors for indicator_service_manager (1271439) 2012-04-22 Charles Kerr * indiator_service_manager_new*()'s name arguments were gchar*, make them const gchar* (670e6e0) 2012-04-11 Ken VanDine * releasing version 0.5.0-0ubuntu1 (f26bd55) * New upstream release. * Validate images in image_helper_update() (LP: #946408) (c606a9a) 2012-04-11 Charles Kerr * releasing version 0.5.0-0ubuntu1~ppa1 (752101a) * New upstream release. * Validate images in image_helper_update() (LP: #946408) (499bd67) * Import upstream version 0.5.0 (21ef9a5) * Sync from Ubuntu Desktop (0bd650d) * 0.5.0 (1cbe933) (tag: 0.5.0) * merge lp:~charlesk/libindicator/lp-946408 to safeguard against invalid images being passed to indicator_image_helper_update() (c721d3e) * in indicator_image_helper_update(), test the image argument with GTK_IS_IMAGE before using it. (bb571a4) 2012-04-05 Sebastien Bacher * releasing version 0.4.95-0ubuntu1 (d538aa4) 2012-04-04 Ted Gould * Fixing a merge artifact (696375c) * Merging Ubuntu Desktop (5a163f4) * releasing version 0.4.95-0ubuntu1~ppa1 (f9220e1) * New upstream release. * Fix a free that shouldn't be (LP: #969360) * Spelling mistake in error message (LP: #948391) * Add coverage build targets * Fix building AUTHORS and Changelog at dist time (d431c78) * Import upstream version 0.4.95 (c136bda) * 0.4.95 (f75080c) (tag: 0.4.95) 2012-04-03 Charles Kerr * merge lp:~allanlesage/libindicator/TDD to remove a dependency on gcovr, move gcov targets to their own makefile, and clean up .gcno files. (fae66e8) * merge lp:~charlesk/libindicator/lp-948391 to fix spelling/grammar errors in an error message. (2f67706) 2012-04-02 Charles Kerr * Fix spelling/grammar errors in an error message. (f7eab1e) * When using g_variant_get("&s...", &string), the string must not be free'd. (96c35f0) 2012-04-02 Sebastien Bacher * releasing version 0.4.94-0ubuntu2 (4a44539) * Revert r457 it's creating invalid free errors (486523c) 2012-04-01 Marco Trevisan (Treviño) * Setting again the variables as const (a9c0407) * Indicator Service Manager: we don't have to free values if got with &s from variant (c4b2952) 2012-03-30 Ken VanDine * releasing version 0.4.94-0ubuntu1 (5ce6cdf) * New upstream release. * Fix a leaked GError (LP: #965459) * Fix memory leak when the proxy's name changes. (63d1c95) 2012-03-29 Charles Kerr * releasing version 0.4.94-0ubuntu1~ppa1 (28d27ed) * New upstream release. * Fix a leaked GError (LP: #965459) * Fix memory leak when the proxy's name changes. (50933a9) * Import upstream version 0.4.94 (4ecaca4) * Sync from Ubuntu Desktop (452f2ab) * merge lp:~charlesk/libindicator/fix-disthook to fix auto-generation of AUTHORS and Changelog by looking for 'missing' in the directory where we told AC_CONFIG_AUX_DIR to put it. (5a839c4) (tag: 0.4.94) * look for 'missing' in ac_aux_dir rather than top_srcdir. (2eb70f4) 2012-03-28 Charles Kerr * 0.4.94 (922d781) 2012-03-27 Allan LeSage * Removed gcovr dependency, moved coverage targets to own makefile, cleaning up *.gcno. (76fc7f0) 2012-03-26 Charles Kerr * merge lp:~htorque/libindicator/fix-small-leak to fix a GError memory leak reported in lp bug #965459 (603ad6c) 2012-03-26 Hernando Torque * Free GError. (3440ebe) 2012-03-16 Charles Kerr * fix minor memory leak when the proxy name changes (742fa8c) 2012-03-08 Sebastien Bacher * releasing version 0.4.93-0ubuntu1 (9a23466) 2012-03-07 Ted Gould * releasing version 0.4.93-0ubuntu1~ppa1 (bbbe42a) * New upstream release. * Fix branching past initialization of variables (LP: #939061) * Support new FD.o Desktop Actions (LP: #942042) * Fix valgrind error on unload (LP: #719457) (e34b660) * Import upstream version 0.4.93 (67872e2) * Merging in U. Desktop (c83d72a) * 0.4.93 (18d670b) (tag: 0.4.93) 2012-03-05 Charles Kerr * merge lp:~ted/libindicator/lp719457 for Bug #719457 (9dcb929) 2012-03-02 Ted Gould * Attaching bug (039c7d8) * Copying the name before using it to remove as it seems that the unwatch can cause the name to be free'd in some cases. Odd, but valgrind can find it (c3bd07e) * Support new FD.o Desktop Actions (dbaf540) 2012-03-02 Sebastien Bacher * releasing version 0.4.92-0ubuntu2 (94c7bd6) * Backport support for the fdo desktop action spec, that's required to get unity lists to work with the new syntax (lp: #942042) (0c90dd3) 2012-02-29 Charles Kerr * lp:~charlesk/libindicator/fix-939061 (54a3d1d) * silence Coverity warning "PW.BRANCH_PAST_INITIALIZATION - CID 10615" reported in Bug #939061 (9e2278a) * tweak: use g_clear_object() instead of if-not-null-g_object_unref() (b645480) 2012-02-27 Ted Gould * Get the right group in exec too! (a69f559) * Handling the different group names when getting the name as well (f6d6509) * Update test desktop file (8c71262) * Creating a warning for the legacy support (19c48bd) * Adding a value for whether it should use the TargetEnvironment, I'm removing the warning because we don't care to fix old stuff anymore (7d3e660) * Use the appropriate list of nicks and groups to find our data now (52c42ef) * Figure out what kind of actions we have (4baf9b7) * Adding a state variable to track what kind of actions we have (f7e5502) * Attaching bug (a02d4de) * Changing our defines around to make sure to mark things the way that we think about them. (55b0614) 2012-02-23 Sebastien Bacher * releasing version 0.4.92-0ubuntu1 (f6f9209) * Merging shared upstream rev into target branch. (efe75e4) * Prepared upstream tree for merging into target branch. (cfa1adf) * Merging shared upstream rev into target branch. (164055c) * Prepared upstream tree for merging into target branch. (e305ff2) 2012-02-23 Ted Gould * releasing version 0.4.92-0ubuntu1~ppa1 (c28e242) * New upstream release. * Removing unenforcable consts (LP: #937387) * Explicitly add in gmodule as a required library (27b2576) * Import upstream version 0.4.92 (169093d) * Merge with U. Desktop (87c4364) * Merging shared upstream rev into target branch. (1474099) * Prepared upstream tree for merging into target branch. (c88ba65) * Merging shared upstream rev into target branch. (4de00dd) * Prepared upstream tree for merging into target branch. (54b8584) * 0.4.92 (69f15f7) (tag: 0.4.92) 2012-02-22 Ted Gould * Remove unenforcable consts (f29a183) * Attaching bug (fef88fa) * Removing unenforcable consts (975ee36) 2012-02-15 Sebastien Bacher * releasing version 0.4.91-0ubuntu3 (55ae526) * Restore revision dropped by error, not sure what happened with the vcs (a6436f6) * releasing version 0.4.91-0ubuntu2 (461dbdc) * Merging shared upstream rev into target branch. (2ac2e54) * Prepared upstream tree for merging into target branch. (93e5e7e) 2012-02-14 Ted Gould * releasing version 0.4.91-0ubuntu1~ppa3 (457b502) * Adjusting timeout so it'll build on the buildds too (4621a45) * Increasing the test timeout to ensure that's not our issue (0cad2e2) * releasing version 0.4.91-0ubuntu1~ppa2 (e5053ae) * debian/rules: Adding messages (17133c0) 2012-02-14 Sebastien Bacher * releasing version 0.4.91-0ubuntu1 (5a2f66b) * Import upstream version 0.4.91 (f8e24ae) 2012-02-14 Ted Gould * Explicitly listing gmodule as a library we're using (ee6a7f0) * releasing version 0.4.91-0ubuntu1~ppa1 (05f46d7) * debian/control, debian/rules: * Adding in autoreconf support * Adding a check rule and requiring new build deps (7f1272a) * debian/control, debian/rules: Adding in autoreconf support (36b39c9) * Upstream Merge * Explicitly add in gmodule as a required library (eb803e8) * Explicity add gmodule in the list of required libraries (45aebde) * Dropping debian/patches (b2a5f94) * New upstream release. * Visibility fixes for indicators using that functionality * Ensure that parent_object is more aggressively set * Fix memory leak on groups of items in desktop files (40274af) * Import upstream version 0.4.91 (a820ba7) * Merge with Ubuntu Desktop (ca8b363) * 0.4.91 (f099181) (tag: 0.4.91) 2012-02-13 Lars Uebernickel * indicator_object_set_visible: only emit entry-{added,removed} when visibility actually changed (2a6c388) * indicator_object_dispose: remove unneeded list of entries (b2ca0db) * indicator_object_dispose: use _set_visible instead of reimplementing it (73c0659) * indicator_object_set_visible: no need to check for ENTRY_INIT (e7780ac) 2012-02-12 Lars Uebernickel * indicator_object_set_visible: only emit entry-{added,removed} when visibility actually changed (5f599a8) 2012-02-10 Ted Gould * Free groupname after usage (233fdd7) 2012-02-09 Daniel d'Andrada * Plug memory leak in parse_keyfile function. (2375490) 2012-02-03 Ted Gould * Be more agressive in ensureing the parent_object value is available everywhere. (238865c) 2012-02-03 Marco Trevisan (Treviño) * tests, DummyIndicatorSignaler: free the allocated memory. (7ae413b) 2012-01-26 Ken VanDine * releasing version 0.4.90-0ubuntu4 (b339871) (tag: 0.4.90-0ubuntu4) 2012-01-25 Ken VanDine * releasing version 0.4.90-0ubuntu3 (a98a0b6) (tag: 0.4.90-0ubuntu3) 2012-01-25 Marco Trevisan (Treviño) * Test loader: check also for parent changes (c87aff7) * Tests: update dummy signaler to work with real IndicatorObjectEntry (39cf870) * IndicatorObject: update object parent in any case. (1baaf28) 2012-01-25 Ted Gould * Merging with U. Desktop (8df8585) 2012-01-25 Marco Trevisan (Treviño) * Added better parent_object tests. (c26badd) * Indicator-Object: update the parent_object value only if the entry is valid. (c9df18b) * IndicatorObject: correctly initialize the parent object. (0373d6f) 2012-01-24 Ken VanDine * releasing version 0.4.90-0ubuntu2 (118a95a) (tag: 0.4.90-0ubuntu2) * releasing version 0.4.90-0ubuntu1 (6659abf) (tag: 0.4.90-0ubuntu1) * New upstream release. * Support hiding and showing indicators * Track the parent object in the entry * Adding activate function to include Window ID; debian/control: Bumping ABI version of lib (2d9e6ff) 2012-01-24 Ted Gould * Silent bump (c2596f7) * releasing version 0.4.90-0ubuntu1~ppa1 (f64689a) * debian/control: Bumping ABI version of lib (f131f1f) * New upstream release. * Support hiding and showing indicators * Track the parent object in the entry * Adding activate function to include Window ID (b00b35a) * Import upstream version 0.4.90 (e81d0ec) * Merging from U. Desktop (fe22121) * 0.4.90 (dbccdd5) (tag: 0.4.90) 2012-01-23 Ted Gould * Bumping the ABI version (6f3976c) * Add visibility concept to the default indicator object (23e9995) * Put the parent pointer in the entry struct to make it easier for the implementers of the panel side (7935501) 2012-01-23 Charles Kerr * "bzr merge lp:indicator" + conflict resolution in tests suite (95daf10) * another iteration of the indicator-object visibility support patch, incorporating ideas from discussion with ted (4f4190f) 2012-01-20 Charles Kerr * fix bugs in IndicatorObject's visibility support. (8cb8b9f) 2012-01-19 Ted Gould * Checking to ensure the parent_object pointer gets set (a1ed503) * Adding a warning for entries that do not set their parent_object (e14c087) * Set the parent_object on the default entry (f2f9c5b) * Adding a parent object pointer to the entry (8a739e1) * Adding a window ID function to pass the window ID (1cf6a97) 2012-01-16 Ted Gould * Moving the function into the tester to making linking simpler (6a0f41a) * Adding a test to look to make sure the fallback works (f898563) 2012-01-14 Ted Gould * Add a function to swap out the window entry handler (2dfe3ff) * Getting the header in dist (da798a2) * Adding a test functioin for the entry func demmy indicator (7586398) * Mark the entry functions as called (b7c8a63) 2012-01-13 Ted Gould * Setting up entry functions (efcb3e6) * Adding some public values to know if functions were called (530b211) * Moving things into a shared header (347ab41) * Build a new dummy indicator (68c1666) * Adding test coverage checking (e3ce551) * Clearing the entry function pointers (0419bac) * Handling the activate_window function and going up the stack (a88097a) * Documenting what this stuff does (a6ed65a) * Adding an activate window function, that can also be virtual! (2bb19db) * Ignoring all the stuff we build (976209f) * Putting the GTK3 headers in a different directory (b58d9bf) * Adding ability to disable tests (c3c1ebb) 2012-01-13 Charles Kerr * Better implementation. (c52fbaa) 2012-01-12 Charles Kerr * initial revision for GSettings/GtkMenu visibility support (d3392a9) 2011-12-06 Allan LeSage * Added coverage reporting via gcov config and targets. (b1aebe5) 2011-11-22 Ken VanDine * debian/control - set ubuntu-desktop VCS and maintainer (30ab1ed) * releasing version 0.4.1-1 (f1c0aaf) (tag: 0.4.1-1) 2011-11-20 György Balló * Use different directory for headers of gtk3 library (d126352) * Make building tests optional (c0ac60b) 2011-09-28 Ken VanDine * releasing version 0.4.1-0ubuntu1 (5834d28) (tag: 0.4.1-0ubuntu1) * New upstream release. * Ensure loader doesn't use menu proxy (1a1fa5b) 2011-09-28 Ted Gould * releasing version 0.4.1-0ubuntu1~ppa1 (80e619f) * New upstream release. * Ensure loader doesn't use menu proxy (86103c5) * Import upstream version 0.4.1 (e36cd22) * Merge U. Desktop (e33473c) * 0.4.1 (a5c7874) (tag: 0.4.1) 2011-09-20 Ken VanDine * releasing version 0.4.0-0ubuntu1 (4993a3c) (tag: 0.4.0-0ubuntu1) * New upstream release. * Add libm to linking to fix FTBFS (LP: #840514) (ceba790) 2011-09-20 Ted Gould * Make sure our menus don't get proxied (6c215ec) 2011-09-19 Ted Gould * releasing version 0.4.0-0ubuntu1~ppa1 (2867575) * New upstream release. * Add libm to linking to fix FTBFS (LP: #840514) (0ab41b7) * Import upstream version 0.4.0 (0b4f5b3) * Merging in U. Desktop (8ec147c) * 0.4.0 (f8f310d) (tag: 0.4.0) 2011-09-16 Ted Gould * Add in libm (fff5af0) 2011-09-03 Evgeni Golov * find and link libm (240eaf6) 2011-09-01 Steve Langasek * releasing version 0.3.93-0ubuntu2 (130ebff) (tag: 0.3.93-0ubuntu2) * Drop the Breaks: against old versions of libindicator and libindicator3; there are no file conflicts between the libraries, so this doesn't accurately reflect the package relationships but does make it harder to calculate upgrades from natty. LP: #839098. (604acbf) 2011-08-11 Sebastien Bacher * releasing version 0.3.93-0ubuntu1 (4db9d2e) (tag: 0.3.93-0ubuntu1) * New upstream release. (871b89e) 2011-08-11 Ted Gould * releasing version 0.3.93-0ubuntu1~ppa1 (5600252) * New upstream release. * Rescan icon theme if icon can't be loaded (0aaf53b) * Import upstream version 0.3.93 (7b63153) * 0.3.93 (e2b7e82) (tag: 0.3.93) 2011-08-10 Ted Gould * Check a reload of the icon theme if needed (0a66155) 2011-08-02 Aurelien Gateau * Ask GTK to rescan the icon theme if the wanted icon cannot be found. (1790510) 2011-07-29 Ted Gould * Don't make a new include directory based on GTK version (a51845f) 2011-07-21 Ken VanDine * releasing version 0.3.92-0ubuntu1 (8ee4d7d) (tag: 0.3.92-0ubuntu1) * setting to UNRELEASED (24063df) * New upstream release. * Adding support for a secondary activate signal (7c76a87) 2011-07-21 Ted Gould * releasing version 0.3.92-0ubuntu1~ppa1 (23239f8) * Merge with U. Desktop (6c59bf9) * New upstream release. * Adding support for a secondary activate signal (056b8a5) * Import upstream version 0.3.92 (5d457c5) * Making sure the lib builds before the tests or tools (e27e7f6) * 0.3.92 (0cee12c) (tag: 0.3.92) * Adding in secondary activate support (d3de40a) * Dropping the x and y paramaters from the secondary activate signal (4234bd3) 2011-07-15 Ken VanDine * releasing version 0.3.91-0ubuntu1 (69b8236) (tag: 0.3.91-0ubuntu1) * New upstream release. * Fix signals with NULL entries in the loader * Adding a comment for setting up debugging options * Adding annotations for GIR files * Fixing watchers hashtable to detect when we have none * Fix testing so no tests are XFAIL anymore * Adding a replace mode for testing indicator services * Watching new services when the name switches (2801a02) 2011-07-14 Ted Gould * releasing version 0.3.91-0ubuntu1~ppa1 (8641c27) * New upstream release. * Watching new services when the name switches (d2d9780) * Import upstream version 0.3.91 (6032a84) * 0.3.91 (c6d763c) (tag: 0.3.91) * Fixing the libindicator test suite (a6ea476) 2011-07-12 Ted Gould * Adding an env variable to put a service in replace mode (445e65a) * releasing version 0.3.90-0ubuntu2~ppa2 (7989399) * Upstream Merge * Watching new services when the name switches (45d7404) * Watching when we do name switches (2e66ca5) * releasing version 0.3.90-0ubuntu2~ppa1 (aad5364) * Adding a replace mode for testing indicator services (37c5aa9) * * Fixing watchers hashtable to detect when we have none * Fix testing so no tests are XFAIL anymore (522f3c0) * Upstream Merge * Fix signals with NULL entries in the loader * Adding a comment for setting up debugging options * Adding annotations for GIR files (3d6738f) * Merging in U. Desktop (8b9fa18) * Adding in the shutdown function (1838bfc) * In replace mode we need to ask the other guy to shutdown and still wait for the name a bit. (5de36e3) * Adding in a property for being in replace mode (b412bfe) 2011-07-11 Ted Gould * Cleaning up removal of watchers as the string was getting free'd before it could get used to remove the entry from the hashtable. Now using a destroy function as that is possible with GDBus but wasn't with dbus-glib (64c3e2e) * Define the bus well known type in the session.conf file (269f1a1) * Add the PC file instead of replace it (0c3a685) * Handle NULL entries without crashing (ee27186) 2011-07-09 Marco Trevisan (Treviño) * Added support for secondary activate signal: i.e. middle-click (6f1c8e0) 2011-07-07 Ted Gould * Installing the debugging env entries in shared directory instead of the executable one. (ca29a76) * Fixing doc string (2016fdf) * Anotating the get entires function properly. (d7f14c3) 2011-07-08 Marco Trevisan (Treviño) * Merging with trunk (5f78a77) 2011-07-08 Robert Ancell * Annotate the return value of indicator_object_get_entries so that the type in the list is known, also fix typo in docstring (801419b) 2011-07-07 Ken VanDine * releasing version 0.3.90-0ubuntu1 (b414e0f) (tag: 0.3.90-0ubuntu1) * debian/rules - Simplify the dual builds with cdbs - Fixed package names to match soname; debian/*.install fixed paths to work with the dual builds chang. tools/Makefile.in - Fixed path for xsessiondi. debian/control - Fixed package names to match soname (c292980) * Make xsessiondir = $(pkgdatadir) (d23b4e8) * New upstream release. * Build Fixes * Adding license to test files (LP: #684886) * Bump API/ABI versions appropriately and make easier to edit them in the future * Adding a name-hint to the indicator entries * Merging scroll functions into a single good one (LP: #804618); debian/*install, control: Changing ABI version number bump in package names; debian/rules: Making GTK2 the special case as GTK3 is default now; debian/*install: Fixing pkgconfig file names (95d709f) * Changed to help message for --with-gtk to reflect the new default (dedf43d) 2011-07-07 Ted Gould * Making the box function conditional on GTK version (352c01a) * releasing version 0.3.90-0ubuntu1~ppa1 (8677620) * Fixing the box usage (1e09013) * Handling the right box for the right version of GTK (14cdff4) * debian/*install: Fixing pkgconfig file names (24123eb) * debian/*install, control: Changing ABI version number bump in package names; debian/rules: Making GTK2 the special case as GTK3 is default now (f44a6bc) * New upstream release. * Build Fixes * Adding license to test files (LP: #684886) * Bump API/ABI versions appropriately and make easier to edit them in the future * Adding a name-hint to the indicator entries * Merging scroll functions into a single good one (LP: #804618) (709208d) * Import upstream version 0.3.90 (c103417) 2011-07-06 Ted Gould * 0.3.90 (9cca8d7) (tag: 0.3.90) * Cleaning up the built pc file (cce6c17) * Switch to using gtk_box_new() (6f2f147) * Making some test XFAIL and attaching to bugs (fb0fab8) * Adding headers to tests (b0f700d) * Adding license info to [ch] files (2d3893c) * Sync to U. Desktop (9a18c1c) * Changing the API and ABI versioning slightly (02fb5cb) * Adding in the name hint for the indicators (e2a324a) 2011-07-05 Ted Gould * Setting default GTK version to 3 (173c8a7) * Changing the pkgconfig file version to include the API version (f5575b5) * Clearing our local name_hint and ensuring we fill it if a function is provided. (f837b4b) * Adding a get name hint function as well. (26c580f) * Adding the naming hint to the entry structure (7797504) * Making the API and ABI versions variables (746cf4e) * Adding another level of .in for the pc files. (f3dc285) * Switching to single scrolling event. (5a535d1) 2011-07-02 Marco Trevisan (Treviño) * Merging "scroll" and "scroll-entry" into the "entry-scrolled" signal (8881229) 2011-06-29 Ken VanDine * releasing version 0.3.22-0ubuntu2 (36fb97c) (tag: 0.3.22-0ubuntu2) 2011-06-16 Ted Gould * Updating autotools (5fdfbbe) 2011-06-15 Javier Jardón * configure.ac: Generate xz tarballs with pax format by default (9adf0b1) * Update autotools configuration (c8c7cf8) 2011-03-23 Ken VanDine * releasing version 0.3.22-0ubuntu1 (052a740) (tag: 0.3.22-0ubuntu1) 2011-03-23 Ted Gould * releasing version 0.3.22-0ubuntu1~ppa1 (97e2fed) * New upstream release. object is in. (LP: #703555) (47a97e2) * Import upstream version 0.3.22 (50607d3) * 0.3.22 (f9f5cee) (tag: 0.3.22) * Adding API to know what the environment the indicator is in (6f1e50b) 2011-03-22 Ted Gould * releasing version 0.3.21-0ubuntu2~ppa1 (a774a41) * Upstream Merge * Adding the ability to know the environment the indicator object is in. (118b8f0) * Sync U. Desktop (a075227) * Adding a nice little checking function (a995a11) * Adding an environments variable and make a lifecycle for it. (5712d44) * Getting some stub functions in (8673e8f) * Making the environments a list of strings (baf04be) 2011-03-16 Ken VanDine * releasing version 0.3.21-0ubuntu1 (1b0f902) (tag: 0.3.21-0ubuntu1) 2011-03-16 Ted Gould * releasing version 0.3.21-0ubuntu1~ppa1 (b36a867) * New upstream release. ∘ Don't check for TargetEnvironment on the desktop group (c393bc6) * Import upstream version 0.3.21 (e2b7096) * Merge with U. Desktop (54ae143) * 0.3.21 (c245779) (tag: 0.3.21) * Fix checking for target environment on the desktop group (bbae0db) * Make sure not to use TargetEnvironment on the desktop group (690ffa9) 2011-03-03 Ken VanDine * releasing version 0.3.20-0ubuntu1 (5b51dc5) (tag: 0.3.20-0ubuntu1) 2011-03-03 Ted Gould * releasing version 0.3.20-0ubuntu1~ppa1 (879dc15) * New upstream release. * Use the "TargetEnvironment" key in shortcuts (53895da) * Import upstream version 0.3.20 (48d8752) * 0.3.20 (12047a5) (tag: 0.3.20) * Use the TargetEnvironment key (dd2660b) * Merging in Robert's branch (440c893) * Merge from U. Desktop (f0e21d0) 2011-03-02 Ted Gould * Removing warning that there are no shortcuts, that's a valid thing to have. (61e9b95) * Adding a target environment key and checking for that over others. (9b34e7c) 2011-02-23 Ken VanDine * releasing version 0.3.19-0ubuntu3 (f417427) (tag: 0.3.19-0ubuntu3) * releasing version 0.3.19-0ubuntu2 (58dbd1d) (tag: 0.3.19-0ubuntu2) 2011-02-23 unknown * debian/control: - Use new GTK3 package naming (38d7280) 2011-02-17 Ken VanDine * releasing version 0.3.19-0ubuntu1 (04397e7) (tag: 0.3.19-0ubuntu1) 2011-02-17 Ted Gould * releasing version 0.3.19-0ubuntu1~ppa1 (6ca27e8) * debian/control: Adding Breaks for the previous library rev so that users don't end up with systems that use both. (4447040) * debian/*: Changing the library major version from 2 to 3 (2dae441) * New upstream release. ∘ Adding in a11y description support ∘ Fixing distcheck (LP: #587811) (20ef744) * Import upstream version 0.3.19 (7840128) * Merging in U.Desktop (6c89ab0) * 0.3.19 (27d0798) (tag: 0.3.19) 2011-02-16 Ted Gould * Returning reserveds as we're breaking ABI anyway (0cfa5a8) * Bumping the major version of the lib and the indicator directory (518f847) * Merging support for having an accessible description (01fe1bc) * Fixing makefile to include all the necissary files in dist (2b78c2f) 2011-02-15 Ted Gould * Adding the service.in files as well (e137b60) 2011-02-15 Sebastien Bacher * Add session.conf.in to dist (27cdc75) 2011-02-08 Luke Yelavich * accessible_name -> accessible_desc in tests as well (a512745) * accessible_name -> accessible_desc to better reflect the use of the content.; Add accessible-desc-update signal so that indicators can tell indicator-applet/unity that the accessible description has changed (f593012) 2011-02-01 Luke Yelavich * use const gchar for variable and prototype (855d354) * Merge from trunk (d50d1bb) 2011-01-27 Ken VanDine * releasing version 0.3.18-0ubuntu1 (326b5bf) (tag: 0.3.18-0ubuntu1) 2011-01-27 Ted Gould * releasing version 0.3.18-0ubuntu1~ppa1 (1246174) * debian/rules: Updating shlibs (4a4ca1e) * New upstream release. * Adding a signal for scrolling that includes the entry (517ff3c) * Import upstream version 0.3.18 (b22f471) * 0.3.18 (9ac5519) (tag: 0.3.18) * Adding a signal for scrolling that includes the entry (ded377c) 2011-01-27 Marco Trevisan (Treviño) * Removed typo in code. (d903523) * Added support for "signal-entry" signal (5873fe7) 2011-01-18 Luke Yelavich * Add accessible_name variable in indicator entry structure (9215e19) 2011-01-14 Ted Gould * releasing version 0.3.17-0ubuntu1~ppa1 (7f4196b) * Sync to Ubuntu Desktop (5400cb9) * New upstream release. * Fixing catching services dropping off (b5161b9) * Import upstream version 0.3.17 (fde4196) * 0.3.17 (ab0f0ab) (tag: 0.3.17) 2011-01-13 Ted Gould * Use dbus name watches instead of g-owner-change signal for watching for restarts. (afe5430) 2011-01-13 Michael Terry * use actual DBus NameOwnerChanged interface rather than GDBus's higher level signal because that one only works for well-known names (084d3e8) * fix basename issue when make is given full path (4098f74) 2011-01-13 Sebastien Bacher * releasing version 0.3.16-0ubuntu1 (3814e3d) (tag: 0.3.16-0ubuntu1) 2011-01-13 Ted Gould * releasing version 0.3.16-0ubuntu1~ppa1 (b988044) * Syncing to upstream (3f20962) * New upstream release. (917061a) * Import upstream version 0.3.16 (22a9ca4) * 0.3.16 (ee32949) (tag: 0.3.16) 2011-01-10 Ted Gould * releasing version 0.3.15-0ubuntu3~ppa2 (cf88225) * Final GDBus port (bd88281) * debian/control: Dropping dbus-glib as a build-dep (990356c) * Upstream Merge: * GDBus Port; autogen.sh * debian/control: Migrating library versions from 1 to 2 (6a01298) * Adding a signal for the menu being closed. (38af4e8) * Fixing doc strings (2b6655f) * Porting to GDBus (48db67a) 2011-01-09 Ted Gould * Making the test suite compile again (2bf1edb) * Using the GCancellable to detect if we're already creating a proxy so that we don't do it twice. (4a3d68b) * Using variant_unref instead of object_unref as it's a variant (664e39b) * Adding a virtual function for closing the menu and a wrapper for it. (a17110e) * releasing version 0.3.15-0ubuntu3~ppa2~gdbus1 (f8bea0d) * Reverting this change made by distro (48fb94f) * Marshaller fixes (bea872d) * Might need these (13a284f) * debian/control: Migrating library versions from 1 to 2 (7404425) * autogen.sh (c6cd9bb) * Upstream Merge: * GDBus Port (6b2531c) * Making getting the proxy and watching cancellable so that we don't get weird crashes. (8d3f43f) * Adding in the ability to cancel the connection on short lived objects. (2fb32b9) 2011-01-07 Ted Gould * Removing a test that is broken at a lower level (9911397) * Disabling the launch test temporarily as it seems broken in GLib (64ef206) * Getting test suite build fixes (ac7444c) * Syncing up to trunk (dc5880f) * Switching to the session bus (2bbbabc) * Out of order parameters. (32515c5) * Fixing the linking of the tests to the right libs (e837ae5) * Adding in creating the interface info from the XML files (20f3cbb) * Replacing the service proxy with a brand new GDBus one (70bfa89) * Ignoring the new files (a6e9bff) * Removing the bus and dbus_proxy variables as we won't need them anymore. (037ed98) * Switching around headers to the new world order (9552d2d) * Instead of setting up a proxy to watch the watcher we're setting up a bus name watch on each one. (33afd01) * Little clean-ups the compiler found now that it's more happy. (991b87f) * Switch over to getting the GDBus bus instead of the dbus-glib one (2696619) * Removing unused prototypes (d75fce1) * Fleshing out the bus_method_call functions and tying them into the traditional start points from dbus. (4607834) * Switching the way that we get a name on dbus and removing the dbus_proxy which was used for this previously. (30703e3) * Setting up the VTable (844bccb) * Switching the registration of the object over. (6ff24e1) * Parsing the XML file for the interface description on class init (0627083) * Removing the dbus-glib headers (55ae3fd) * Changing the way the dbus xml is handled. (977ed23) 2011-01-06 Ted Gould * Fixing the GTK3 include path. (f7b8662) 2011-01-06 Ken VanDine * fixed the includedir (c30de62) 2011-01-06 Ted Gould * Fixing build source path and build a GTK3 loader (8877308) * Adding an important field to relate to when to show the indicator. (7a02225) * Removing dbus-glib from the build (71e8858) 2011-01-04 Ted Gould * Adding a function to check whether we should show the indicator with priority. (5de24f6) * Making it a real signal now (9497666) * Adding a show now state to indicate priority. (18a5e64) 2010-12-08 Ted Gould * releasing version 0.3.15-0ubuntu3~ppa1 (356af1c) * debian/libindicator3-dev: Adding in the include files for this version of the library. (d85d476) * debian/libindicator-tools: Removing indicator-loader3 (8dd8160) * Merging in dual build from Ubuntu Desktop (809366b) 2010-12-06 Ken VanDine * releasing version 0.3.15-0ubuntu2 (c5c78aa) (tag: 0.3.15-0ubuntu2) 2010-12-03 Ken VanDine * releasing version 0.3.15-0ubuntu1 (1bce6ba) (tag: 0.3.15-0ubuntu1) 2010-11-24 Ken VanDine * removed empty dir (5247eb9) * debian/rules - Added build targets to build with gtk3 enabled in additional to default build with gtk. debian/control - Updated build depends to support building with gtk+-3.0 - Added dh-autoreconf build depends - Added libindicator3-1, libindicator3-dev, libindicator3-tools binaries binarie. libindicator/Makefile.am and tools/Makefile.am - Fixes needed for building with-gtk=3 (8915dd5) * Use abs_srcdir to find template files (fbef9e6) * Build indicator-loader3 (b0c8eb1) * New upstream release. * Adding a small file to set debugging environment variables * Allowing to build for GTK 2/3 and build parallel libraries; debian/control: Adding package libindicator-debugenv (1a4eadc) 2010-11-11 Ted Gould * releasing version 0.3.15-0ubuntu1~ppa1 (e87aa8f) * New upstream release. * Allowing to build for GTK 2/3 and build parallel libraries (3f4743e) * Import upstream version 0.3.15 (df21e79) * 0.3.15 (7d8375c) (tag: 0.3.15) * Fixing the ignore file tarball matching (db16c1f) * Merging in the GTK3 basis for the build (e6a847b) * Making sure to get both pc files in the tarball (10d7e22) * Checking for deprecations and making sure we check on distcheck (75672d5) * Putting the GTK3 indicators in a different directory. (5c848a1) * Updating ignore for the GTK3 stuff (40d11e1) * Merging in trunk to solve conflicts (69960b2) 2010-10-15 Ted Gould * releasing version 0.3.14-0ubuntu2~ppa1 (273cfca) * debian/control: Adding package libindicator-debugenv (d6160f5) * Autogen (32b0c1c) * Upstream Merge * Adding a small file to set debugging environment variables (917a1ae) * Merging in Ubuntu desktop (879ce43) * Adding a file to have the debugging environment variables (022e4bf) * Add mean comment (b877951) * Adding a number in the name (0f99ed2) * Installing the environment file in the session dir (2e3ea76) * All the environment flags we should set for debugging (fc94eab) 2010-10-06 Michael Terry * instead of always building gtk2 and gtk3, add a --with-gtk= flag to configure to specify which to build with (ecc6acd) 2010-09-22 Didier Roche * releasing version 0.3.14-0ubuntu1 (948cb8e) (tag: 0.3.14-0ubuntu1) * redo removed adjustements (98f804c) 2010-09-21 Ted Gould * releasing version 0.3.14-0ubuntu1~ppa1 (ac662a1) * New upstream release. * Adding a function to signal a menu is shown * Changing indicator directory to '4' (3acdbe7) * Import upstream version 0.3.14 (b91aaa9) * 0.3.14 (558a37d) (tag: 0.3.14) * Changing AUTHORS to mention it's built (53e57ef) * Adding dist hooks for AUTHORS and ChangeLog (25d85a1) * Merging in Debian branch (137e0f1) * releasing version 0.3.13-0ubuntu2~ppa2 (32bad82) * Updating with Desktop version and undoing some changes. (bd75a2c) * Setting right VCS directories (027d9ed) * Drop duplicate changelog entry (6b3ded7) * Merge from Ubuntu Desktop (c5216ef) 2010-09-21 Didier Roche * ppa version (4b5bf4f) * - rename to soname bump; debian/libindicator1.install: rename to soname bump; debian/rules: update MAKESHLIBS_ARGS (f7bd202) * debian/control: - put the Vcs-Bzr to point the right official branch (5ca6086) * debian/source: - don't use quilt format, it's making the daily build not working (c667aaf) 2010-09-19 Ted Gould * releasing version 0.3.13-0ubuntu1~ppa3 (2af3961) * debian/rules: * Dropping the simple patch system * Changing the shlibs to libindicator1 (a006528) * releasing version 0.3.13-0ubuntu1~ppa2 (3e7cedb) * Upstream Merge * Adding a function to signal a menu is shown * Changing indicator directory to '4'; debian/control: Switching from libindicator0 to libindicator1 as we've broken ABI. Conflicting with libindicator0 to make upgrade simpler as it doesn't make sense to have both installed.; Autogen update (49b7043) * Sync to trunk (bf38aa8) * Adding in the about-to-show signal (982c91c) 2010-09-17 Ted Gould * debian/control: Replaces really needs to be conflicts. You don't want both of these. (daaf146) * releasing version 0.3.13-0ubuntu1~ppa2~ats3 (8d7fd13) * Autogen update (e51d89f) * releasing version 0.3.13-0ubuntu1~ppa2~ats2 (aafdfdf) * Upstream Merge * Making the library different (fb8a5c2) * Adding some version information so we don't need a conflicts (03641dc) 2010-09-16 Ted Gould * releasing version 0.3.13-0ubuntu1~ppa2~ats1 (5be1cb6) * Changing indicator directory to '4' (7cabb61) * Changing indicator directory to '4' (99dc263) * debian/control: Switching from libindicator0 to libindicator1 as we've broken ABI. (afe60bd) * Upstream Merge * Adding a function to signal a menu is shown (ebe26f6) * Creating a callback on the loader to signal the event press down to the entry. (6269aec) * Fleshing out the entry activate function (daffbe6) * Breaking the ABI and adding a subclassable function. (64db4d0) * Adding a function to push activate back down. (90b4c19) 2010-09-15 Ken VanDine * releasing version 0.3.13-0ubuntu1 (617263e) (tag: 0.3.13-0ubuntu1) 2010-09-15 Ted Gould * releasing version 0.3.13-0ubuntu1~ppa1 (0bcacdc) * New upstream release. (a2df60e) * Import upstream version 0.3.13 (b675da7) * 0.3.13 (bc8ba95) (tag: 0.3.13) * Printout on menu showing in the loader (c587ca3) * Putting a printout in for showing menus. (b933e7c) 2010-09-14 Ted Gould * releasing version 0.3.12-0ubuntu2~ppa1 (74b347a) * Flipping PPA version around (ed40c3c) * Merge with Ubuntu Desktop (06c1df5) * releasing version 0.3.12-0ubuntu1~ppa2 (f09d026) * Upstream Merge * Adding a menu_show signal (4e26272) * Adding a menu_show signal (f0cd004) * Adding in the signal for the menu showing (69221d8) * Forgot the signal name (06b5084) * Adding slot for the menu show signal (98ec2f3) 2010-08-18 Ken VanDine * releasing version 0.3.12-0ubuntu1 (ab54852) (tag: 0.3.12-0ubuntu1) 2010-08-18 Ted Gould * releasing version 0.3.12-0ubuntu1~ppa1 (8839b12) * Merging in Ubuntu Desktop branch (6152054) * New upstream release. * Removing a g_error that was breaking Unity on failed icons (d097561) * Import upstream version 0.3.12 (5c85a79) * 0.3.12 (7df0fe9) (tag: 0.3.12) * Fixing a g_error so we don't kill unity (3a8fac7) 2010-08-16 Ted Gould * Changing the message to a warning and clearing the GtkImage. (6878f17) 2010-08-13 Ted Gould * Adding debug flag (6a055d8) 2010-08-13 Sebastien Bacher * releasing version 0.3.11-0ubuntu2 (79f7355) (tag: 0.3.11-0ubuntu2) 2010-08-13 Mikkel Kamstrup Erlandsen * Add an --enable-debug flag to configure script that forces a -g to gcc (89924de) 2010-08-12 Ken VanDine * releasing version 0.3.11-0ubuntu1 (25e77dc) (tag: 0.3.11-0ubuntu1) 2010-08-12 Ted Gould * releasing version 0.3.11-0ubuntu1~ppa1 (1c80632) * New upstream release. * Allowing absolute paths in the image name (LP: #564034) (ccf75ca) * Import upstream version 0.3.11 (94a9465) * 0.3.11 (53265a3) (tag: 0.3.11) * Allowing for absolute file names for icons. (e9c09c5) 2010-08-09 Karl * Added absolute filename fixes (bec9f56) 2010-07-25 Evgeni Golov * Merging new upstream release from Ubuntu.; New upstream release. * Fixing unwatching crash (LP: #603489) * Adding configurable timeout for slow test systems (ff06597) (tag: 0.3.10-1) * Merge lp:~ubuntu-desktop/libindicator/ubuntu; New upstream release. * Fixing unwatching crash (LP: #603489) * Adding configurable timeout for slow test systems (21ba038) 2010-07-15 Ted Gould * Merge from Debian (13ebc6d) * Updating to Ubuntu Desktop (e5080c7) 2010-07-15 Ken VanDine * releasing version 0.3.10-0ubuntu1 (8c56a89) (tag: 0.3.10-0ubuntu1) 2010-07-15 Ted Gould * releasing version 0.3.10-0ubuntu1~ppa1 (c6b0ab3) * New upstream release. * Fixing unwatching crash (LP: #603489) * Adding configurable timeout for slow test system. Merged in fix for (LP: #603489) (ae07d57) * Import upstream version 0.3.10 (081637a) * Sync with ubuntu desktop (6c7db76) * 0.3.10 (362a2d7) (tag: 0.3.10) 2010-07-14 Evgeni Golov * Standards-Version: 3.9.0 (8b7fa3f) (tag: 0.3.9-1) * Add "Don't drop debian/source/*" to the changelog (55e4c2c) * Merging new upstream release and some changes from Ubuntu. (b4d1461) * Merging lp:~ubuntu-desktop/libindicator/ubuntu (d14f25a) 2010-07-13 Ted Gould * Adding a configurable timeout by environment variable. (d71fe46) 2010-07-12 Ted Gould * Adding a new variable to adjust the time of the kill switch. (bf315eb) 2010-07-09 Ken VanDine * releasing version 0.3.9-0ubuntu2 (b52f070) (tag: 0.3.9-0ubuntu2) 2010-07-09 Ted Gould * releasing version 0.3.9-0ubuntu2~ppa1 (e102f84) * Upstream merge * Fixing unwatching crash (LP: #603489) (d8bd40d) * Fixing unwatching lookups. (17a29ea) * We want the key not the value. (c7eee08) * Taking it to the next level with impoliteness. (ed191e6) * Lots of impoliteness to make sure. (5750308) * Adding an impolite manager. (b0360dd) * Bug (baa324f) * Adding in the unwatching test (b0a56e9) * A couple debug messages to make the test easier to read the output from. (b43f81d) * Up to 5 watchers. (dceee48) * Longer timeout (990a881) * Okay, we need our own service too. Bah. (7c7b497) * Delaying the watchers to ensure that we don't dbus activate, and removing the session.conf to even allow for that. (56dd41e) * Starting the service ourselves. (5731c1e) * Ignoring the new builds. (054704d) * Making a new manager (6786532) * Start a multi watch test (01130c5) * Uhg, wrong branch (b973537) * Stop asking for the name, instead let's find it on our own. (74a24d7) * A could of protections for the core. (dac4891) * Sync to Ubuntu Desktop (fe4e5b7) * Freeing the service. (613ad62) 2010-07-08 Sebastien Bacher * releasing version 0.3.9-0ubuntu1 (dc60b53) (tag: 0.3.9-0ubuntu1) 2010-07-08 Ted Gould * releasing version 0.3.9-0ubuntu1~ppa1 (3fc3179) * New upstream release. (7957aca) * Import upstream version 0.3.9 (3b191f9) * 0.3.9 (bc5e925) (tag: 0.3.9) * Fixing signals so that our tests pass (3899f93) * Documenting the choices of not having a nice callback func. (7412490) * Use the same function so we know everything is all right. (647f8ea) * Unreffing the objects in dispose and ensuring we disconnect the signals first. (974328f) * Disconnecting signal before removing from hashtable so we don't try twice. (46c8b3f) * releasing version 0.3.8-2ubuntu1~ppa3 (2b3087f) * Make it so that a watcher dying is the same as unregistering. (fc10497) * Merge Upstream * Removing checking for style properties that aren't used. (70f8170) * Sync to trunk (5c28cb2) * Shutdown services when watchers leave the bus. (5691966) 2010-07-06 Ted Gould * releasing version 0.3.8-2ubuntu1~ppa2 (359c670) * Upstream Merge * Make it so that a watcher dying is the same as unregistering. (8314197) * Creating a callback for the destory signal, but then moving the unwatch into a core function so that we can call it. (dd7106e) * Actually creating a proxy to see if we can detect the watcher going away. (d23ca44) * Making ths bus tracked in the private structure (632c3f9) * Switching the watchers data structure over to a hashtable. (8a12556) * Removing unused style check (96faa1e) * Removing the style lookup that wasn't used. (149de10) 2010-06-19 Michael Terry * don't use 3.3 version, rather use indicator3 (923a1d5) * first pass at providing a gtk3 version (322884d) 2010-06-16 Ted Gould * releasing version 0.3.8-2ubuntu1~ppa1 (589e659) * Merge debian changes * Drop debian/source/* debian/control: Switch VCS for this branch to be the indicator applet developers branch.; Revert cdbs drop, as requested by the Ubuntu maintainers.; Update Maintainer and Vcs-* fields for pkg-ayatana.; Merge Ubuntu package into Debian. Closes: #54999. debian/copyright: + Update to machine readable format. debian/control: + Drop cdbs Build-Dep, bump debhelper to >=7. + Standards-Version 3.8.4. + Update Vcs-* fields. + Drop GNOME from Description, the package is not GNOME specific. + Slightly update Description, thanks lintian. * debian/rules: + Use minimal debhelper 7 rules without cdbs. + Disable tests for now, they fail (launchpad 587811); debian/source/format: + Add file, make package 3.0 (quilt). (c055d0f) * Sync to Ubuntu Desktop (b4feaef) 2010-06-16 Evgeni Golov * Update Maintainer and Vcs-* fields for pkg-ayatana. (34b4a4d) * Revert cdbs drop, as requested by the Ubuntu maintainers. (e3df283) * Apply 0.3.8-1 changes (30f1ae4) (tag: 0.3.8-1) 2010-05-06 Ted Gould * Dummy commit (c77d719) 2010-04-09 Sebastien Bacher * releasing version 0.3.8-0ubuntu1 (ec36577) (tag: 0.3.8-0ubuntu1) 2010-04-09 Ted Gould * releasing version 0.3.8-0ubuntu1~ppa1 (478b7f7) * New upstream release. * Adding template files to tarball (a662e1a) * Import upstream version 0.3.8 (105fa99) * releasing version 0.3.7-0ubuntu1~ppa1 (3e9180a) * 0.3.8 (9530995) (tag: 0.3.8) * Disting the templates. (882ef71) * New upstream release. (6c48a23) * Import upstream version 0.3.7 (97035da) * No merging (e9392e9) * 0.3.7 (ee0f45f) (tag: 0.3.7) * Fixing the desktop test to make it more reliable. (588efad) 2010-04-06 Ted Gould * releasing version 0.3.6-0ubuntu2~ppa1 (6262d6f) * Merge from Ubuntu desktop (a57b84e) * Upstream merge * Use the domain in desktop files for shortcuts (LP: #549322) (2eb97c2) * Translating the shortcuts of the actions based on the desktop file translation domains. (8e19cd3) * Typo (22de798) 2010-04-05 Ted Gould * releasing version 0.3.6-0ubuntu1~ppa2~shortcutdomain2 (e0f5fb7) * Upstream merge * Chnages requested by pitt (4213bc2) * Switching to only use the g_dgettext version if the locale_string function doesn't change the string from the normal lookup (and we have a domain to look in). (1200f51) * Make it so that we check the GNOME-Gettext-Domain as well (e900b4c) 2010-04-02 Ted Gould * releasing version 0.3.6-0ubuntu1~ppa2~shortcutdomain1 (49c5444) * Upstream merge * Use the domain in desktop files for shortcuts (4d6575b) * If we don't have a domain just use the locale function, otherwise we need to use that domain to get the translation. (20e03af) * Adding a private variable for the translation domain and grabbing it from the keyfile. (5d02c0c) 2010-03-18 Sebastien Bacher * releasing version 0.3.6-0ubuntu1 (0cf6e60) (tag: 0.3.6-0ubuntu1) 2010-03-18 Ken VanDine * Upstream release 0.3.6 * Adding in scroll signals for the indicators; debian/rules: Updating shlibs (947d4cf) 2010-03-18 Ted Gould * releasing version 0.3.6-0ubuntu1~ppa1 (f07a2df) * debian/rules: Updating shlibs (218c6a8) * Upstream release 0.3.6 * Adding in scroll signals for the indicators (738df2f) * Update to Ubuntu Desktop (60ab69b) * 0.3.6 (999f148) (tag: 0.3.6) 2010-03-17 Ted Gould * Adding the signal for scrolling in the indicator-object (5abaca2) 2010-03-17 Cody Russell * name (e0c1a3c) * Documentation fix. (b782a8a) 2010-03-16 Cody Russell * Use IndicatorScrollDirection instead of gboolean in IndicatorObjectClass->scroll function pointer. (11c78ed) * Define IndicatorScrollDirection enum for scroll signal parameter. (02d3dde) 2010-03-15 Cody Russell * Add 'scroll' signal. (4adb9ab) 2010-03-11 Sebastien Bacher * releasing version 0.3.5-0ubuntu1 (a68b0e8) (tag: 0.3.5-0ubuntu1) 2010-03-11 Ken VanDine * Upstream release 0.3.5 * Adding in a image loader helper for indicators. (c74b245) 2010-03-11 Ted Gould * releasing version 0.3.5-0ubuntu1~ppa2 (a815f84) * debian/rules: Updating shlibs number (259bcc9) * releasing version 0.3.5-0ubuntu1~ppa1 (0de990f) * Upstream release 0.3.5 (8caf60a) * Syncing with ubuntu desktop (5ca699b) * 0.3.5 (bb8b703) (tag: 0.3.5) * Creating a function to update the icon to a new name. (8e82b02) * Watching for style changes on the image. (a6ecf4a) * Check to see if we've seen the image previously before adding signals in. (e31a7de) * Splitting things out into an update function and a buid function. (b4ca4f6) 2010-03-10 Ted Gould * releasing version 0.3.4-0ubuntu1~ppa2 (d424692) * Upstream merge * Adding in a image loader helper for indicators. (fdba994) * Update to trunk (fc9f460) * Add a small helper for loading images. (fc87fda) * releasing version 0.3.4-0ubuntu1~ppa2~imagehelper1 (9bc7677) * Upstream merge * Adding in a image loader helper for indicators. (680631e) * Adding in a copyright header. (5867fa7) * A little loader to test to see if we load an icon and what size it is. (0660884) * If we get an icon that is too big, we have to scale it. (12ab8f4) * Doing dynamic size calculation based on the font if we have a prop set telling us to do so. (37f0f34) * Disconnect from theme update when the image goes away. (ba4a73a) * Setting up the callback for themes changing. (64df2c6) * Pulled out a bunch of the code into a refresh function for signals. (805edb8) * Fleshing out the image loading function. (48e8a34) * Adding in an image helper library. (636b9f9) 2010-02-25 Sebastien Bacher * releasing version 0.3.4-0ubuntu1 (e9aea6f) (tag: 0.3.4-0ubuntu1) 2010-02-25 Ted Gould * releasing version 0.3.4-0ubuntu1~ppa1 (436e5f1) * Upstream Release 0.3.4 * Reducing gio-unix dependency to 2.22 (577ae5b) * 0.3.4 (8e12685) (tag: 0.3.4) 2010-02-24 Ted Gould * releasing version 0.3.3-0ubuntu2 (802da09) (tag: 0.3.3-0ubuntu2) * debian/control: Reducing libglib dependency down to 2.22 for Karmic builds (d4404ea) 2010-02-19 Ted Gould * No reason we need newer APIs than this. (9200b55) 2010-02-18 Ted Gould * Updating to ubuntu desktop (25b2503) 2010-02-18 Sebastien Bacher * releasing version 0.3.3-0ubuntu1 (2de6574) (tag: 0.3.3-0ubuntu1) 2010-02-18 Ted Gould * releasing version 0.3.3-0ubuntu1~ppa1 (6528ac0) * Upstream release 0.3.3 (019fb77) * releasing version 0.3.2-0ubuntu1~ppa2 (bf7525a) * Upstream merge * Adding new object for parsing desktop files for Shortcuts (fa27dc5) * Sync to trunk (0fc8747) * 0.3.3 (49cdb8c) (tag: 0.3.3) * Adding in an object to get shortcuts out of desktop files. (f325f3e) 2010-02-16 Ted Gould * Updating to Ubuntu Desktop branch (8eee891) * releasing version 0.3.2-0ubuntu1~ppa2~shortcuts1 (fdc2872) * Upstream merge * Adding new object for parsing desktop files for Shortcuts (a9e097f) * Ignoring the touch file for the testing (6665fd0) * Being more specific about where we should find the touch file for distcheck (1b58c66) * Disabling debug messages (3e69079) * Debug messages. (5a75fb5) * We should look at the other nicks even if this one doesn't work. (a3e1058) * Shipping our test desktop file (ef9c19e) * Clean up touch file (7e69f61) * Checking to ensure the right nick is in the list (0aa8119) * Using the nick directly to make this work better. (b10dd19) * Wrong identity (b0e8d1c) * Forgot to set the type of the desktop file, need to be an Application. (452c195) * Add a test to launch an nick (af36cb8) * Adding a check to ensure we're getting the right names from the nicks. (e0bc191) * Making the function not recurse forever. (c636c3e) * Adding in local filter test functions. (b6b2a65) * Check to ensure a global no show works. (edaa80e) * Fix group detection to put a space in the name of the group (0a90515) * Better name (755e697) * Ignoring the new stuff (17cdd8c) * A backslash off (0a4d668) * Adding in a basic test desktop file test (53c9f60) * Create a testing desktop file (1a85eb2) * Refactoring the list checks into their own functions so we can check the desktop group as well. (8fb1d36) * Adding in checking to see if we should be showing this entry. (a39d426) * Basic parsing of the files. (4ee953a) * Checking for our shortcuts key, we don't really want a desktop file without it. (21c3a88) * Start loading the keyfile. (5514554) * Removing the reading of the desktop file. (62876d9) * Identity management with the properties. (37a107b) * Some error handling. (8b8c3f4) 2010-02-15 Ted Gould * A basic property system. (ae0b7bc) * Fleshing out the exec function which require GIO Unix (5d7fbff) * Fleshing out getting the Name of a shortcut (f2196d1) * Fleshing out _new and _get_nicks Both are lovely functions. (5d2ace5) * Getting some new private variables, and making sure they have a full lifecycle. (a32a078) * Instanciating the prototypes and making some comments. (3a95d84) * Letz get ur prototypes (d970c85) * Copyright headers (95f07c4) * Adding in the new object we're building for evaluating desktop shortcuts. (a271753) 2010-02-04 Sebastien Bacher * releasing version 0.3.2-0ubuntu1 (050ef48) (tag: 0.3.2-0ubuntu1) 2010-02-04 Ted Gould * releasing version 0.3.2-0ubuntu1~ppa1 (72ef75f) * Upstream release 0.3.2 * Various fixes to timeout handling in services and the * Fix test suite when run headless (65bc742) * 0.3.2 (0d5ea56) (tag: 0.3.2) 2010-02-02 Ted Gould * Fixes to the test suite. (6afee91) * Adjusting to new timeout value (527674d) * Switching to 'bash' (9719ffe) * Adding an printout for saying which display we created. (0526f26) * Adding in run-xvfb.sh (953e656) 2010-02-01 Ted Gould * releasing version 0.3.1-0ubuntu1~ppa2 (e0dbaa3) * Upstream merge * Various fixes to timeout handling in servcies and the service manager. (106a07d) * Sync to trunk (71e4712) * Better handling of some timeout conditions and more logging. (103f8b0) 2010-01-28 Ted Gould * releasing version 0.3.1-0ubuntu1~ppa2~better1 (7e7507e) * Upstream merge * Various fixes to timeout handling in servcies and the service manager. (32c331c) * Adding a debug message for restarting the service. (7c58185) * Error handling when building our proxies. (1abf840) * Changing timeout to be approximatedly 1 second. (52e1a43) * checking the error field for name callback and printing an error when it fails. (21eca67) * In the timeout function mention that we're shutting down, and have an environment variable to stop that. (138321d) 2010-01-21 Ken VanDine * releasing version 0.3.1-0ubuntu1 (717a085) (tag: 0.3.1-0ubuntu1) 2010-01-21 Ted Gould * releasing version 0.3.1-0ubuntu1~ppa1 (8f6a206) * Upstream release 0.3.1 (2645491) * Sync to ubuntu-desktop (923106e) * 0.3.1 (f5232a3) (tag: 0.3.1) * When a watch fails we're moving to having that try and restart the startup/connection process again. (16e0cd5) * Adding in tracking of the restart idle function and making sure we don't do it twice. (0219e0e) * In case we're restarting because of the 'Watch' returning failure we'd have a valid 'service_proxy' object to kill (4a7af56) * Setting up the watch_cb function so that in errors it'll try to restart. As most errors will be fixed by trying again. (c72ff4f) 2010-01-19 Ted Gould * releasing version 0.3.0-0ubuntu2~ppa2 (38d6422) * Upstream Merge * Adding in entry ordering. (45e16a5) * Sync to trunk (f48680f) * Support for entries having a location and moving that location. (eaf87fa) 2010-01-18 Ted Gould * releasing version 0.3.0-0ubuntu2~ppa2~ordering1 (292d5b0) * Upstream Merge * Adding in entry ordering. (f419f42) * Update from trunk. (a1032ca) * releasing version 0.3.0-0ubuntu2~ppa1 (2265c84) * Upstream Merge * Adding in the code to restart services (90990c6) * Sync to trunk (bcf1d4e) * Adding the code for having the services automatically restart if they crash. (e36616b) 2010-01-15 Ted Gould * It's a fundamental mistake to believe that we can protect people using this interface from the disconnection. We have no information to say that the new service starting will come up in the same state as the one before it. We need the individual implementers to verify that. Now we need to fix that. This commit does so. (079c2b5) * releasing version 0.3.0-0ubuntu2~ppa1~restart2 (faa40d7) * Upstream Merge * Emitting the connection changed signal better. (08192cc) * Handling the connected signal as well, making sure we emit it. (62d8c1c) * releasing version 0.3.0-0ubuntu2~ppa1~restart1 (f8d47e9) * Upstream Merge * Adding in the code to restart services (26f2421) * Switching what our enviroment variable is for, let's just stop the whole thing instead of playing with it. (deabfe6) * Setting up the signal for when the proxies falls down, we restart. (9bccc14) * Filling out the function to start it again, and adding in the function to respond to the timeout. (2ce95b0) * Reset the restart_count when we start, and start to bring in 'start_service_again' to begin to throttle the restarts. (b9344c3) * Getting a multiplier, and providing a way to override it using an environment variable. (41559b3) * Having the signaller test check the 'moved' signal as well as the others. (d7635fc) * No error on not having a get_location function. We'll just return zero. (c25db99) * Basic location checking test. (cb5f34b) * Fleshing out the get_location function as much as they're implemented here. (308e4db) * Fixing the signal comments. (d334db5) * Setting up the move signal, which required custom marshallers. (14b5823) * API changes required to have locations for the entries. (529ce66) 2009-12-10 Ted Gould * Ken loves us. (58c6877) 2009-12-10 Ken VanDine * set release for lucid (b6fb26b) * debian/control: - Added description for libindicator-tools (c45b838) * set version number (697b324) 2009-12-10 Ted Gould * releasing version 0.3.0-0ubuntu1~ppa1 (5f5763c) * releasing version 0.3.0~dev-0ubuntu1~ppa11 (b4fb802) * Upstream 0.3.0 Release * Adds a new tool to load indicators from the command line. * Adds an object for loading indicators. * Changes the indicator interface to be object based.; debian/control, debian/libindicator0: Adding in a new packages for the binary library. (91d1528) * 0.3.0 (cee358b) (tag: 0.3.0) * Adding in license headers. (5fb4592) * Adding in license headers. (29cb00e) 2009-12-07 Ted Gould * releasing version 0.3.0~dev-0ubuntu1~ppa10 (97c515e) * Licensing and doc updates.; Minor code cleanups (93ef960) * Documentation, licenses, and some slight updates. (2a521b2) * releasing version 0.3.0~dev-0ubuntu1~ppa9 (578ffd2) * Adding in a service API version number. (53bd4b5) * Add in support for sevice API versions. (483992f) * Fixing a typo in the error message -- noticed by David Barth. (1347041) 2009-12-04 Ted Gould * GPLv3 copyright headers. (c1fa836) * Implemented the _connected function as it's silly that it wasn't. (2d3d5b5) * More gtk-doc comments. (59b5bb7) 2009-12-03 Ted Gould * Adding in some comments and a little bit of code cleanup. (5852e0b) * Putting in comments for the functions. (a6d2a69) * Service version numbers. (873b502) * Adding a weak pointer to the service proxy. (ea29a8e) * Switching unwatch to being a no_reply function call. (8331ee5) * Full signal handlers so that we can see everything. (436bca2) * releasing version 0.3.0~dev-0ubuntu1~ppa8 (6db57d8) * autogen.sh fix. (LP: #491907) (fa0212c) * Patch to fix autogen.sh (360ae7a) 2009-12-03 Cody Russell * Fix autogen.sh so parameters are passed (66a7877) 2009-12-02 Ted Gould * Merge in from trunk, now two failing tests. (bc803c5) * Forgot to delete the programs. (1696a67) * Actually checking the version and erroring on it. (b2a0e03) * Specifying who can't get the session bus. (0c7f613) * Printing out the session bus address (6bbe989) * Changing the names we're registering for to be correct. (18351a8) * Not erroring when we're supposed to pass. (937c28b) * Adding a log domain for error messages (792315d) * Adding a new test to look at version numbers. (36f2ede) * Adding _new functions that include the version number in them. (a4e33bf) * Sending a version number for the local service. (d7e9d01) * releasing version 0.3.0~dev-0ubuntu1~ppa7 (8f124e3) * Adding an 'UnWatch' command to the standard DBus interface for graceful disconnection from a service. (c986e2c) * Adding an unwatch command to allow for graceful disconnection from a service if we're not interested in it. (de38fc8) 2009-12-01 Ted Gould * Adding a property for version. (a1d20fb) * Change the watch function to return both an API version and a user set version. (aa951a3) * Only getting the bus once. (b7864d8) * Trying to get a proxy before starting the service every time. If it exists, let's use it. (4ba1af3) * New files to ignore. (5757cfb) * Adding a test to ensure that a service gets shutdown by someone unwatching it. (1b1a50d) * Checking to make sure we don't get connected twice, that'd be an error. (6e89bf0) * Updating connection prototype to get all the data. (d69de93) * Making the timeout a failure case, and making it so that we want a graceful shutdown. (8f0f2ad) * Unwatching if we have mismatched version. (824d1e8) * When destroying the object we tell the watched service that we're not watching it. (088eff4) * Using the define for the version on both sides (67aef7b) * Finding the watcher and removing him from the list. (c0e2510) * Add an unwatch function with a basic handler. (8a1912e) 2009-11-24 Ted Gould * releasing version 0.3.0~dev-0ubuntu1~ppa6 (0d1af25) * Adding a new tool to load indicators from the command line. debian/control, debian/libindicator-tools: Adding in a new package for the tools of libindicator. (5d0d185) * Sync to trunk (01c1439) * Adding in a small tool to test loading of indicators on the command line. (easier development) (ad2ef4d) * releasing version 0.3.0~dev-0ubuntu1~ppa6~tl3 (d66daf8) * debian/control: Making sure the tools package is using the same version of the library that it was built with. (411182c) * releasing version 0.3.0~dev-0ubuntu1~ppa6~tl2 (8e82971) * Adding support for remove. (f5ad201) * Adding support for removing entries (bfb7a29) * releasing version 0.3.0~dev-0ubuntu1~ppa6~tl1 (06ac252) * debian/control, debian/libindicator-tools: Adding in a new package for the tools of libindicator. (5a914ca) * Adding a new tool to load indicators from the command line. (cc1c8d4) * Stopping the app when the window closes. (b6f78fa) * Grabbing the entry added function as well, didn't realize how much it did :) (cd27c1b) * Showing the menubar and window (a9b6d6f) * Adding a small little tool to load an indicator from the command line. (93650be) 2009-11-16 Ted Gould * Merging in from Robert. (f8b4671) * releasing version 0.3.0~dev-0ubuntu1~ppa5 (f040dac) * debian/control: Adding a depend for the -dev package on the base library to stop users from linking staticly. (7b0d813) 2009-11-17 Robert Collins * Depend on libindicator0 to pull it in when libindicator-dev is a build-dep. (18eb9ed) 2009-11-16 Ted Gould * Confused (961fafa) * releasing version 0.3.0~dev-0ubuntu1~ppa4 (b72113b) * releasing version 0.3.0~dev-0ubuntu1~ppa4 (a095f05) * 64-bit fix for printf's (52fd9ea) 2009-11-05 Ted Gould * 64-bit fix in that GTypes are not ints on 64-bit (a7b7787) * releasing version 0.3.0~dev-0ubuntu1~ppa3 (a87ce28) * debian/control: Adding build deps dbus-glib as well. (a6c762e) * releasing version 0.3.0~dev-0ubuntu1~ppa2 (2fb0a49) * debian/control: Adding build deps for the libraries we're using. Seems we should have done that earlier, eh? (3177188) * releasing version 0.3.0~dev-0ubuntu1~ppa1 (8569ff3) * Changing the object interface to allow for multiple items per module.; Changing debian/libindicator-dev.install for the adjusted include path. (20d9f0e) * Sync with trunk (c347400) * Changing the indicator-object API to support indicators that have multiple entries, and are dynamic. (db9e8f4) 2009-11-04 Ted Gould * releasing version 0.3.0~dev-0ubuntu1~ppa1~multi1 (d6901e1) * Changing version. (15120ed) * releasing version 0.2.1-0ubuntu2~ppa2~multi1 (77033be) * Changing debian/libindicator-dev.install for the adjusted include path. (2802941) * Changing the object interface to allow for multiple items per module. (0512f86) * Changing the include directory as well. (34f914c) * Moving everything up to '3' as we're breaking everyone pretty bad at this point. (4a558fc) * Updating to current trunk. (2b754cb) * Use close instead of unreffing. (534aab3) * Adding a simple indicator test that checks to make sure we can signal up the stack. (8c321fa) * Building a dummy indicator that signals. (8033011) * Using the proper define for the type. (db2a239) * releasing version 0.2.1-0ubuntu2~ppa1 (5ad8e30) * Adding in service management code.; debian/control: Adding a target for libindicator0; Adding libindicator0.install and libindicator-dev.install (3d93d5a) * Updating to trunk (61e1ae1) 2009-11-03 Ted Gould * Adding a service management interface into libindicators as many will use that. (c547687) * Adding in some ID helpers. (7db7886) * Adding in some signals to make for some more fun. (0db39bf) * Making a warning not use a colloquialism. (cb0c099) * Changing version to service_version (cfa83c0) * Updating to current trunk. (b267db9) * Changing the way the module is free'd (e354bc4) * Having the test expect an object, but fail when calling the functions. (03e8903) * Make the tester dynamically link the lib so that there's not two versions of everything. (1a528a7) * Linking the indicators with the libindicator library. (10aa800) * Switching to checking the entires list instead of individual functions. (bffbb2c) * Converting the dummy indicators over to the new API. They compile now. (57642ed) * Syncing up with trunk before merging. (9fa35ba) * Merging in an interface for loading modules cleanly. (541f18c) * Changing comment on private struct. (c09917d) * Typo (1f96a34) * Creating the actual backing function for indicator_object_get_entries. (258f461) * Adding in a default handler for get_entries. (78868a0) * Whew, blew up the interface and built it back again. (ed409d4) * Redefining the interface. Now this object should get subclassed by folks. (0575b91) * Removing the instance object. I think that we can do everything we need by using the object. (e2ce2dd) * Switching to a set_type function instead of making people do that themselves. (6935a6b) * Adding in the basis for the instance class. (aaacaac) * Stripping out the symbols for the old stuff, and going with the new of just getting a type. (614606a) * We need atleast the loader branch as that's what we want to change. (1021a83) * Typo (b3fc779) * Comments in the copyright statements updated. (07c7bb1) 2009-11-02 Ted Gould * releasing version 0.2.1-0ubuntu2~ppa1~sm2 (ff0cc74) * Fixing package config file to point to library (c626be5) * Oops, we need to tell package config that we're a big library now. (0aa2106) * releasing version 0.2.1-0ubuntu2~ppa1~sm1 (a4652e1) * debian/control: Adding a target for libindicator0; Adding libindicator0.install and libindicator-dev.install (00808f0) * Adding in service management code. (8e4486c) * Distcheck fixes. Looking for the files in the right place and making sure we clean up after ourselves. (5ccc73b) * We should pass the test if we get a connection, it means we activated. (c3d30bd) * We want to not get the shutdown. Since we're testing that we get it without connection we can now assume that if we don't get it we should pass. (6cb18e9) * Adding a fallback to the session bus after trying the starter bus. (ddb2ab7) * Switching the name to match the service file... should fail. (5e5f495) * Building a service file. (dc5fbef) * Adding in the basic data needed to start bringing up a test to start the service. (9a15eec) * Fixing up the build rules so that they're directory independent. (90446e0) * Some things are errors that should really be warnings. (c99ef22) * Ah, we can't throw an error on success. (0745e42) 2009-10-30 Ted Gould * Adding a test that ensures we don't get a connect signal. (911b9d7) * Adding in the connected property and signalling when we're all hooked up. (aa1549d) * Ubuntu Desktop updates (d9dc770) 2009-10-29 Ted Gould * A service proxy, and then calling watch. (a9e61b6) * Building the dbus proxy and using it a little bit. (02ce4f5) * Ah, forgot to free name (c87569c) * Properties functions. (12fbcd5) * Signals and properties, oh my! (9af4097) * Adding the API functions. (c099b03) * Oops, forgot to set to passed. (74296a6) * Sending shutdown signal 500 ms after getting a name if we have no watchers. (5819476) * Adding in the watchers and timeout parameter. (fbba415) * Adding in some shared strings for finding intefaces and objects. (82aaaed) * Woot! We're a DBus service now. (2e39b18) * Building ourselves a DBus proxy. (f99a9f2) * Filling in more of the name property. (145b214) * Adding in the 'name' property (fbb2bc9) * Adding the shutdown signal (621a7ba) * Woot! A failing test. Look how TDD I am. (22a5b08) * Making the gtester stuff into a autotest thingy. (a72fc58) * Creating a new test and linking it into things. (fc573dc) * Putting a dummy implementation in for _new for linking (ec0809e) * Adding basic interfaces and docs to IndicatorService (b60a7f1) * Defining some API and boot strapping documentation. (0af9206) * Making 'INDICATOR' the prefix for the objects. (b8db818) * Putting in some templated objects. (ba8af82) 2009-10-28 Ted Gould * Building ourselves a little dbus spec (606b493) * Adding a description for the indicator service. (15995b7) * Grabbing the loader branch (0220cc7) * Removing valgrind as I want to clean this branch up and make another for that. (b98a481) * Oh, legal headers. Fun, fun. (755adf0) * Adding in comments. (a8b1436) 2009-10-14 Ted Gould * Adding in check for valgrind that we'll need for the test tools. (f28c65a) 2009-10-11 Ted Gould * Adding the terballs into ignore (7cc9b8f) * Making a tools directory (0b18e53) * using the blank dummy indicator (ccc7f82) * Building a new dummy indicator that doesn't have any symbols in it. (a2f4f86) 2009-10-09 Martin Pitt * releasing version 0.2.1-0ubuntu1 (98c7033) (tag: 0.2.1-0ubuntu1) 2009-10-08 Ted Gould * Testing the accessors (bb7b49a) * Adding some accessor functions for the various GTK objects. (5144944) * Maintaining a reference to the objects we create in the object. (fda24e4) * We need to use GTK. (32fc4b8) * A better dummy menu. (9c16e7c) * Create a very simple indicator and testing it. (97a4004) * Being a bit more verbose (a28e917) * Making it so that the null test checks for failure as we shoudln't have a null image and label. Also making it so that warnings don't cause the test to fail. (56450cf) * Making it so that we use the same unref code as everyone else. (66b0d1b) * Truth again. Keeps bitting back. I shouldn't of lied in the 2nd grade, I confess! No more, please. (4ea2868) * Checking to see if a file exists before trying to load it. (b2942d9) * Truth. Sucks. (18f6396) * Turning all the return if fails into proper if's with warning and unref the object so there aren't any memory leaks. (a65694f) * Use the new build dir flag (3bafca7) * Build dir fix and making gtester run all of them even if one fails. (3766586) * Making it so that we're not using g_return_if_fail as it messes up the test suite. (bece9de) * Fleshing out the load from file function. Still fails. (f4b307c) * A test to load the dummy indicator (bce9f51) * Apparently they have to be installable to get the .so. Fail. (1b828c9) * Adding a test that should pass as given a bad filename we should get no object back. (d946049) * Adding a function to create an object from a file (b4d20eb) * Creating a dummy indicator that returns null (c594126) * Switch from GLib to GTK as that's what we really needed. (605f74b) * Using a weak ref instead of connecting to a signal that doesn't exist (26ced5c) * Putting data in the private (3bf9efb) * Test to build the object and unref it. (4658844) 2009-10-08 Ken VanDine * Upstream release 0.2.1 (LP: #446619) * Puts a copyright header on the header file. Should have been there all along. (133d9bd) 2009-10-08 Ted Gould * Fleshing out the test a little bit. (1386478) * Adding in a simple little test. (c314d60) * Adding in a tests folder (fa946df) * Ignoring our new file. (1ca9666) * releasing version 0.2.1-0ubuntu1~ppa1 (1518975) * Upstream release 0.2.1 * Puts a copyright header on the header file. Should have been there all along. (972ad5e) * Merging in ubuntu-desktop branch (6d8cd64) * 0.2.1 (b5f41d1) (tag: 0.2.1) 2009-10-06 Ted Gould * Adding license information to the header (a7a8c73) * Adding some pkg-config love to get things compiling all nice like. (24d0253) * Building a base object. (1f822bf) * oops, should be GPLv3 not LGPLv3 (8935708) * Header for the header file that has the LGPLv3 (0d87e4e) 2009-09-10 Martin Pitt * releasing version 0.2.0-0ubuntu1 (90bed29) (tag: 0.2.0-0ubuntu1) * more verbose changelog (9075de4) 2009-09-10 Ken VanDine * Upstream release 0.2.0 (LP: #427443) (287766d) 2009-09-10 Ted Gould * Merging in desktop branch (7f83810) * releasing version 0.2.0-0ubuntu1~ppa1 (507d19b) * Upstream release 0.2.0 (2eb5232) * Making 0.2.0 (1c30efe) (tag: 0.2.0) 2009-08-25 Martin Pitt * releasing version 0.2.0~bzr325-0ubuntu1 (e5afc87) * debian/control: Fix Vcs-* links. (6736e77) * Flush changelog. (f434a87) 2009-08-24 Ken VanDine * debian/control: - Set both Vcs-Bzr and Vcs-Bzr-Browser, with ~ubuntu-desktop (7e26ec7) * New version (LP: #417039) (689de8d) 2009-08-19 Ted Gould * Using AM 1.11 silent mode (999dbf8) 2009-08-18 Ted Gould * releasing version 0.2.0~bzr325-0ubuntu1~ppa1 (772dcaf) * Removing the install file. (0ec3b86) * Merging in the seperation from indicator-applet; debian/* Removing all of the indicator-applet stuff (a810a01) * Merging in the separation from indicator-applet (f9bc0fe) * Deleting everything only leaving libindicator (ba24704) 2009-08-17 Ted Gould * releasing version 0.2.0~bzr319-0ubuntu5~ppa5 (dcbb7eb) * Setting the icon path in the .pc file. (8fda9af) 2009-08-08 Ted Gould * Adding an icons directory to the .pc file (033de55) 2009-08-07 Ted Gould * releasing version 0.2.0~bzr319-0ubuntu5~ppa4 (79d17f5) * Merging onto the main packaging branch.; Renaming the second Bonobo server description file to match that of the FastUserSwitchApplet.; Upstream merge for better naming of the applet.; Updating from upstream with two (count them) two applets installed in the source. debian/control: Adding information on indicator-applet-sus which is a different applet for the SUS indicator. debian/indicator-applet.install: Making it more specific so that it doesn't grab the directories that now have additional files created by indicator-applet-sus existing.; debian/indicator-applet-sus.install: List files that are now used by the new binary package. (1a01d82) * Merging in the branch making two applets. (4aa0584) * releasing version 0.2.0~bzr319-0ubuntu5~ppa3 (853ef5b) * Renaming the second Bonobo server description file to match that of the FastUserSwitchApplet. (4054025) * Changing the Bonobo server description file name to match that of FUSA. (3a8b5ca) * releasing version 0.2.0~bzr319-0ubuntu5~ppa2 (721b0f9) * Upstream merge for better naming of the applet. (e97463e) * releasing version 0.2.0~bzr319-0ubuntu5~ppa1 (31fac01) * Oops, we need more identity. (38e4c74) * Locking the version number so the two indicator-applets are the same (709f0a8) * debian/control: Adding information on indicator-applet-sus which is a different applet for the SUS indicator. debian/indicator-applet.install: Making it more specific so that it doesn't grab the directories that now have additional files created by indicator-applet-sus existing.; debian/indicator-applet-sus.install: List files that are now used by the new binary package. (93135b1) * Updating from upstream with two (count them) two applets installed in the source. (ae15eee) * Switching the name to the proper server file. (8fd9f27) * Loading only the SUS plugin. (65df6f1) * Blocking out SUS from standard applet. (6c07c79) * Fixing the generation rules for the bonobo server files. (3bb7806) * Ignoring more files. (327dfdb) * Switching the name to actually be correct. (2f92722) * Changing the name of the directory to -sus which makes more sense (059f1bf) * New executable name (c35dbea) * Renaming the server file (f33fa71) * Adjusting the namespace. Just to make things fun like that. (019d958) * Making the schema translatable (f2a3bfc) * Adding a new server to connect with our new applet. Still needs changes as it's just a copy. (5bc7f7d) * Adding a new build target for our new applet (99caa03) * Adding the new src to the build system (a1ec732) * New src entry (3b1bb35) 2009-08-06 Ted Gould * Aurelien's patch to add a set_server function to indicators. (d7f91b9) 2009-08-06 Aurelien Gateau * Updated documentation (937dba5) 2009-08-05 Ted Gould * Update to core-dev branch (a3eb3ea) 2009-08-05 Aurelien Gateau * Introduce indicate_indicator_set_server() so that server can be defined for message indicators too. (c4bd83a) 2009-08-05 Jonathan Riddell * Add build-dep on gtk-doc-tools (8223eb6) * merge with Ken, fix gtk-doc (924a0a6) 2009-08-05 Ken VanDine * indicator-applet (0.2.0~bzr319-0ubuntu3) karmic; urgency=low (bff1218) 2009-08-05 Ted Gould * releasing version 0.2.0~bzr319-0ubuntu1~ppa5 (6a2b4b1) * Upstream fix for server.c and get indicators with hidden indicators in the list. (cc920f1) * Maintaining the count independent of the entires. (a3e59c2) 2009-08-05 Jonathan Riddell * Run ./autogen.sh before upload (07a83fa) * tidy changelog for release (daaa9a5) * merge current package for upload, https://code.edge.launchpad.net/~indicator-applet-developers/indicator-applet/applet-packaging/+merge/9671 (cb9d427) 2009-08-04 Ted Gould * releasing version 0.2.0~bzr319-0ubuntu1~ppa4 (42ba02f) * Upstream fix to PC file. (c495a62) * Update the pc file from the GTK split out. (e4ac1dc) * releasing version 0.2.0~bzr319-0ubuntu1~ppa3 (72093e2) * debian/control: Fixing the library reference of libindicate-gtk-dev (41c535b) * releasing version 0.2.0~bzr319-0ubuntu1~ppa2 (96ace70) * Forgot to autogen.sh (64034dd) * releasing version 0.2.0~bzr319-0ubuntu1~ppa1 (541c9b2) * Setting up the merge history correctly. (dd164ac) * Merging in upstream code to split out libindicate-gt. debian/control: * Changing the version number of libindcate to 2 to match the .so numbering. * Creating packages for libindicate-gtk; Added libindicate-gtk-dev.install and libindicate-gtk0.install for the new library.; Renamed libindicate1.install to libindicate2.install to match the package name change. Modified libindicate-dev to be more specific about the header files that it grabs. (5909ee4) * Merging in the splitout of a GTK version of the lib (74bc54c) * releasing version 0.2.0~bzr309-0ubuntu4~ppa2 (63ed0ba) * debian/control: Fixing some libindicate1's that should be libindicate2 and making everything dependent on the versions that are built here in the package. (54b4e00) * releasing version 0.2.0~bzr309-0ubuntu4~ppa1 (be06bcb) * Adding in a make fix (6401c45) * Adding libindicate a build include (16b15aa) * Added libindicate-gtk-dev.install and libindicate-gtk0.install for the new library.; Renamed libindicate1.install to libindicate2.install to match the package name change. Modified libindicate-dev to be more specific about the header files that it grabs. (8bed775) * debian/control: * Changing the version number of libindcate to 2 to match the .so numbering. * Creating packages for libindicate-gtk (84f0002) * Merging in upstream code to split out libindicate-gtk (a1fa7ba) * Removing some more noise (475cf3d) * Ignoring the tarball (2b41594) * Ignoring the right file (34baaec) * Making seperate versioning for libindicate-gtk (c3034d9) * Bumping the version as we removed a function. (b31efb2) * A bunch of distcheck fixes to clean things up (8850baa) 2009-08-03 Ted Gould * Some odd change (3497522) * Last libgtk-pixbuf header (3ec1d88) * Removing GTK dependencies from the libindicate stuff (8c7a1a7) * Fixing these guys to include the -gtk library where needed (d94f22a) * Some ignore files for fun (f6fb98d) * Oops, forgot the listener stuff (793db0f) * Moving the listener code and some indicator code into libindicate-gtk (78ad4c4) * Okay, now it is the offending function in it. (840e1c8) * Creating a default little GTK library to move the GTK stuff in (ecde85f) * Adding a function to set the server of the indicator upon creation. indicate_indicator_new_with_server() (b3d3f3d) * Merging in changes to the destroy and removing a warning. (573c458) * Ignoring built files (f344374) 2009-07-27 Aurelien Gateau * Removed warning: it's annoying in unittests. (7f379d5) * Destroy dbus proxies in listener finalize. (8157a2c) 2009-07-21 Ted Gould * Fixing the other signal marshallers (5390823) * Using the server marshaller (b8b2c52) * Creating the server marshallers that we need (5cbbca2) * Oops, we shouldn't have a prototype for a function that doesn't exist. Thanks to Aurilien. (e3a0b5a) 2009-07-17 Ted Gould * releasing version 0.2.0~bzr309-0ubuntu3 (064740b) * Now moving on to Karmic (61730d0) * releasing version 0.2.0~bzr309-0ubuntu2 (c594f60) 2009-07-03 Ted Gould * Configure change to cleanup output (049947b) * A little like mentioned on the GNOME Wiki, but doesn't work until I have a higher version of automake. Doesn't seem to cause problems though. (7867885) 2009-06-08 Ted Gould * Patch from Mark Trompell to make suffix checking better. (63dad6a) 2009-05-13 Ted Gould * debian/control, debian/libindicate-doc.install: Merging in Ken Vandine's work on making a -doc package for libindicate. (aee8914) 2009-05-13 Ken VanDine * added debian/libindicate-doc.install (f36cc1b) * Added package libindicate-doc and removed dbus-test-runner build requirement (10e5164) 2009-05-05 Ted Gould * Merge from upstream, includes documentation. (e38da9b) * Merging in the documentation branch. (7926d56) 2009-04-30 Ted Gould * Never understand this file really. (1b3fd92) * Fixing function listing (395ae9a) * Fixing typo (c027c7f) * Fixing some documentation bugs. (3810da4) * Documenting most of the public visible functions (51f63e1) * Adding in arguments for the signals (1595ee2) * Adding in arguments on the signal docs. (f64bd73) * Woot, signal documentation works now. (dbfd181) * Basic signals docs. (15720aa) * Server section documentation. (f4a1e46) * Comments for the class, who put all those functions on there... (a1ba880) * Adding in message documentation and cleaning up some mistakes as I see them. (933bcaa) * Never understand this file (298abb1) * Doing a better job about defining out the documentation gets created and looks. Much cleaner. (ef5a4ba) * Breaking out into sections. (0b5e0c1) * Section information (a77a808) * Adding to the unused side of things. (cd973f1) * Removing the big defines that aren't useful and the boilerplate get_type functions. (6a4918e) * Reformatting to make gtk-doc happy. (d73f65f) * Making it more like English and less like a pointer table. (9201eb6) * Adding in IndicateIndicatorClass documentation. (877ac7a) * What is the server (dd49cd3) * Typo (47c4b8e) * Getting most of the indicator documentation in the pool. (43f575e) * Turns out that gtk-doc can't have the name of the function on the same line as the start of the comment. How stupid. (1c91e43) * Removing symbols that shouldn't be in the docs anyway. (a41eab6) * Ignoring the dbus and glib-marshaller generated header files. (73a5c92) * Dispaly typo (f62b836) * First pass at trying to create some function documentation for Indicator (c73af69) 2009-04-29 Ted Gould * Patch from Niel Patel to close the directory after opening it. (0ed0749) * Patch from Niel Patel to close the directory after opening it. (89235a4) 2009-04-27 Ted Gould * releasing version 0.2.0~bzr307-0ubuntu2 (f6767c8) * Increment for PPA. Forgot to autogen.sh (f6f7c27) * releasing version 0.2.0~bzr307-0ubuntu1 (d8582f7) * debian/control: Adding a build-dep on dbus-test-runner (60e4dde) * Upstream Snapshot: Adding in a test suite. (73e576b) * How important a simple backslash is :) (0f174a8) * Merging in the testing branch to get some tests for this guy (d2d0c7a) * Switching to system dbus-test-runner (5899a3f) 2009-04-22 Ted Gould * releasing version 0.2.0~bzr305-0ubuntu1 (183d218) * Upstream update (fd65e07) * Get the submenu set right. (c292100) * Slipping in the hbox (2f6ccdf) * Oops, cut and paste error, pulling up the wrong symbols (d075aee) * releasing version 0.2.0~bzr302-0ubuntu1 (e1eb7c8) * Upstream snapshot, turning version getting feature into a function and adding a name symbol outline. (836e265) * Turning versions into a function and adding a name symbol. Not yet used though. (18397c8) * releasing version 0.2.0~bzr301-0ubuntu1 (f5044ea) * Upstream snapshot, fixing indicator.h (2c0d0d8) * Wow, the genius of making a symbol you want to export static is simply amazing. It's truly a wonder of nature that I can tie my shoes in the morning. (ef4bfde) * releasing version 0.2.0~bzr300-0ubuntu1 (adfd764) * Upstream snapshot, fixing indicator.h (fded83b) * Oops, not what I wanted. These should have been prototypes not global variables. Takes a second to think about it, but yeah, that's what they were. (c0b1f48) * releasing version 0.2.0~bzr299-0ubuntu1 (d332ad5) * Upstream snapshot, forgot a + on GTK (180822b) * Forgot a + on gtk (20cfaa9) 2009-04-21 Ted Gould * releasing version 0.2.0~bzr298-0ubuntu1 (a380678) * debian/control: * Add in package libindicator-dev * Add build depends on libxml2-dev for upstream dep (74a2953) * debian/control: Add in package libindicator-de. debian/libindicate-dev.install: Add greater specificity on what gets installed to not get confused with files from libindicator; debian/libindicator-dev.install: Specify which files should be put into the development package. (6465b8b) * Upstream snapshot (b630f12) * Release by core-dev into Ubuntu (65381a4) * Changing to an icon and a lable and building our own item (8c6656e) * Putting in and checking version information to ensure we all agree about the header version (ae26892) * Fixing and using the new indicator header. This will help to connect things together and make them actually work in a reasonably type safe way. (4023d35) * Moving the indicators directory to match libindicator (b0c9eb5) * Setting the indicators directory manually (292b04e) * Creating an indicator lib to make sure we can attach all these things together. (61bc03a) 2009-04-20 Ted Gould * Adding a test to build a bunch of indicators (6f87e9c) * Adding in multiple servers connecting in to declare interest test (ecad1e3) * Expanding range of interest test and not checking to see if we got none, we shouldn't get it. (c5cc32d) * Gaurding against setting bad interests (76d5d0d) * Adding an interests test (38c6ce2) * Woot, now we do distcheck too (443c83a) * Distcheck fixes (5f5f476) * Chaning the include so that it works for make distcheck (43cf92a) * Adding in a simple test (8162f71) * Build infrastructure for first test (ecfb1c2) * Moving tests to examples (a1ccd1a) 2009-04-14 Martin Pitt * releasing version 0.1.6-0ubuntu1 (d10264b) * New upstream version * Applied the same fixes as Cody Russell's patch to indicator-messages to the finalize functions here. Should fix LP: #359018 completely. * Minor warnings fixes in search of solution to above. (4959fae) 2009-04-13 Ted Gould * Adding in support for finding out if people are interesting on the bus using introspection instead of sending a random function call to them and seeing what happens. (8270f15) * Commenting out some debug messages (e32b37d) * Less debug (46a050c) * Ah, a typo. Bother. (135906b) * Okay, connected into that other there code... let's see what happens. (dec69be) * Fleshing out some (24e268d) * Whoa, it like builds and stuff (bde7e27) * Fixes to the finalize functions. (2edf3fb) * New upstream version * Applied the same fixes as Cody Russell's patch to indicator-messages to the finalize functions here. Should fix LP: #359018 completely. * Minor warnings fixes in search of solution to above. (cb60d3f) * Merging in core-dev (61ded01) * Making into a 6 (70223e1) (tag: 0.1.6) * Adding a bug number (f7dc7fa) * Adding in call to the parent class' finalize function as well, this should free all the way up to the top. (f0fa474) 2009-04-12 Ted Gould * Updating from trunk (a1207dc) * Some slight code cleanups to remove warnings (e9ef5ec) * Proto-pseudo-code for the introspection functions that are going to be needed (ce66459) 2009-04-11 Ted Gould * Fixing some pedantic little bugs to try and figure out what's causing 359018 (a09510f) 2009-04-10 Ted Gould * Adding in libxml linking (20836b8) * Dummy to put bug number in. (551a97c) * Create the virtual function for checking interest. (f4bfa1f) * Merging in Eitan's gtype-ify of the enums and the IndicateListener... objects. (28e006b) * Marking the dev branch as such. (70697a6) 2009-04-10 Eitan Isaacson * gtypify IndicateListenerIndicator (bcdeb13) * changed IndicateListenerServer to a gtyped pointer instead of a gboxed. (a3188d2) 2009-04-08 Eitan Isaacson * Changed marshallers to GBoxed for IndicatorListenerServer. Make copy/free functions empty for now. (8f4019b) * GBoxed IndicateListenerServer (a300f6c) * gtypified the interests enum. (0307775) 2009-04-08 seb128 * releasing version 0.1.5-0ubuntu1 (df604ba) 2009-04-07 Ted Gould * Cleaning up changelog (746b6aa) * Merging in core-dev branch (198fee2) * Explicitly sets the about window's window icon. (LP: #356437) (2ffebac) * Lots of fixes from trunk (a8ab75d) * Added in an 'icon-name' to make the about dialog have a proper icon. (c1955c5) (tag: 0.1.5) * on both client and server side. (LP: #353112); Makes it so that all objects down to the menu now use the gtkstyle naming from FUSA to ensure that they all pick up the theme hacks that are set for FUSA. (LP: #334490) (13aa4e5) * debian/libindicate0.install changed to debian/libindicate1.install; New upstream version: * Adds new API for detecting interests of various listeners. Implemented on both client and server side. (LP: 353112) (b2d85cf) * Clearing another warning. Shame gdk doesn't do this one for us. (75002ff) * Patch from Eitan Isaacson to correct prototype. Had to be adjusted slightly as the prototypes had moved. (9a7bcf3) * Ignoring our new test (7115f77) * Patch from Eitan Isaacson to remove a ref/unref infinite loop that effectively made it so that we kept our objects forever. While we love them, at some point we need to say goodbye. (eba8697) * Making it so that we don't register the object twice. This is really a work around, but it's atleast fixes the crasher. Which sucked. We need to work with the dbus folks to make this better. (3e1e512) * Adding show hide server test from Eitan on bug 351537 (596a5db) * Moving the install file. (0b820c7) * debian/control: Switching libindicate0 to libindicate1 to express the fact that the binary compatibility is broken. (98d4485) * I finally understood what seb128 told me about the version numbering. I feel so stupid for not understanding before :) (7f23e11) * Hiding some debugging messages. (912a2a1) * Simplifying error message (9bd1519) 2009-04-06 Ted Gould * Fixes for dev stuff. (8b71317) * Some debug messages; Making the comparison of interests detect changings properly; Correctly use g_list_remove in several cases making for long lists; Using g_list_prepend instead of append because it's faster.; Checking whether we've got proxies before destroying them. (42492db) 2009-04-03 Ted Gould * Header fixes (f252656) * Merge from upstream for header file fixes. (5f46d7f) * Moving private interests out of the public header file. (06dd63a) * Merging in dev stuff. This'll break things. (76c68f9) * Merge in from the Dev branch (5e3c75a) * Not quite sure how these got added, but I'm not going to fight it. (05b5aa4) * Trying to get to a sane state. I apparently don't know as much about library versioning as I thought I did. (4f5d2b5) * Hiding all of the functions that part of the DBus interface in that now they're all prefixed with '_' so that they don't get exported as part of the library symbols. This should simplify everything a little bit for implementors. (d93da3d) * Getting rid of everything starting with 'd'. This gets rid of the dbus stuff that isn't set up to be static, which is silly. (eb5078b) * Hiding the marshsallers from the libraries in the symbols by adding a _ in front of them. (be4c002) * Cleaning up the exported symbols, make sure that 'get_type_cb' isn't exported (303c52b) * Getting to version 0.2.0 (c9b2fe4) * Trying to have more style information included so that we can get rid of the focus line. (68d7bf9) * Adding interests on new servers saying that we're displaying the indicators and in the server. (16abe6d) * Fleshing out the functions in the listener to set interests. (96c1883) 2009-04-02 Ted Gould * Putting in some protection from crazy values (68fb067) * Hiding debug (2f66ceb) * Adding a bunch of debugging messages and fixing the lifecycle for the folk pointer. Lots'o'fun. But things seem to be working. (5c9e92e) * Filling in the dbus owner changing code. Now we should catch those. (6826848) * Adding printouts for interest changes. (1554425) * Connecting in the DBus messaging that we need. (26bfe1c) * Fleshing out the interest setting and removing functions. (6e42996) * Updating unused file (aa7ec58) * Adding in folks support. (f94b485) * Adding the interest removed and interest added signals in. (1212c8e) * Woot! Now we have some real functions to call! (5ebb3c4) * I can't believe I messed up this one. Luckily it doesn't seem to have caused any bugs. Man. (b874768) * Switching around the show_interest and remove_interest functions so that they are now asyncronous. Not that being asynchronous is important but more that now they get the Method Invocation interface that we can use to find out the sender of the message. Changed various APIs as a result of this, and moved the DBus functions to be internal. (6e51efb) 2009-04-01 Ted Gould * Adding new functions show_interest and remove_interest into the API. Now to fill in the backend. (58403a8) * Adding a remove and show interest (966a1e5) * Change the API so it's more like we're keeping a list of what, and who are interested in. This'll make it easier for us to manage all the DBus nastyness. (bae37d9) * Adding stuff to ignore, much better (e6287ab) * Misspelling (7fea958) * Getting some interests in the game. (b76642f) * Switch to searching on the connection, which is really what we care about and the proxy is a poor sustitute for. (589454c) * First pass at the pretty meag-change to make it so that we can detect people on the system vs. the session bus. Basically reworking a bunch of structures. Fun. (f7bf54a) 2009-03-30 Martin Pitt * releasing version 0.1.4-0ubuntu1 (4134dd0) * New upstream version * Changing the text in the license box to make sense. (LP: #346215) * Call GNOME Program Init to initialize all of the ATK and gettext stuff that needs to be initialized for it all to work. Patch from Eitan Isaacson. (LP: #349031) * Give the indicator applet an ATK name so it can be found by the accessibility frameworks. Patch from Eitan Isaacson. (LP: #349031) * Making it so the 'No Indicators' situation uses a label instead of a desensitized menu item to allow right click through. (LP: #346359) * Remove the making of 'Indicator Applet Factory' translatable. (LP: #349540) * Make sure translations get loaded and make the 'No Indicators' error and the license translatable. Patch from Gabor Kelemen. (LP: #349998); debian/control: Adding libgnomeui-dev as a dependency as it was added upstream. (1b7e454) 2009-03-27 Ted Gould * Now in jaunty (9a1d935) * debian/control: Adding libgnomeui-dev as a dependency as it was added upstream. (3e8de8a) * New upstream version * Changing the text in the license box to make sense. (LP: #346215) * Call GNOME Program Init to initialize all of the ATK and gettext stuff that needs to be initialized for it all to work. Patch from Eitan Isaacson. (LP: #349031) * Give the indicator applet an ATK name so it can be found by the accessibility frameworks. Patch from Eitan Isaacson. (LP: #349031) * Making it so the 'No Indicators' situation uses a label instead of a desensitized menu item to allow right click through. (LP: #346359) * Remove the making of 'Indicator Applet Factory' translatable. (LP: #349540) * Make sure translations get loaded and make the 'No Indicators' error and the license translatable. Patch from Gabor Kelemen. (LP: #349998) (ef07f36) * debian/control: Add dependency to indicator-messages; the applet is currently fairly useless without it. (LP: #346359) (f4b6ce1) * Merging in upstream version 0.1.4 (3151d53) * Patch from Gabor Kelemen to make the license and 'No Indicators' message translatable. (02501d7) (tag: 0.1.4) * Removing the translatable marking for 'Indicator Applet Factory' (31ea8d2) * Bad truth in the hide function. (497702e) 2009-03-26 Ted Gould * Adding another bug that gets fixed with Eitan's merge. (b02adf3) * Comment for label (d917e8b) * Switching the case for 'No Indicators' to make it a label to still support right click through. (045b257) * Changing license in about box to make sense. (1f7ae08) * ATK name for Eitan (f6bd9e6) * Getting gtkdoc stuff to be a little happier (37af771) * Bumping version (0d98376) * Merging in Eitan's changes to make the applet a GNOME Program (8fd2e25) 2009-03-26 Eitan Isaacson * Add gnome_program_init with LIBGNOMEUI_MODULE. (acc7f89) 2009-03-25 Martin Pitt * releasing version 0.1.3-0ubuntu2 (9e0aabb) (tag: 0.1.3-0ubuntu2) * debian/control: Add dependency to indicator-messages; the applet is currently fairly useless without it. (LP: #346359) (ec4b835) 2009-03-18 Ted Gould * Cleaning up Changelog (345e246) * Merging in upsream 0.1.3 (7c4a7a5) * Changing version number (1ec78fc) (tag: 0.1.3) 2009-03-17 Ted Gould * releasing version 0.1.2-0ubuntu3~ted4 (6c97fee) * releasing version 0.1.2-0ubuntu3~ted3 (3cb0dc3) * Removing all the gobject stuff from the debian build files (321d1da) * Getting explicit disable (d4d1a0e) * Seems that we still get errors without it being there, I'm not sure why, but making it so that we can explicitly disable the gobject-introspection. That should work for now. (ec34124) * releasing version 0.1.2-0ubuntu3~ted2 (bbf57e6) * releasing version 0.1.2-0ubuntu3~ted1ubuntu1 (95e61d1) * releasing version 0.1.2-0ubuntu3~ted1 (b2791c3) * Removing GObject introspection from the build deps (4086f8b) * Changes to make GIR optional from the applet branch (fe24c75) * Merging in the Ubuntu packaging versions (148a7df) * Making it so that the GIR stuff autodetects and only builds if available. (fdc47f8) 2009-03-17 Martin Pitt * debian/copyright: Fix download location. (78eda23) * Add bzr-builddeb configuration (merge mode). Fortunately this doesn't insist on having *only* debian/ in bzr. This gives us the best of both worlds, bzd-bd auto-downloading orig.tar.gz and merging in the pre-generated autoconf stuff, and retaining the possibility of merging directly from trunk, since we keep the full upstream source in this branch. (f5f204a) * Add debian/watch. (2a0f3ae) * retroactively mark 0.1.1-0ubuntu2 as uploaded (0bbf490) 2009-03-16 seb128 * updated shlibs version (a74264a) * indicator-applet (0.1.2-0ubuntu1) jaunty; urgency=low (deccbbb) 2009-03-15 Ted Gould * Cleaning up the changelog (dab5af7) 2009-03-13 Ted Gould * releasing version 0.1.2-0ubuntu1~ppa2 (a015eb5) 2009-03-12 Ted Gould * releasing version 0.1.2-0ubuntu1~ppa1 (7ddf215) * Merging in 0.1.2 (8a4010a) * Fixes for distcheck (cad7516) (tag: 0.1.2) * Changing version number (34d085b) * Stealing the 'fast-user-switch-applet' name to get better theming (ad92d55) * Fixing the popup to have the about (5299a2c) * Right click menu is working, but without an about (2d63bb5) 2009-03-09 Ted Gould * Fix doubling of prototypes, patch from Eitan (c1663bc) * Putting the example executables in libexec and the source code in doc/examples (a2af5af) 2009-02-25 Ted Gould * releasing version 0.1.1-0ubuntu3~ppa3 (ef381a0) * Linking in the build interfaces, needed a temporary function to get linking right (d5ba977) * Forgot to put these in built sources (cb288de) * true is TRUE (e792f8a) * Adding build instructions for the listener interface (87a9458) * Merging from core-dev branch (9d3143b) * Merging in changes to put back in the GObject introspection and to have better build characteristics. (2a8dfa8) * Adding in the listeners interface (22ccedb) * Typo (cf43323) * releasing version 0.1.1-0ubuntu3~ppa2 (e835fb9) * Adding back in the GIR files and some distclean improvements to get back to NULL. (903ce09) * releasing version 0.1.1-0ubuntu3~ppa1 (97133c8) 2009-02-22 Ted Gould * An interface to get the list of servers from another listener (13881cb) * Adding information on how the server was added, but not really using it for anything yet. I'm not sure that we can -- bother. (84c1b5e) 2009-02-19 Martin Pitt * src/applet-main.c, applet_fill_cb(): Do not show anything if we are running under a stracciatella GNOME session (i. e. without Ubuntu components). See UbuntuSpec:stracciatella-session. (3bc5b8e) * releasing version 0.1.1-0ubuntu1 (477eb61) (tag: 0.1.1-0ubuntu1) * new upstream release 0.1.1 (fac33da) 2009-02-18 Ted Gould * Releasing 0.1.1 with build fixes and icons. (b645beb) (tag: 0.1.1) * releasing version 0.1-0ubuntu3~ppa1 (7554f5e) * Merging in icon changes (7aeff8e) * Changing the icon to be our fancy new one. (78a8495) * Adding in the autotools stuff for installing an icon. (971633d) * Ken's very cool Indicator Applet plugin. (fba553c) 2009-02-17 Ted Gould * Cherry picking r137 from the ubuntu-core-dev packaging branch that has licensing fixes (19665b4) * Cherry picking r136 from the ubuntu-core-dev packaging branch that cleans up the licensing, descriptions, and adds additional info (3fe3f9f) * Cherry picking r130 from the ubuntu-core-dev packaging branch that cleans up the changelog, adds better descriptions and updates the entries in the control file. (4c82f21) * Configure changes to include gio (8fbbd8a) * Mostly build related changes coming from the upstream branch. (af72d15) * This is a generated file. Shouldn't be in VCS. (177afdd) * Adding the license info (e86d48d) * Adding the LGPL licenses and making sure they get into the tarball. (711265c) 2009-02-17 Martin Pitt * debian/copyright: Fix leftover word "either" from the license description. (e072dee) * debian/control: Update package descriptions; the messaging part is provided by indicator-messages. (23d6623) * debian/control: Fix Vcs-Bzr. (7009e0c) * releasing version 0.1-0ubuntu1 (f0eb6e3) (tag: 0.1-0ubuntu1) * configure.ac: Add missing gio-2.0 pkgconfig check (from DX team PPA packaging branch), and autoreconf to pick up the change. (5dc54bd) * Repack orig.tar.gz with a copy of the LGPL 3, libindicate/* is under that license. (93794c8) * debian/copyright: Properly describe licenses. (b3c78cf) * debian/control: Add Homepage:, Vcs-Bzr:, and proper package descriptions. (b41bed6) * flush changelog for ubuntu packaging branch (174ce19) 2009-02-16 Ted Gould * Trying to add in some extra files that seem useful for building, gtk-doc still fails. (d4ebcf1) * Oops, should get the screw up right... (25bb9e3) * Adding a couple of files to the distribution to pass distcheck (b57c4ff) 2009-02-15 Ted Gould * releasing version 0.1~ppa41 (3cea98d) * Putting on a handle; Adding in a background function from panel-lib (3e126a2) * This function seems to set up the widget correctly with the background. It's undocumented, but most other applets seem to do it. (8336b57) * Putting a little handle on the indicators. Works for GNOME Panel. (6012d33) * releasing version 0.1~ppa40 (e424f77) * Merging in from the 'upstream' branch. Changes include the addition of a server signal for the NULL indicator. And a warning fix for icons. (55b9343) * Removing the debian directory. Going to start using this as my upstream branch and the other as the packaging branch. (975000d) * Adding a handler for the new server display signal, and then make the messages more clear between the two. (524e5b9) * Adding a new signal in that handles the ID of zero, or null, comming back from a listener and uses that to show the server. Or atleast signal it to figure out how to do that. Also cleaning up the signals a little to use defines. (3a3a6e5) * Adding a check for NULL string in the icon parsing code. This will stop a bunch of warnings coming from everything else. (0e0780f) 2009-02-13 Ted Gould * releasing version 0.1~ppa39 (50a37ef) * Fixing a bug in the listener where properties weren't available on running servers. (f079d67) * Ah, declared a variable in an if so that it didn't get out of scope. Like it should have. Bah. (ebe1c53) * Adding in a set of functions to get the properties off of a server (17d0da7) 2009-02-12 Ted Gould * releasing version 0.1~ppa38 (9919392) * Adding in GIO to the list of linked modules. (f298782) * releasing version 0.1~ppa37 (33dc1d7) * Making time and icons happy and work well. Also adding lots of fun tests for them. (a7d062c) * Forgot to set the timer back to something reasonable! (2c157aa) * Adding in support for icons, specifically passing them back and forth on the bus (3eb4043) * Changing from using a memory stream to using a buffer, the memory stream one seems to be broken. (6b3a32c) * Adding in the function to take a pixbuf, turn it into a png, base64 encode it and then send it across the wire. (a2e77d6) * Changing the icon data to be base64 encoded, should have done that originally, how silly. (1a8b895) * Seems like a better name (52cd253) * Fixing some prototypes to fix warnings and errors we haven't yet encountered. Also setting the type so that our switch statement actually works. (e921d55) * Adding in some debug messages and making the signal use the original key to broadcast itself. (8b91e1d) * Added in a way to print the values of properties while they change. More later, but a start. (1a5e21e) * Seeing what happens if I turn on "sign always" in Bazaar. (b94d3a7) * Adding in the code for handling icons and time (c3964b3) * Rebuilding the way that priorities get done so that we can handle a time and icon version of the functions so that apps don't have to worry about those details. (ee27474) * Setting the properties property and picking up Empathy's desktop file (8a2cf34) * Adding in a timer function to change the time every three minutes or so in order to test modifying times. (e1c5a98) * Using the time property function (31d107e) * Adding in a time property function (184a04a) 2009-02-11 Ted Gould * Merging from trunk (2717850) * releasing version 0.1~ppa36 (24fd755) * Merging in the changes to make it so that properties work right, get handled properly by the listener and have convience functions. Also lots of little important cleanups. (fe7b7c4) * Cleaning up some debug messages that aren't as useful anymore (2f2fdfe) * Switching to ref_default (47decbd) * Fixing the deallocation to check the right parameters. (734c7ea) * Turning off some debugging, reformatting, and putting the connection into the proxy_t structure (2c02884) * Basically things are working as the proxyts are now findable. (ef78255) * Fixing the call, checking both lists of proxies, and adding some debug info. (609f0c8) * Removing an annoying warning (69bec2a) * Adding a check for type in the middle of the state machine for building a server. (5feca66) * Adding in a ref-default function so that we can keep one listener around for fun and profit. (584e64c) * Getting all the legal stuff in. (8c06d7e) * Putting license information everywhere. (7e01f3a) * Adding in an author (5b84e20) * Adding GPL to the tests (468fb34) * Adding the GPL to this file (25f9a81) * Putting the debian copyright info in (17a13da) * Adding a license to the top of all these files. LGPL 2/3 (390c348) 2009-02-10 Ted Gould * Adding to the convience functions for setting the desktop file and the type of the server. (3ca33fc) * Building a way to get properties. Seems like this should be in the DBus libs, but anyway. Here is the code that compiles and claims that it'll do it. More code than I would have liked. (49220be) * Avoiding a conflict with GObject's get_type function. (8bfb5a1) * Adding in real functions to match the prototypes. (0fcfc2b) * Adding in functions to match the prototypes. (5a03a06) * Adding in a set_type function and fixing the prototype for set_desktop (c6eab16) * Changing type to message.im for testing, now it's different than the messages. (ee050d4) * Adding an API for getting the type and desktop files (01244bc) * Including type information in the creation and destruction of servers (a9e725a) 2009-02-09 Ted Gould * Merge from trunk (42e990f) * releasing version 0.1~ppa35 (9d73c89) * Only emitting a changed signal on properties changed when the indicator is visible (50411f8) * Some formatting, reusing the private variable, making it so that hide sends the type and only sending a message of finalize if we're still visible. (eb7ca97) * Server hide function from Niel (d7d7036) 2009-02-09 Neil Jagdish Patel * Add the indicate_server_hide function (d42c9b5) 2009-02-07 Ted Gould * Sending the type with the signal in the listener, adding it into the tests. (b955805) * Changing the signals for show/hide to send the type correctly. (af60279) * Setting the type of the server (455dbe3) 2009-02-06 Ted Gould * releasing version 0.1~ppa34 (f308079) * Making the listener handle the case where we're using the new show/hide structure. (4cf9eec) * Ah, stupid little wrong function (603808b) * releasing version 0.1~ppa33 (e5e968c) * releasing version 0.1~ppa32 (37a0956) * Tracking the type of the server in the proxyt structure (0b687ad) * Changing the prototypes to start using the server added stuff (aa624cd) * releasing version 0.1~ppa31 (720e250) * releasing version 0.1~ppa30 (07f61bd) * Removing GObject introspection for now (e2fae3b) * releasing version 0.1~ppa29 (18daf0a) 2009-02-05 Ted Gould * releasing version 0.1~ppa28 (246b29b) * Merging in the trunk changes (c18cbee) * Adding properties for doing type and desktop (c4db8e8) * Changing the DBUS API slightly. Now there is no 'get_desktop' function as desktop is a property. Added a property for type so that we can understand what kind of application this is. And finally adding show/hide signals on the server as they were already on the listener. (a14b6dd) * releasing version 0.1~ppa27 (e6ff0d4) * releasing version 0.1~ppa23 (d52c59b) * Adding in the API function to take and icon and display it. Just the prototype. (5cf3a79) 2009-02-04 Ted Gould * typo (d95b170) * releasing version 0.1~ppa26 (206b407) * Merge in documentation and icons (cf719f1) 2009-02-04 Neil Jagdish Patel * Set the widget name on the applet rather than the menubar, to make sure it's picked up globally. (eae7dfc) 2009-02-04 Ted Gould * Removing the icons from the larger applet (7ef6658) * Adding a conflicts and a replaces to get rid of errors. (663d926) * ppa23 (212b175) * Polish it up (9ff950e) * Making it so that there is no more boarder on the menu bar (b5314b8) 2009-02-04 Neil Jagdish Patel * indicator-applet (0.1~ppa22) intrepid; urgency=low (124eadc) * Fix coding style (3002304) 2009-02-03 Neil Jagdish Patel * Enable support for a "transparent" panel applet, which reacts to the gnome- panel theme changes (e886446) 2009-02-03 Ted Gould * Getting gtk-doc working (c074cf6) * Getting everything together to try and build docs (47aedec) * Getting the dirs right (bccae5a) * Getting SUBDIRS right (aa26429) * I think this will add gtk docs (2f6177e) * Putting in the makefiles for the docs and the reference docs (7a91603) * Adding in checks for GTK Doc (5d714e6) * Merge from trunk (0223011) * Adding in package fixes from seb128 * Removing scrollkeeper * Changing libindicate to libindicate0 * Removing .la file * Removing targets for files in libindcate-dev.install * Removing pkg-create-dbgsym; Adding a build depend on pkg-create-dbgsym (3c879bc) 2009-02-03 Neil Jagdish Patel * Allow sub-classes of server to emit signals using three new public functions (67d2967) 2009-02-02 Ted Gould * Bump for PPA (a0440fa) * Should have been for Intrepid (935d457) 2009-01-30 Ted Gould * Adding interface for listener sending back a display request. (f1c8ad7) * Listener interface for signalling an indicator (722c621) * Adding a print message for when the indicator is signaled (21a212b) * Adding an interface to call back to an indicator and display it. (2adf895) 2009-01-29 Ted Gould * Guess I should merge trunk back in at some point. (d9e7ed9) * Fixing the handling of named DBus connections; Moving most of the data in the objects to private sections; Making the signal names defines for easier usage; Having property changes actually work now. (17bc0da) * Changing the include directory from 1.0 to 0.1 which gives us more room to screw up (de80300) * Wow, I didn't realize we weren't handling properties at all correctly. Fixed now. Whew. (fab825e) * Adding a set property after the show to cause a signal (054c9ba) * Have the server pass along the property modified signal (f5e7d6d) * Adding a property modified signal to the indicator object (dd60c62) * Making all of the server values move into a private section like all the others. Generally a good thing and good clean up (759d62b) * Making the indicator properties private, they should be. Also cleans up some deps. (c0a3238) * Removing the gobject-introspection-repository from the list of build depends as we needed it for the dbus stuff, that we're no longer using. (d898b21) * Removing DBus from the gobject introspection (d2f37fb) * Oops, forgot the header there (116ff8e) * Okay, moving all of the variables from the listener class into a private object. This is to make the GObject introspection not need dbus, and thus we can reduce our build deps significantly. (82c65bf) * Use the new fangled defines to make things cleaner (ab78f47) * Getting some helper defines for some of the hacks that'll probably change in the future (63630dc) * Using the defines for the signal names (5454aee) * Making the signals use #defines to make everything a little more predictable. I hate this part of GObject signals. (fea68aa) * Adding a variable to make the compiler happier (492652a) 2009-01-26 Ted Gould * Changed to only listen to reference names instead of descriptive ones. Hopefully this'll fix a crash. (b96eebb) 2009-01-22 Ted Gould * Forgot to run autogen.sh before last package :( (b6c1425) 2009-01-21 Ted Gould * Update API slightly and some fixes. (d186804) * Adding in a message indicator and a small test to use it. (8199742) * Adding in the im-client test and fixing a couple of bugs it found (0fc106d) * Adding in a type for indicators that are messages (48697b9) * Generated source files (58a667b) * Adding in listener_get_property (ea69948) * Adding in a get_property function (2ed2801) 2009-01-19 Ted Gould * Wrong indicate include directory in package config files (e782c32) * Wrong indicate include directory in package config files (640fb32) 2009-01-16 Ted Gould * Moving the gir file to the right package (dbe2080) * Removing the gir file from the applet so that it's only with the library so that we can install all of them. (7a5bf13) * Adding the GObject Introspection files into the build and the packaging. (ba631e9) * Shell script integrated into the autotools system (e3f1f4e) * Bringing GObject Introspection into the build and making it so that it gets installed with the library. (ac140d5) * Build fix (e83283e) * Adding in libtool to build deps (09d01e6) * Getting the debian package built up so that it can have a seperate library binary package. (0eb5899) * Changing the build targets, now I understand the difference between 'any' and 'all' (872812a) * Making it so the lib only uses glib (which it does) (913c9d2) * Adding in the libindicate lib. (28c26d8) * Moving the tests so that they can guarantee to build after the library builds as otherwise they end up getting built first. (8f80127) * Adding in a return that was missing (though it's useless) (487239d) * Building the listener object that listens to all of the folks on DBus and turns that into a usable interface for indicator display folks. A lot of code to make things simple :) (2b6ce30) * Handling the case that we're destroying an entry because the bus told us to. Properly signalling all of the removals (df1713a) 2009-01-15 Ted Gould * Fixing the printing and the saving of indicators. (ad1cc2d) * Changing the test to do the printing by itself instead of using the debug messages in the class itself (fe3addb) * Getting the signals in shape (0d1e01e) * Okay, adding the other signals in and keeping track of the indicators that are hanging around. Now, to connect to things external. (2722037) * Get the type of the list of indicators that we got, and then set the up to register (0ff1165) * Now correctly calling the get indicators function to get the indicators on already created objects. (fb5b330) * Adding in a marshaller for the DBus signals that we need (e50f228) * Now doing some DBus listening and getting some of the initial configuration built up. (d1c2ed2) * Changing to the dbus interface and changing to build teh client and server interfaces (421cea2) * Amazing how a little string can make such a huge difference. (4c623e4) * Adding in a basic listening test (da2657e) * Adding a new function (6ba4025) * Starting to flesh out the listener a little bit, should get a list of names on teh bus at this point (441032c) * Adding in the base object for the listener. (ccac9b8) * Cut-and-paste error (48277fb) 2009-01-14 Ted Gould * Okay, I think this is the end of server and indicator minus all the bugs that I expect to find :) (8a2369b) * Cleaning up prototypes and type warnings. (284b3dd) * Who the hell would design an API that passes in arrays of strings differently than it passes them out. What an insane idea. Oh yeah, properties work. (bda3bbf) * Merging in code from yesterday. Got many of the functions working with real IDs and making lists. The basis for all the properties stuff is there but it still needs a touch of fleshing out. Also a new test for debugging. (89bf87a) * Chaning the property list parameters to be pointer arrays. (c145922) 2009-01-13 Ted Gould * Making the indicator lookup it's own function and trying it out in another function to get a property. (a72a4ce) * Adding in some properties to the mix (cb3ce99) * Adding in a display function and a list by type. (4670fee) * Man, a lot of work for messing up one explaination point. (1c7343c) * Making it so that the indicators all have unique IDs (82dee94) * Forgot to actually add the test (f64b5d9) * Ah, we weren't checking if we were visible. Now things are better. (0b4e54d) * Return to crashing beauty (bba89ed) * Add a test to create a lot of indicators. (3dbe51d) * Merging in Robert's changes. (5030c34) 2009-01-13 Robert Carr * Add script to build GObject-introspection GIR, and boilerplate JavaScript test. (71820cb) * Use G_BEGIN/END_DECLS, and put the GOBject *_get_type functions in the header file (needed by introspection, but also the normal GLib style). (27a71bb) * Merge Ted's changes. I should have used bzr bind. (544dec8) * Add pkgconfig file. (35c5045) 2009-01-12 Ted Gould * Fleshing out more functions, we can now return a list of ids. Need to test with more. (5525628) * Whoo Hoo, we can count (cd4f548) * Fleshing out the whole show and hide thing. We should also be signalling when indicators are added or removed from the server. (514837a) * Clean up the signal handlers and fixing the call in the test function. Now we're to the point of showing the way I think things should be. (2dc2f26) * Basic show hide support in the indicator (3d55f90) * Changing to showing the inicator and make it so that we dont' crash right now. (b687b3a) * Adding in the base functions with pointers and fun stuff like that (245fdda) 2009-01-11 Ted Gould * Adding in signals so that we can talk to the app over DBus. Nice. (bea741f) 2009-01-09 Ted Gould * Adding in a show to help debugging (4d93780) * Adding in an indicator to the test and fixing a typo (55794df) * Connecting indicators and servers. They create themselves easily. (791b5f8) * Setting up the singleton nature of the server, and allow setting it. (57b3f58) * Fleshing out the server some in adding function and prototypes. (f8ca555) 2009-01-08 Ted Gould * Adding in build support for the indicate and crash test. Will make future ones easier. (5ed10df) * Adding in a simple program to crash after 15 seconds. Now we can add indicators to it. (fc3c5b9) * Building a pretty good set of virtual functions and getting them tied together, with errors too. (7e75808) * Basic GObject stuff (e2a3557) 2009-01-07 Ted Gould * Setting up version of the libraries. (d505bed) * Fixing stuff so that everything links all together (9389a6a) * Adding in a built sources tag to build the header file properly (4381e65) * Fixing linking and libraries and includes oh my (1068ff2) * Dummy starting file (20c59cd) * Adding libindicate to the build system (699c575) * Make file starting out to build this thing (3206434) * Basic server stuff (cd42ea2) * Fixing a bunch of typos, now it is a happy validating XML file. (ff7715c) * First version of XML DBus interface (e962748) * Dropping in more code to make these real GObjects and such (98bb151) 2008-12-20 Ted Gould * Stopping point (8e913de) 2008-12-04 Ted Gould * Moving the indicator directory cross-packages. (0d28e60) * Put in the kickarse loader code. Happy, happy. (227bcb3) * Building in a module loader (438133c) 2008-12-03 Ted Gould * Parse directories (2253177) * Making the applet very light. (75f4a72) * Okay, we're all doing everything perfect (bbc5347) * Making the applet a lot more sparce. Now we're going to load things dynamically. Let them have their own problems. (854bab0) * Removing everything except messaging. (e1092da) 2008-12-02 Ted Gould * Adding in all of the icons into the mockups. (a387d91) 2008-11-25 Ted Gould * Adding in icons from Ken. (52e4855) 2008-11-24 Ted Gould * Adding in some filler menus to get some depth. (c8ae9fe) * Adding in the infrastructure to have icons in the build. Only a dummy icon for now, but it's there and ready for some friends. (f458833) * Adding in additional files to catch translations (e23753e) * Removing the test menu item. (3f3e49b) * Adding in settings (edb2f89) * Blocking the prelight (f9b7c24) * Making spacing and alignment better (10629d4) * Getting some batteries in there. (98c6e94) * Basic power handler (c6c57ca) 2008-11-20 Ted Gould * First try at getting it not to hide on click. Fail. (35cef87) * Whoa, getting that inherited type wrong really messes things up. (13ad9d4) * Clean compile, but something is broken in the _init function. Not sure what. (a29584a) 2008-11-19 Ted Gould * Okay, blocked the prelight on the item, now how do I get my buttons out of event prison. (712bddc) * Getting all the widgets in the menu item. Doesn't quite work right, but the widgets are there. (9d3a43a) * Adding in a menu item to start putting in a slider. (04153d7) 2008-11-18 Ted Gould * Adding a depend for dbus-glib (4645182) * Version one of debian packaging. (9073e40) 2008-11-12 Ted Gould * Working on ideas for the prototype of the individual item stuff (947bc3f) * Starting to build functions to handle the menu spec over DBus (b63286e) * Okay, audio is an icon now. (b4b7ab3) * Connecting in all the different applets, now they can do their own thing. (b61274a) * Adding the basis for all the different indicators that we want to include (6a2c99b) * Switching from a label and an hbox to a menubar (99a07ef) * Ah, forgot to show the applet itself. (dd64e6a) * Putting a label in the widget (9d5abe0) * Adding in more documentation on the seperation between user interaction and the system services. (5781046) 2008-11-10 Ted Gould * A diagram about how intermediate daemons are going to provide status to the panel. (62605c2) * Getting some text that I'd written on the target API in the repo. (75e2280) * Indicator prototypes (0fdb6cc) 2008-10-30 Ted Gould * Ignoring some stuff (236c9a2) * Setting up the data directories and getting everything to translate nicely (237fca7) 2008-10-29 Ted Gould * Adding in the linking and some basic prototypes. (9b4a5fb) * Getting the build things together so that it starts building. Yeah. (435437a) * Basic build system, not quite working though (9c2e7b6) libayatana-indicator-0.9.4/CMakeLists.txt0000644000000000000000000000642414566140211015237 0ustar cmake_minimum_required(VERSION 3.13) project(libayatana-indicator C) if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "..." FORCE) endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) # Options option(ENABLE_TESTS "Enable all tests and checks" OFF) option(ENABLE_COVERAGE "Enable coverage reports (includes enabling all tests and checks)" OFF) option(ENABLE_WERROR "Treat all build warnings as errors" OFF) if(ENABLE_COVERAGE) set(ENABLE_TESTS ON) set(CMAKE_BUILD_TYPE "Coverage") else() set(CMAKE_BUILD_TYPE "Release") endif() if(ENABLE_WERROR) add_definitions("-Werror") endif() if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") add_definitions("-Weverything") else() add_definitions("-Wall") endif() # Check for prerequisites option(FLAVOUR_GTK2 "Build against GTK+-2.0" OFF) option(FLAVOUR_GTK3 "Build against GTK+-3.0" ON) option(ENABLE_LOADER "Build Ayatana Indicator Loader" ON) option(ENABLE_IDO "Enable IDO specific code" ON) if (FLAVOUR_GTK2) set (FLAVOUR_GTK3 OFF) set (ENABLE_IDO OFF) endif() if (FLAVOUR_GTK3) set (FLAVOUR_GTK2 OFF) endif() set(DEPS glib-2.0>=2.37 gmodule-2.0 gio-unix-2.0 ) if (FLAVOUR_GTK3) set(DEPS ${DEPS} gtk+-3.0>=3.24 ) endif() if (FLAVOUR_GTK2) set(DEPS ${DEPS} gtk+-2.0>=2.18 ) endif() if (FLAVOUR_GTK3 AND ENABLE_IDO) set(DEPS ${DEPS} libayatana-ido3-0.4>=0.8.2 ) endif() find_package (PkgConfig REQUIRED) pkg_check_modules(PROJECT_DEPS REQUIRED ${DEPS}) include(CheckLibraryExists) CHECK_LIBRARY_EXISTS(m sin "" HAVE_LIB_M) if (HAVE_LIB_M) set(EXTRA_LIBS ${EXTRA_LIBS} m) endif (HAVE_LIB_M) # Set global variables include(GNUInstallDirs) set(ABI_VERSION "7") set(API_VERSION "4") set(PROJECT_VERSION "0.9.4") set(PROJECT_NAME "libayatana-indicator") # Make everything add_subdirectory(src) add_subdirectory(data) if (ENABLE_LOADER) add_subdirectory(tools) endif() set (COVERAGE_TEST_EXECUTABLES "service-manager-connect" "service-manager-connect-service" "service-manager-no-connect" "service-manager-nostart-connect" "service-shutdown-timeout" "service-version-bad-service" "service-version-good-service" "service-version-manager" "service-version-multiwatch-manager" "service-version-multiwatch-manager-impolite" "service-version-multiwatch-service" "test-desktop-shortcuts" "test-loader" ) if(FLAVOUR_GTK3 AND ENABLE_IDO) set (COVERAGE_TEST_EXECUTABLES ${COVERAGE_TEST_EXECUTABLES} "test-indicator-ng" ) endif() if(ENABLE_TESTS) include(CTest) enable_testing() add_subdirectory(tests) if (ENABLE_COVERAGE) find_package(CoverageReport) ENABLE_COVERAGE_REPORT( TARGETS "ayatana-indicator3" TESTS ${COVERAGE_TEST_EXECUTABLES} FILTER /usr/include ${CMAKE_BINARY_DIR}/* ) endif() endif() # Display config info message(STATUS "Install prefix: ${CMAKE_INSTALL_PREFIX}") message(STATUS "GTK+-3.0 build: ${FLAVOUR_GTK3}") message(STATUS "GTK+-2.0 build: ${FLAVOUR_GTK2}") message(STATUS "Loader enabled ${ENABLE_LOADER}") message(STATUS "IDO enabled: ${ENABLE_IDO}") message(STATUS "Unit tests: ${ENABLE_TESTS}") message(STATUS "Build with -Werror: ${ENABLE_WERROR}") libayatana-indicator-0.9.4/COPYING0000644000000000000000000010451314566140211013530 0ustar GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble The GNU General Public License is a free, copyleft license for software and other kinds of works. The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. The precise terms and conditions for copying, distribution and modification follow. TERMS AND CONDITIONS 0. Definitions. "This License" refers to version 3 of the GNU General Public License. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. "The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work. A "covered work" means either the unmodified Program or a work based on the Program. To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. 1. Source Code. The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of a work. A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. The Corresponding Source for a work in source code form is that same work. 2. Basic Permissions. All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. 3. Protecting Users' Legal Rights From Anti-Circumvention Law. No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. 4. Conveying Verbatim Copies. You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. 5. Conveying Modified Source Versions. You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: a) The work must carry prominent notices stating that you modified it, and giving a relevant date. b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to "keep intact all notices". c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. 6. Conveying Non-Source Forms. You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. "Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. 7. Additional Terms. "Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or d) Limiting the use for publicity purposes of names of licensors or authors of the material; or e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. 8. Termination. You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. 9. Acceptance Not Required for Having Copies. You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. 10. Automatic Licensing of Downstream Recipients. Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. 11. Patents. A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version". A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. 12. No Surrender of Others' Freedom. If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. 13. Use with the GNU Affero General Public License. Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. 14. Revised Versions of this License. The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. 15. Disclaimer of Warranty. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 16. Limitation of Liability. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 17. Interpretation of Sections 15 and 16. If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. Copyright (C) This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: Copyright (C) This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an "about box". You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see . The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read . libayatana-indicator-0.9.4/data/ayatana-indicator3-no-IDO.pc.in0000644000000000000000000000076614566140211021042 0ustar prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} libdir=@CMAKE_INSTALL_FULL_LIBDIR@ bindir=@CMAKE_INSTALL_FULL_BINDIR@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ indicatordir=@CMAKE_INSTALL_FULL_LIBDIR@/ayatana-indicators3/@ABI_VERSION@/ iconsdir=@CMAKE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/icons/ Cflags: -I${includedir}/libayatana-indicator3-0.@API_VERSION@ Requires: gtk+-3.0 Libs: -layatana-indicator3 Name: libayatana-indicator3 Description: libayatana-indicator3. Version: @PROJECT_VERSION@ libayatana-indicator-0.9.4/data/ayatana-indicator3.pc.in0000644000000000000000000000101214566140211020000 0ustar prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} libdir=@CMAKE_INSTALL_FULL_LIBDIR@ bindir=@CMAKE_INSTALL_FULL_BINDIR@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ indicatordir=@CMAKE_INSTALL_FULL_LIBDIR@/ayatana-indicators3/@ABI_VERSION@/ iconsdir=@CMAKE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/icons/ Cflags: -I${includedir}/libayatana-indicator3-0.@API_VERSION@ Requires: gtk+-3.0 libayatana-ido3-0.4 Libs: -layatana-indicator3 Name: libayatana-indicator3 Description: libayatana-indicator3. Version: @PROJECT_VERSION@ libayatana-indicator-0.9.4/data/ayatana-indicator.pc.in0000644000000000000000000000076114566140211017727 0ustar prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} libdir=@CMAKE_INSTALL_FULL_LIBDIR@ bindir=@CMAKE_INSTALL_FULL_BINDIR@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ indicatordir=@CMAKE_INSTALL_FULL_LIBDIR@/ayatana-indicators/@ABI_VERSION@/ iconsdir=@CMAKE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/icons/ Cflags: -I${includedir}/libayatana-indicator-0.@API_VERSION@ Requires: gtk+-2.0 Libs: -layatana-indicator Name: libayatana-indicator Description: libayatana-indicator. Version: @PROJECT_VERSION@ libayatana-indicator-0.9.4/data/CMakeLists.txt0000644000000000000000000000152314566140211016143 0ustar # ayatana-indicator3-0.4.pc if (FLAVOUR_GTK3) if (ENABLE_IDO) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ayatana-indicator3.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator3-0.${API_VERSION}.pc" @ONLY) else() configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ayatana-indicator3-no-IDO.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator3-0.${API_VERSION}.pc" @ONLY) endif() install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator3-0.${API_VERSION}.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig/") else() configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ayatana-indicator.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-0.${API_VERSION}.pc" @ONLY) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-0.${API_VERSION}.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig/") endif() libayatana-indicator-0.9.4/INSTALL.md0000644000000000000000000000166714566140211014133 0ustar # Build and installation instructions ## Compile-time build dependencies - cmake (>= 3.13) - cmake-extras - glib-2.0 (>= 2.58) - gobject-introspection - vala (>= 0.16) - gtk+-3.0 (>= 3.24) - libayatana-ido (>=0.8.2) - gtest (>= 1.6.0) - gcovr (>= 2.4) - lcov (>= 1.9) ## For end-users and packagers ``` cd libayatana-indicator-X.Y.Z mkdir build cd build cmake .. make sudo make install ``` ## For testers - unit tests only ``` cd libayatana-indicator-X.Y.Z mkdir build cd build cmake .. -DENABLE_TESTS=ON make make test ``` ## For testers - both unit tests and code coverage ``` cd libayatana-indicator-X.Y.Z mkdir build cd build cmake .. -DENABLE_COVERAGE=ON make make test make coverage-html ``` **The install prefix defaults to `/usr`, change it with `-DCMAKE_INSTALL_PREFIX=/some/path`** **You can build a Gtk 2 version using `-DFLAVOUR_GTK2=ON`** **You can build a version without Ayatana IDO support using `-DENABLE_IDO=OFF`** libayatana-indicator-0.9.4/NEWS0000644000000000000000000001065714566140211013201 0ustar Overview of changes in libayatana-indicator 0.9.4 - src/indicator-service.c: Fix Robert's lastname in license header. - cmake: Install library as library. Overview of changes in libayatana-indicator 0.9.3 - src/indicator-ng.c: Do not show tooltip on labels while the menu is open. Overview of changes in libayatana-indicator 0.9.2 - Add tooltip support. - src/indicator-service.c: Make failure to connect to the session DBus fatal. Overview of changes in libayatana-indicator 0.9.1 - Clean up compilation flags. - src/{CMakeLists.txt,indicator.symbols}: Don't export private symbols. Immitate symbol exports as previously done with libtool. Overview of changes in libayatana-indicator 0.9.0 - src/indicator-ng.c: Make sure old menu item name is not NULL before comparison. (Thanks to Andrej Shadura). - Scale icons when loading from filename. (Thanks to Dani Llewellyn). - data/: Drop ayatana-indicators.target (moved to libayatana-common). - Update/add documentation. - Rename library source folder to src/. - tools/indicator-loader.c: Silence unused parameter warnings/errors for various functions. - Fix compiler warnings. - Add Travis CI configuration. - CMake port. Bye bye autotools. Overview of changes in libayatana-indicator 0.8.4 - libayatana-indicator/indicator-ng.c: Only run gtk_box_set_spacing() if object to operate on is a GTK_BOX. - Fix unit tests during package build. (Properly wrap around Xvfb and dbus-wrapper). Overview of changes in libayatana-indicator 0.8.3 - indicator-ng: Fix menu resizing for all themes. Overview of changes in libayatana-indicator 0.8.2 - Workaround for themes with scrolling arrows on the menu borders: disable menu arrows. - indicator-ng.c: Fix padding and spacing for hidden indicator item labels. - Fix duplicate location in the datetime indicator (and potentially other duplicated menu item flaws). Overview of changes in libayatana-indicator 0.8.1 - Enable menu scrolling + reset offset on popup. Resolves display problems with Indicator Messges consumers that provide a too-long list of unread messages (so that the scrolling kicks in in the indicator's menu). - Fix IDO insertion index in Indicator Messages with multiple clients. Overview of changes in libayatana-indicator 0.8.0 - This release breaks compatibility with all system indicators before 0.8.0 (for power indicator: before 2.1.0). - configure.ac: Bump IDO_REQUIRED_VERSION to 0.8.0. - Fix width of menu panes. - Use ayatanamenuitemfactory.(c|h) from ayatana-ido. Reduce code duplications. This also fixes renderer freezes in Ubuntu 20.04 (likely other versions of Ubuntu, too). - libayatana-indicator/indicator-ng.c: Try to prevent cascading failure if IDO creation fails. - Rename Ayatana Indicators specific x-canonical-* attributes to x-ayatana-* (esp. x-ayatana-type). This makes Ayatana Indicators work on Ubuntu. - Use ayatana-indicators.target as the systemd lifecycle unit, not ayatana-indicators-pre.target. - Fix tests and deprecations. - libayatana-indicator/indicator-ng.c: Resize open menus as items change. Overview of changes in libayatana-indicator 0.7.1 - Display and connect the Indicator Messages widgets Overview of changes in libayatana-indicator 0.7.0 - Display IDO widgets/Use own action muxer/Allow IDO CSS styling. Thanks to Robert Tari for working on this awesome improvement / bug fix. This has been long waited for!!! - Make building of `ayatana-indicator-loader3` optional. Thanks to Alexander Schlarb. Overview of changes in libayatana-indicator 0.6.3 - **/Makefile.am: Set -DGTK_DISABLE_DEPRECATED for gtk2 builds. Fixes FTBFS against Glib2.0 >= 2.62. - libayatana-indicator/indicator-object.c: Typo fix in comment. - GObject private API/ABI: Get rid of g_type_class_add_private() and use DEFINE_TYPE_WITH_PRIVATE(). Overview of changes in libayatana-indicator 0.6.2 - libayatana-indicator/indicator-ng.c: Type cast assignments from g_object_ref_sink(). - Makefile.am: Drop distcheck features. Overview of changes in libayatana-indicator 0.6.1 - configure.ac: Support pkg-config (<< 0.27). - autotools: Make systemd dependency optional. This makes libayatana-indicator available on Debian GNU/kFreeBSD and Debian GNU/Hurd. Overview of changes in libayatana-indicator 0.6.0 - Fork libayatana-indicator from Ubuntu's libindicator shared library. libayatana-indicator-0.9.4/NEWS.Canonical0000644000000000000000000000142214566140211015055 0ustar 12.10.1 - merge lp:~charlesk/libindicator/lp-1045372 to remove the 'cloak' code that caused libreoffice's menubars in unity to be greyed out after opening any dialog or switching windows (lp: 1045372) 12.10.0 - merge lp:~evgeni/libindicator/multiarch-same-devheaders so that we don't include build-time filenames in comments of the enum header files. If we do, the header files may be different on each build. This is especially harmful when building multiple times for multiple architectures and expecting the files to be identical. - merge lp:~charlesk/libindicator/fix-test-sources to fix a copy-and-paste error in specifying the tests' source files - merge lp:~charlesk/libindicator/cxx to constify the constructors for indicator_service_manager libayatana-indicator-0.9.4/README.md0000644000000000000000000000614214566140211013753 0ustar # libayatana-indicator - Ayatana Indicators Shared Library [![Build Status](https://api.travis-ci.com/AyatanaIndicators/libayatana-indicator.svg)](https://travis-ci.com/github/AyatanaIndicators/libayatana-indicator) ## About Ayatana Indicators The Ayatana Indicators project is the continuation of Application Indicators and System Indicators, two technologies developed by Canonical Ltd. for the Unity7 desktop. Application Indicators are a GTK implementation of the StatusNotifierItem Specification (SNI) that was originally submitted to freedesktop.org by KDE. System Indicators are an extensions to the Application Indicators idea. System Indicators allow for far more widgets to be displayed in the indicator's menu. The Ayatana Indicators project is the new upstream for application indicators, system indicators and associated projects with a focus on making Ayatana Indicators a desktop agnostic technology. On GNU/Linux, Ayatana Indicators are currently available for desktop envinronments like MATE (used by default in [Ubuntu MATE](https://ubuntu-mate.com)), XFCE (used by default in [Xubuntu](https://bluesabre.org/2021/02/25/xubuntu-21-04-progress-update/), LXDE, and the Budgie Desktop). The Lomiri Operating Environment (UI of the Ubuntu Touch OS, formerly known as Unity8) uses Ayatana Indicators for rendering its notification area and the [UBports](https://ubports.com) project is a core contributor to the Ayatana Indicators project. For further info, please visit: https://ayatana-indicators.org ## About this Software Component Modern desktop panels find out about indicators by looking at indicator service files in `/usr/share/ayatana/indicators`. These files need to have the same name as the well-known D-Bus name that the corresponding service owns. An indicator file is a normal key file (like a `.desktop` file). It must have an `[Indicator Service]` section, that must contain the service's name (`Name`) and the object path at which its action group is found (`ObjectPath`). For example: ``` [Indicator Service] Name=indicator-example ObjectPath=/org/ayatana/indicator/example ``` It should also contain a hint to where the indicator should appear in the panel: ``` Position=70 ``` The lower the position, the further to the right (or left when RTL is enabled) the indicator appears. An indicator can only export one action group, but it supports a menu for each profile ("desktop", "greeter", "phone"). There is a section for each of those profiles, containing the object path on which the menu is exported: ``` [desktop] ObjectPath=/org/ayatana/indicator/example/desktop [greeter] ObjectPath=/org/ayatana/indicator/example/desktop [phone] ObjectPath=/org/ayatana/indicator/example/phone ``` Object paths can be reused for different profiles (the greeter uses the same menu as the desktop in the above example). There are no fallbacks. If a profile is not mentioned in the service file, the indicator will not show up for that profile. ## License and Copyright See COPYING and AUTHORS file in this project. ## Building and Testing For instructions on building and running built-in tests, see the INSTALL.md file. libayatana-indicator-0.9.4/src/CMakeLists.txt0000644000000000000000000001341014566140211016017 0ustar # indicator-desktop-shortcuts.h # indicator-image-helper.h # indicator-ng.h # indicator-object.h # indicator-service-manager.h # indicator-service.h # indicator.h if (FLAVOUR_GTK3) # libayatana-indicator3.so set (ayatana_indicator_gtkver "ayatana-indicator3") else() # libayatana-indicator.so set (ayatana_indicator_gtkver "ayatana-indicator") endif() install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-desktop-shortcuts.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/lib${ayatana_indicator_gtkver}-0.${API_VERSION}/libayatana-indicator") install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-image-helper.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/lib${ayatana_indicator_gtkver}-0.${API_VERSION}/libayatana-indicator") install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-ng.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/lib${ayatana_indicator_gtkver}-0.${API_VERSION}/libayatana-indicator") install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-object.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/lib${ayatana_indicator_gtkver}-0.${API_VERSION}/libayatana-indicator") install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-service-manager.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/lib${ayatana_indicator_gtkver}-0.${API_VERSION}/libayatana-indicator") install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-service.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/lib${ayatana_indicator_gtkver}-0.${API_VERSION}/libayatana-indicator") install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/lib${ayatana_indicator_gtkver}-0.${API_VERSION}/libayatana-indicator") set(HEADERS indicator.h indicator-desktop-shortcuts.h indicator-image-helper.h indicator-object.h indicator-service.h indicator-service-manager.h ) if (FLAVOUR_GTK3 AND ENABLE_IDO) set(HEADERS ${HEADERS} indicator-ng.h ) endif() set(SOURCES gen-indicator-service.xml.c indicator-desktop-shortcuts.c indicator-image-helper.c indicator-object.c indicator-object-enum-types.c indicator-object-marshal.c indicator-service.c indicator-service-manager.c ) if (FLAVOUR_GTK3 AND ENABLE_IDO) set(SOURCES ${SOURCES} indicator-ng.c ) endif() # indicator-object-enum-types.h find_program(GLIB_MKENUMS glib-mkenums) add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/indicator-object-enum-types.h" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${GLIB_MKENUMS} --template indicator-object-enum-types.h.template ${HEADERS} --output="${CMAKE_CURRENT_BINARY_DIR}/indicator-object-enum-types.h" ) # indicator-object-enum-types.c add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/indicator-object-enum-types.c" DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/indicator-object-enum-types.h" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${GLIB_MKENUMS} --template indicator-object-enum-types.c.template ${HEADERS} --output="${CMAKE_CURRENT_BINARY_DIR}/indicator-object-enum-types.c" ) find_program(GLIB_GENMARSHAL glib-genmarshal) # indicator-object-marshal.h add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/indicator-object-marshal.h" DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/indicator-object-enum-types.c" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${GLIB_GENMARSHAL} --prefix=_indicator_object_marshal --header indicator-object-marshal.list --quiet --output="${CMAKE_CURRENT_BINARY_DIR}/indicator-object-marshal.h" ) # indicator-object-marshal.c add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/indicator-object-marshal.c" DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/indicator-object-marshal.h" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${GLIB_GENMARSHAL} --prefix=_indicator_object_marshal --body indicator-object-marshal.list --include-header=indicator-object-marshal.h --quiet --output="${CMAKE_CURRENT_BINARY_DIR}/indicator-object-marshal.c" ) add_custom_target("src-generated" DEPENDS "indicator-object-marshal.c") # gen-indicator-service.xml.h file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/gen-indicator-service.xml.h" "extern const char * _indicator_service;") # gen-indicator-service.xml.c file(READ "${CMAKE_CURRENT_SOURCE_DIR}/indicator-service.xml" GEN_INDICATOR_SERVICE_XML_C) string(REPLACE "\"" "\\\"" GEN_INDICATOR_SERVICE_XML_C ${GEN_INDICATOR_SERVICE_XML_C}) string(REPLACE "\n" "\\n\"\n\"" GEN_INDICATOR_SERVICE_XML_C ${GEN_INDICATOR_SERVICE_XML_C}) string(REGEX REPLACE "\n\"$" "\n" GEN_INDICATOR_SERVICE_XML_C ${GEN_INDICATOR_SERVICE_XML_C}) string(PREPEND GEN_INDICATOR_SERVICE_XML_C "const char * _indicator_service = \n\"") string(APPEND GEN_INDICATOR_SERVICE_XML_C "\;") file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/gen-indicator-service.xml.c" ${GEN_INDICATOR_SERVICE_XML_C}) # libayatana-indicator{,3}.so add_library("${ayatana_indicator_gtkver}" SHARED ${SOURCES}) set_target_properties("${ayatana_indicator_gtkver}" PROPERTIES VERSION ${ABI_VERSION}.0.0 SOVERSION ${ABI_VERSION}) target_compile_definitions("${ayatana_indicator_gtkver}" PUBLIC DG_LOG_DOMAIN="libayatana-indicator") target_include_directories("${ayatana_indicator_gtkver}" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS}) target_include_directories("${ayatana_indicator_gtkver}" PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories("${ayatana_indicator_gtkver}" PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) target_link_options("${ayatana_indicator_gtkver}" PRIVATE "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/indicator.symbols") target_link_libraries("${ayatana_indicator_gtkver}" ${PROJECT_DEPS_LIBRARIES} ${EXTRA_LIBS}) add_dependencies("${ayatana_indicator_gtkver}" "src-generated") install(TARGETS "${ayatana_indicator_gtkver}" LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}") libayatana-indicator-0.9.4/src/dbus-shared.h0000644000000000000000000000163614566140211015640 0ustar /* Shared defines for DBus interfaces and API versions to make sure the server and client agree. Copyright 2009 Canonical Ltd. Authors: Ted Gould This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #define INDICATOR_SERVICE_INTERFACE "org.ayatana.indicator.service" #define INDICATOR_SERVICE_OBJECT "/org/ayatana/indicator/service" #define INDICATOR_SERVICE_VERSION 1 libayatana-indicator-0.9.4/src/indicator-desktop-shortcuts.c0000644000000000000000000005212714566140211021112 0ustar /* A small file to parse through the actions that are available in the desktop file and making those easily usable. Copyright 2010 Canonical Ltd. Authors: Ted Gould This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #ifdef HAVE_CONFIG_H #include "config.h" #endif #include #include "indicator-desktop-shortcuts.h" #define ACTIONS_KEY "Actions" #define ACTION_GROUP_PREFIX "Desktop Action" #define OLD_GROUP_SUFFIX "Shortcut Group" #define OLD_SHORTCUTS_KEY "X-Ayatana-Desktop-Shortcuts" #define OLD_ENVIRON_KEY "TargetEnvironment" #define PROP_DESKTOP_FILE_S "desktop-file" #define PROP_IDENTITY_S "identity" typedef enum _actions_t actions_t; enum _actions_t { ACTIONS_NONE, ACTIONS_XAYATANA, ACTIONS_DESKTOP_SPEC }; typedef struct { actions_t actions; GKeyFile * keyfile; gchar * identity; GArray * nicks; gchar * domain; } IndicatorDesktopShortcutsPrivate; enum { PROP_0, PROP_DESKTOP_FILE, PROP_IDENTITY }; static void indicator_desktop_shortcuts_class_init (IndicatorDesktopShortcutsClass *klass); static void indicator_desktop_shortcuts_init (IndicatorDesktopShortcuts *self); static void indicator_desktop_shortcuts_dispose (GObject *object); static void indicator_desktop_shortcuts_finalize (GObject *object); static void set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec); static void get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); static void parse_keyfile (IndicatorDesktopShortcuts * ids); static gboolean should_show (GKeyFile * keyfile, const gchar * group, const gchar * identity, gboolean should_have_target); G_DEFINE_TYPE_WITH_PRIVATE (IndicatorDesktopShortcuts, indicator_desktop_shortcuts, G_TYPE_OBJECT); /* Build up the class */ static void indicator_desktop_shortcuts_class_init (IndicatorDesktopShortcutsClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->dispose = indicator_desktop_shortcuts_dispose; object_class->finalize = indicator_desktop_shortcuts_finalize; /* Property funcs */ object_class->set_property = set_property; object_class->get_property = get_property; g_object_class_install_property(object_class, PROP_DESKTOP_FILE, g_param_spec_string(PROP_DESKTOP_FILE_S, "The path of the desktop file to read", "A path to a desktop file that we'll look for shortcuts in.", NULL, G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY)); g_object_class_install_property(object_class, PROP_IDENTITY, g_param_spec_string(PROP_IDENTITY_S, "The string that represents the identity that we're acting as.", "Used to process ShowIn and NotShownIn fields of the desktop shortcust to get the proper list.", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY)); return; } /* Initialize instance data */ static void indicator_desktop_shortcuts_init (IndicatorDesktopShortcuts *self) { IndicatorDesktopShortcutsPrivate * priv = indicator_desktop_shortcuts_get_instance_private(self); priv->keyfile = NULL; priv->identity = NULL; priv->domain = NULL; priv->nicks = g_array_new(TRUE, TRUE, sizeof(gchar *)); priv->actions = ACTIONS_NONE; return; } /* Clear object references */ static void indicator_desktop_shortcuts_dispose (GObject *object) { IndicatorDesktopShortcuts * self = INDICATOR_DESKTOP_SHORTCUTS(object); IndicatorDesktopShortcutsPrivate * priv = indicator_desktop_shortcuts_get_instance_private(self); if (priv->keyfile) { g_key_file_free(priv->keyfile); priv->keyfile = NULL; } G_OBJECT_CLASS (indicator_desktop_shortcuts_parent_class)->dispose (object); return; } /* Free all memory */ static void indicator_desktop_shortcuts_finalize (GObject *object) { IndicatorDesktopShortcuts * self = INDICATOR_DESKTOP_SHORTCUTS(object); IndicatorDesktopShortcutsPrivate * priv = indicator_desktop_shortcuts_get_instance_private(self); if (priv->identity != NULL) { g_free(priv->identity); priv->identity = NULL; } if (priv->domain != NULL) { g_free(priv->domain); priv->domain = NULL; } if (priv->nicks != NULL) { guint i; for (i = 0; i < priv->nicks->len; i++) { gchar * nick = g_array_index(priv->nicks, gchar *, i); g_free(nick); } g_array_free(priv->nicks, TRUE); priv->nicks = NULL; } G_OBJECT_CLASS (indicator_desktop_shortcuts_parent_class)->finalize (object); return; } /* Sets one of the two properties we have, only at construction though */ static void set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec) { g_return_if_fail(INDICATOR_IS_DESKTOP_SHORTCUTS(object)); IndicatorDesktopShortcuts * self = INDICATOR_DESKTOP_SHORTCUTS(object); IndicatorDesktopShortcutsPrivate * priv = indicator_desktop_shortcuts_get_instance_private(self); switch(prop_id) { case PROP_DESKTOP_FILE: { if (priv->keyfile != NULL) { g_key_file_free(priv->keyfile); priv->keyfile = NULL; priv->actions = ACTIONS_NONE; } GError * error = NULL; GKeyFile * keyfile = g_key_file_new(); g_key_file_load_from_file(keyfile, g_value_get_string(value), G_KEY_FILE_NONE, &error); if (error != NULL) { g_warning("Unable to load keyfile from file '%s': %s", g_value_get_string(value), error->message); g_error_free(error); g_key_file_free(keyfile); break; } /* Always prefer the desktop spec if we can get it */ if (priv->actions == ACTIONS_NONE && g_key_file_has_key(keyfile, G_KEY_FILE_DESKTOP_GROUP, ACTIONS_KEY, NULL)) { priv->actions = ACTIONS_DESKTOP_SPEC; } /* But fallback if we can't */ if (priv->actions == ACTIONS_NONE && g_key_file_has_key(keyfile, G_KEY_FILE_DESKTOP_GROUP, OLD_SHORTCUTS_KEY, NULL)) { priv->actions = ACTIONS_XAYATANA; g_warning("Desktop file '%s' is using a deprecated format for its actions that will be dropped soon.", g_value_get_string(value)); } if (priv->actions == ACTIONS_NONE) { g_key_file_free(keyfile); break; } priv->keyfile = keyfile; parse_keyfile(INDICATOR_DESKTOP_SHORTCUTS(object)); break; } case PROP_IDENTITY: if (priv->identity != NULL) { g_warning("Identity already set to '%s' and trying to set it to '%s'.", priv->identity, g_value_get_string(value)); return; } priv->identity = g_value_dup_string(value); parse_keyfile(INDICATOR_DESKTOP_SHORTCUTS(object)); break; /* *********************** */ default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } return; } /* Gets either the desktop file our the identity. */ static void get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec) { g_return_if_fail(INDICATOR_IS_DESKTOP_SHORTCUTS(object)); IndicatorDesktopShortcuts * self = INDICATOR_DESKTOP_SHORTCUTS(object); IndicatorDesktopShortcutsPrivate * priv = indicator_desktop_shortcuts_get_instance_private(self); switch(prop_id) { case PROP_IDENTITY: g_value_set_string(value, priv->identity); break; /* *********************** */ default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } return; } /* Checks to see if we can, and if we can it goes through and parses the keyfile entries. */ static void parse_keyfile (IndicatorDesktopShortcuts * ids) { IndicatorDesktopShortcuts * self = INDICATOR_DESKTOP_SHORTCUTS(ids); IndicatorDesktopShortcutsPrivate * priv = indicator_desktop_shortcuts_get_instance_private(self); if (priv->keyfile == NULL) { return; } if (priv->identity == NULL) { return; } /* Remove a previous translation domain if we had one from a previously parsed file. */ if (priv->domain != NULL) { g_free(priv->domain); priv->domain = NULL; } /* Check to see if there is a custom translation domain that we should take into account. */ if (priv->domain == NULL && g_key_file_has_key(priv->keyfile, G_KEY_FILE_DESKTOP_GROUP, "X-GNOME-Gettext-Domain", NULL)) { priv->domain = g_key_file_get_string(priv->keyfile, G_KEY_FILE_DESKTOP_GROUP, "X-GNOME-Gettext-Domain", NULL); } if (priv->domain == NULL && g_key_file_has_key(priv->keyfile, G_KEY_FILE_DESKTOP_GROUP, "X-Ubuntu-Gettext-Domain", NULL)) { priv->domain = g_key_file_get_string(priv->keyfile, G_KEY_FILE_DESKTOP_GROUP, "X-Ubuntu-Gettext-Domain", NULL); } /* We need to figure out what we're looking for and what we want to look for in the rest of the file */ const gchar * list_name = NULL; const gchar * group_format = NULL; gboolean should_have_target = FALSE; switch (priv->actions) { case ACTIONS_NONE: /* None, let's just get outta here */ return; case ACTIONS_XAYATANA: list_name = OLD_SHORTCUTS_KEY; group_format = "%s " OLD_GROUP_SUFFIX; should_have_target = TRUE; break; case ACTIONS_DESKTOP_SPEC: list_name = ACTIONS_KEY; group_format = ACTION_GROUP_PREFIX " %s"; should_have_target = FALSE; break; default: g_assert_not_reached(); return; } /* Okay, we've got everything we need. Let's get it on! */ gsize i; gsize num_nicks = 0; gchar ** nicks = g_key_file_get_string_list(priv->keyfile, G_KEY_FILE_DESKTOP_GROUP, list_name, &num_nicks, NULL); /* If there is an error from get_string_list num_nicks should still be zero, so this loop will drop out. */ for (i = 0; i < num_nicks; i++) { /* g_debug("Looking at group nick %s", nicks[i]); */ gchar * groupname = g_strdup_printf(group_format, nicks[i]); if (!g_key_file_has_group(priv->keyfile, groupname)) { g_warning("Unable to find group '%s'", groupname); g_free(groupname); continue; } if (!should_show(priv->keyfile, G_KEY_FILE_DESKTOP_GROUP, priv->identity, FALSE)) { g_free(groupname); continue; } if (!should_show(priv->keyfile, groupname, priv->identity, should_have_target)) { g_free(groupname); continue; } gchar * nickalloc = g_strdup(nicks[i]); g_array_append_val(priv->nicks, nickalloc); g_free(groupname); } if (nicks != NULL) { g_strfreev(nicks); } return; } /* Checks the ONLY_SHOW_IN and NOT_SHOW_IN keys for a group to see if we should be showing ourselves. */ static gboolean should_show (GKeyFile * keyfile, const gchar * group, const gchar * identity, gboolean should_have_target) { if (should_have_target && g_key_file_has_key(keyfile, group, OLD_ENVIRON_KEY, NULL)) { /* If we've got this key, we're going to return here and not process the deprecated keys. */ gsize j; gsize num_env = 0; gchar ** envs = g_key_file_get_string_list(keyfile, group, OLD_ENVIRON_KEY, &num_env, NULL); for (j = 0; j < num_env; j++) { if (g_strcmp0(envs[j], identity) == 0) { break; } } if (envs != NULL) { g_strfreev(envs); } if (j == num_env) { return FALSE; } return TRUE; } /* If there is a list of OnlyShowIn entries we need to check to see if we're in that list. If not, we drop this nick */ if (g_key_file_has_key(keyfile, group, G_KEY_FILE_DESKTOP_KEY_ONLY_SHOW_IN, NULL)) { gsize j; gsize num_only = 0; gchar ** onlies = g_key_file_get_string_list(keyfile, group, G_KEY_FILE_DESKTOP_KEY_ONLY_SHOW_IN, &num_only, NULL); for (j = 0; j < num_only; j++) { if (g_strcmp0(onlies[j], identity) == 0) { break; } } if (onlies != NULL) { g_strfreev(onlies); } if (j == num_only) { return FALSE; } } /* If there is a NotShowIn entry we need to make sure that we're not in that list. If we are, we need to drop out. */ if (g_key_file_has_key(keyfile, group, G_KEY_FILE_DESKTOP_KEY_NOT_SHOW_IN, NULL)) { gsize j; gsize num_not = 0; gchar ** nots = g_key_file_get_string_list(keyfile, group, G_KEY_FILE_DESKTOP_KEY_NOT_SHOW_IN, &num_not, NULL); for (j = 0; j < num_not; j++) { if (g_strcmp0(nots[j], identity) == 0) { break; } } if (nots != NULL) { g_strfreev(nots); } if (j != num_not) { return FALSE; } } return TRUE; } /* Looks through the nicks to see if this one is in the list, and thus valid to use. */ static gboolean is_valid_nick (gchar ** list, const gchar * nick) { if (*list == NULL) return FALSE; /* g_debug("Checking Nick: %s", list[0]); */ if (g_strcmp0(list[0], nick) == 0) return TRUE; return is_valid_nick(&list[1], nick); } /* API */ /** indicator_desktop_shortcuts_new: @file: The desktop file that would be opened to find the actions. @identity: This is a string that represents the identity that should be used in searching those actions. It relates to the ShowIn and NotShownIn properties. This function creates the basic object. It involves opening the file and parsing it. It could potentially block on IO. At the end of the day you'll have a fully functional object. Return value: A new #IndicatorDesktopShortcuts object. */ IndicatorDesktopShortcuts * indicator_desktop_shortcuts_new (const gchar * file, const gchar * identity) { GObject * obj = g_object_new(INDICATOR_TYPE_DESKTOP_SHORTCUTS, PROP_DESKTOP_FILE_S, file, PROP_IDENTITY_S, identity, NULL); return INDICATOR_DESKTOP_SHORTCUTS(obj); } /** indicator_desktop_shortcuts_get_nicks: @ids: The #IndicatorDesktopShortcuts object to look in Give you the list of commands that are available for this desktop file given the identity that was passed in at creation. This will filter out the various items in the desktop file. These nicks can then be used as keys for working with the desktop file. Return value: A #NULL terminated list of strings. This memory is managed by the @ids object. */ const gchar ** indicator_desktop_shortcuts_get_nicks (IndicatorDesktopShortcuts * ids) { g_return_val_if_fail(INDICATOR_IS_DESKTOP_SHORTCUTS(ids), NULL); IndicatorDesktopShortcuts * self = INDICATOR_DESKTOP_SHORTCUTS(ids); IndicatorDesktopShortcutsPrivate * priv = indicator_desktop_shortcuts_get_instance_private(self); return (const gchar **)priv->nicks->data; } /** indicator_desktop_shortcuts_nick_get_name: @ids: The #IndicatorDesktopShortcuts object to look in @nick: Which command that we're referencing. This function looks in a desktop file for a nick to find the user visible name for that shortcut. The @nick parameter should be gotten from #indicator_desktop_shortcuts_get_nicks though it's not required that the exact memory location be the same. Return value: A user visible string for the shortcut or #NULL on error. */ gchar * indicator_desktop_shortcuts_nick_get_name (IndicatorDesktopShortcuts * ids, const gchar * nick) { g_return_val_if_fail(INDICATOR_IS_DESKTOP_SHORTCUTS(ids), NULL); IndicatorDesktopShortcuts * self = INDICATOR_DESKTOP_SHORTCUTS(ids); IndicatorDesktopShortcutsPrivate * priv = indicator_desktop_shortcuts_get_instance_private(self); g_return_val_if_fail(priv->actions != ACTIONS_NONE, NULL); g_return_val_if_fail(priv->keyfile != NULL, NULL); g_return_val_if_fail(is_valid_nick((gchar **)priv->nicks->data, nick), NULL); const gchar * group_format = NULL; switch (priv->actions) { case ACTIONS_XAYATANA: group_format = "%s " OLD_GROUP_SUFFIX; break; case ACTIONS_DESKTOP_SPEC: group_format = ACTION_GROUP_PREFIX " %s"; break; default: g_assert_not_reached(); return NULL; } gchar * groupheader = g_strdup_printf(group_format, nick); if (!g_key_file_has_group(priv->keyfile, groupheader)) { g_warning("The group for nick '%s' doesn't exist anymore.", nick); g_free(groupheader); return NULL; } if (!g_key_file_has_key(priv->keyfile, groupheader, G_KEY_FILE_DESKTOP_KEY_NAME, NULL)) { g_warning("No name available for nick '%s'", nick); g_free(groupheader); return NULL; } gchar * name = NULL; gchar * keyvalue = g_key_file_get_string(priv->keyfile, groupheader, G_KEY_FILE_DESKTOP_KEY_NAME, NULL); gchar * localeval = g_key_file_get_locale_string(priv->keyfile, groupheader, G_KEY_FILE_DESKTOP_KEY_NAME, NULL, NULL); g_free(groupheader); if (priv->domain != NULL && g_strcmp0(keyvalue, localeval) == 0) { name = g_strdup(g_dgettext(priv->domain, keyvalue)); g_free(localeval); } else { name = localeval; } g_free(keyvalue); return name; } /** indicator_desktop_shortcuts_nick_exec_with_context: @ids: The #IndicatorDesktopShortcuts object to look in @nick: Which command that we're referencing. @launch_context: The #GAppLaunchContext to use for launching the shortcut Here we take a @nick and try and execute the action that is associated with it. The @nick parameter should be gotten from #indicator_desktop_shortcuts_get_nicks though it's not required that the exact memory location be the same. Return value: #TRUE on success or #FALSE on error. */ gboolean indicator_desktop_shortcuts_nick_exec_with_context (IndicatorDesktopShortcuts * ids, const gchar * nick, GAppLaunchContext * launch_context) { GError * error = NULL; g_return_val_if_fail(INDICATOR_IS_DESKTOP_SHORTCUTS(ids), FALSE); IndicatorDesktopShortcuts * self = INDICATOR_DESKTOP_SHORTCUTS(ids); IndicatorDesktopShortcutsPrivate * priv = indicator_desktop_shortcuts_get_instance_private(self); g_return_val_if_fail(priv->actions != ACTIONS_NONE, FALSE); g_return_val_if_fail(priv->keyfile != NULL, FALSE); g_return_val_if_fail(is_valid_nick((gchar **)priv->nicks->data, nick), FALSE); const gchar * group_format = NULL; switch (priv->actions) { case ACTIONS_XAYATANA: group_format = "%s " OLD_GROUP_SUFFIX; break; case ACTIONS_DESKTOP_SPEC: group_format = ACTION_GROUP_PREFIX " %s"; break; default: g_assert_not_reached(); return FALSE; } gchar * groupheader = g_strdup_printf(group_format, nick); if (!g_key_file_has_group(priv->keyfile, groupheader)) { g_warning("The group for nick '%s' doesn't exist anymore.", nick); g_free(groupheader); return FALSE; } if (!g_key_file_has_key(priv->keyfile, groupheader, G_KEY_FILE_DESKTOP_KEY_NAME, NULL)) { g_warning("No name available for nick '%s'", nick); g_free(groupheader); return FALSE; } if (!g_key_file_has_key(priv->keyfile, groupheader, G_KEY_FILE_DESKTOP_KEY_EXEC, NULL)) { g_warning("No exec available for nick '%s'", nick); g_free(groupheader); return FALSE; } /* Grab the name and the exec entries out of our current group */ gchar * name = g_key_file_get_locale_string(priv->keyfile, groupheader, G_KEY_FILE_DESKTOP_KEY_NAME, NULL, NULL); gchar * exec = g_key_file_get_locale_string(priv->keyfile, groupheader, G_KEY_FILE_DESKTOP_KEY_EXEC, NULL, NULL); g_free(groupheader); GAppInfoCreateFlags flags = G_APP_INFO_CREATE_NONE; if (launch_context) { flags |= G_APP_INFO_CREATE_SUPPORTS_STARTUP_NOTIFICATION; } GAppInfo * appinfo = g_app_info_create_from_commandline(exec, name, flags, &error); g_free(name); g_free(exec); if (error != NULL) { g_warning("Unable to build Command line App info: %s", error->message); g_error_free(error); return FALSE; } if (appinfo == NULL) { g_warning("Unable to build Command line App info (unknown)"); return FALSE; } gboolean launched = g_app_info_launch(appinfo, NULL, launch_context, &error); if (error != NULL) { g_warning("Unable to launch file from nick '%s': %s", nick, error->message); g_clear_error(&error); } g_object_unref(appinfo); return launched; } /** indicator_desktop_shortcuts_nick_exec: @ids: The #IndicatorDesktopShortcuts object to look in @nick: Which command that we're referencing. Here we take a @nick and try and execute the action that is associated with it. The @nick parameter should be gotten from #indicator_desktop_shortcuts_get_nicks though it's not required that the exact memory location be the same. This function is deprecated and shouldn't be used in newly written code. Return value: #TRUE on success or #FALSE on error. */ gboolean indicator_desktop_shortcuts_nick_exec (IndicatorDesktopShortcuts * ids, const gchar * nick) { return indicator_desktop_shortcuts_nick_exec_with_context (ids, nick, NULL); } libayatana-indicator-0.9.4/src/indicator-desktop-shortcuts.h0000644000000000000000000000674614566140211021125 0ustar /* A small file to parse through the actions that are available in the desktop file and making those easily usable. Copyright 2010 Canonical Ltd. Authors: Ted Gould This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #ifndef __INDICATOR_DESKTOP_SHORTCUTS_H__ #define __INDICATOR_DESKTOP_SHORTCUTS_H__ #include #include #include G_BEGIN_DECLS #define INDICATOR_TYPE_DESKTOP_SHORTCUTS (indicator_desktop_shortcuts_get_type ()) #define INDICATOR_DESKTOP_SHORTCUTS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_TYPE_DESKTOP_SHORTCUTS, IndicatorDesktopShortcuts)) #define INDICATOR_DESKTOP_SHORTCUTS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_TYPE_DESKTOP_SHORTCUTS, IndicatorDesktopShortcutsClass)) #define INDICATOR_IS_DESKTOP_SHORTCUTS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_TYPE_DESKTOP_SHORTCUTS)) #define INDICATOR_IS_DESKTOP_SHORTCUTS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_TYPE_DESKTOP_SHORTCUTS)) #define INDICATOR_DESKTOP_SHORTCUTS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_TYPE_DESKTOP_SHORTCUTS, IndicatorDesktopShortcutsClass)) typedef struct _IndicatorDesktopShortcuts IndicatorDesktopShortcuts; typedef struct _IndicatorDesktopShortcutsClass IndicatorDesktopShortcutsClass; /** IndicatorDesktopShortcutsClass: @parent_class: Space for #GObjectClass The vtable for our precious #IndicatorDesktopShortcutsClass. */ struct _IndicatorDesktopShortcutsClass { GObjectClass parent_class; }; /** IndicatorDesktopShortcuts: @parent: The parent data from #GObject The public data for an instance of the class #IndicatorDesktopShortcuts. */ struct _IndicatorDesktopShortcuts { GObject parent; }; GType indicator_desktop_shortcuts_get_type (void); IndicatorDesktopShortcuts * indicator_desktop_shortcuts_new (const gchar * file, const gchar * identity); const gchar ** indicator_desktop_shortcuts_get_nicks (IndicatorDesktopShortcuts * ids); gchar * indicator_desktop_shortcuts_nick_get_name (IndicatorDesktopShortcuts * ids, const gchar * nick); gboolean indicator_desktop_shortcuts_nick_exec_with_context (IndicatorDesktopShortcuts * ids, const gchar * nick, GAppLaunchContext * launch_context); GLIB_DEPRECATED_FOR(indicator_desktop_shortcuts_nick_exec_with_context) gboolean indicator_desktop_shortcuts_nick_exec (IndicatorDesktopShortcuts * ids, const gchar * nick); G_END_DECLS #endif libayatana-indicator-0.9.4/src/indicator.h0000644000000000000000000000243514566140211015411 0ustar /* An interface for indicators to link to for creation. Copyright 2009 Canonical Ltd. Authors: Ted Gould This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #ifndef __LIBINDICATOR_INDICATOR_H_SEEN__ #define __LIBINDICATOR_INDICATOR_H_SEEN__ 1 #include #define INDICATOR_GET_VERSION_S "get_version" typedef gchar * (*get_version_t) (void); gchar * get_version (void); #define INDICATOR_VERSION "0.3.0" #define INDICATOR_SET_VERSION gchar * get_version(void) { return INDICATOR_VERSION; } #define INDICATOR_VERSION_CHECK(x) (!g_strcmp0(x, INDICATOR_VERSION)) #define INDICATOR_GET_TYPE_S "get_type" typedef GType (*get_type_t) (void); #define INDICATOR_SET_TYPE(x) GType get_type (void) { return x; } #endif /* __LIBINDICATOR_INDICATOR_H_SEEN__ */ libayatana-indicator-0.9.4/src/indicator-image-helper.c0000644000000000000000000001544514566140211017746 0ustar /* A little helper to make a themed image with fallbacks that is only constrained in the vertical dimention. Copyright 2010 Canonical Ltd. Authors: Ted Gould This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #include #include "indicator-image-helper.h" const gchar * INDICATOR_NAMES_DATA = "indicator-names-data"; const gint ICON_SIZE = 22; static void refresh_image (GtkImage * image) { g_return_if_fail(GTK_IS_IMAGE(image)); const gchar * icon_filename = NULL; GtkIconInfo * icon_info = NULL; GIcon * icon_names = (GIcon *)g_object_get_data(G_OBJECT(image), INDICATOR_NAMES_DATA); g_return_if_fail(G_IS_ICON (icon_names)); /* Get the default theme */ GtkIconTheme * default_theme = gtk_icon_theme_get_default(); g_return_if_fail(default_theme != NULL); /* Look through the themes for that icon */ icon_info = gtk_icon_theme_lookup_by_gicon(default_theme, icon_names, ICON_SIZE, 0); if (icon_info == NULL) { /* Maybe the icon was just added to the theme, see if a rescan helps */ gtk_icon_theme_rescan_if_needed(default_theme); icon_info = gtk_icon_theme_lookup_by_gicon(default_theme, icon_names, ICON_SIZE, 0); } if (icon_info == NULL) { /* Try using the second item in the names, which should be the original filename supplied */ const gchar * const * names = g_themed_icon_get_names(G_THEMED_ICON( icon_names )); if (names) { icon_filename = names[1]; } else { g_warning("Unable to find icon\n"); gtk_image_clear(image); return; } } else { /* Grab the filename */ icon_filename = gtk_icon_info_get_filename(icon_info); } if (icon_filename == NULL && !G_IS_BYTES_ICON(icon_names)) { /* show a broken image if we don't have a filename or image data */ gtk_image_set_from_icon_name(image, "image-missing", GTK_ICON_SIZE_LARGE_TOOLBAR); return; } if (icon_info != NULL && !G_IS_BYTES_ICON(icon_names)) { GdkPixbuf *pixbuf = gtk_icon_info_load_icon(icon_info, NULL); if (gdk_pixbuf_get_height(pixbuf) < ICON_SIZE) { gtk_image_set_from_file(image, icon_filename); } else { gtk_image_set_from_gicon(image, icon_names, GTK_ICON_SIZE_LARGE_TOOLBAR); } g_object_unref (pixbuf); } else if (icon_filename != NULL) { GError* error = NULL; GdkPixbuf* pixbuf = gdk_pixbuf_new_from_file_at_scale(icon_filename, ICON_SIZE, ICON_SIZE, TRUE, &error); if (pixbuf != NULL) { /* Put the pixbuf on the image */ gtk_image_set_from_pixbuf(image, pixbuf); g_object_unref(G_OBJECT(pixbuf)); } else { g_error_free(error); gtk_image_set_from_icon_name(image, "image-missing", ICON_SIZE); } } else if (G_IS_LOADABLE_ICON(icon_names)) { /* Build a pixbuf if needed */ GdkPixbuf * pixbuf = NULL; GError * error = NULL; GInputStream * stream = g_loadable_icon_load(G_LOADABLE_ICON(icon_names), ICON_SIZE, NULL, NULL, &error); if (stream != NULL) { pixbuf = gdk_pixbuf_new_from_stream(stream, NULL, &error); g_input_stream_close (stream, NULL, NULL); g_object_unref (stream); if (pixbuf != NULL) { /* Scale icon if all we get is something too big. */ if (gdk_pixbuf_get_height(pixbuf) > ICON_SIZE) { gfloat scale = (gfloat)ICON_SIZE / (gfloat)gdk_pixbuf_get_height(pixbuf); gint width = round(gdk_pixbuf_get_width(pixbuf) * scale); GdkPixbuf * scaled = gdk_pixbuf_scale_simple(pixbuf, width, ICON_SIZE, GDK_INTERP_BILINEAR); g_object_unref(G_OBJECT(pixbuf)); pixbuf = scaled; } /* Put the pixbuf on the image */ gtk_image_set_from_pixbuf(image, pixbuf); g_object_unref(G_OBJECT(pixbuf)); } else { g_warning ("Unable to load icon from data: %s", error->message); g_error_free (error); } } else { g_warning ("Unable to load icon from data: %s", error->message); g_error_free (error); } } if (icon_info != NULL) { #if GTK_CHECK_VERSION(3, 8, 0) g_object_unref(icon_info); #else /* NOTE: Leaving this in for lower version as it seems the object_unref() doesn't work on earlier versions. */ gtk_icon_info_free (icon_info); #endif } } /* Handles the theme changed signal to refresh the icon to make sure that it changes appropriately */ static void theme_changed_cb (__attribute__((unused)) GtkIconTheme * theme, gpointer user_data) { GtkImage * image = GTK_IMAGE(user_data); refresh_image(image); return; } /* Removes the signal on the theme that was calling update on this image. */ static void image_destroyed_cb (GtkImage * image, __attribute__((unused)) gpointer user_data) { g_signal_handlers_disconnect_by_func(gtk_icon_theme_get_default(), theme_changed_cb, image); return; } /* Catch the style changing on the image to make sure we've got the latest. */ static void image_style_change_cb (GtkImage * image, __attribute__((unused)) GtkStyle * previous_style, __attribute__((unused)) gpointer user_data) { refresh_image(image); return; } /* Builds an image with the name and fallbacks and all kinds of fun stuff . */ GtkImage * indicator_image_helper (const gchar * name) { /* Build us an image */ GtkImage * image = GTK_IMAGE(gtk_image_new()); if (name) indicator_image_helper_update(image, name); return image; } /* Updates and image with all the fun stuff */ void indicator_image_helper_update (GtkImage * image, const gchar * name) { g_return_if_fail(name != NULL); g_return_if_fail(name[0] != '\0'); g_return_if_fail(GTK_IS_IMAGE(image)); /* Build us a GIcon */ GIcon * icon_names = g_themed_icon_new_with_default_fallbacks(name); g_warn_if_fail(icon_names != NULL); g_return_if_fail(icon_names != NULL); indicator_image_helper_update_from_gicon (image, icon_names); g_object_unref (icon_names); return; } void indicator_image_helper_update_from_gicon (GtkImage *image, GIcon *icon) { gboolean seen_previously = FALSE; seen_previously = (g_object_get_data(G_OBJECT(image), INDICATOR_NAMES_DATA) != NULL); /* Attach our names to the image */ g_object_set_data_full(G_OBJECT(image), INDICATOR_NAMES_DATA, g_object_ref (icon), g_object_unref); /* Put the pixbuf in */ refresh_image(image); /* Connect to all changes */ if (!seen_previously) { g_signal_connect(G_OBJECT(gtk_icon_theme_get_default()), "changed", G_CALLBACK(theme_changed_cb), image); g_signal_connect(G_OBJECT(image), "destroy", G_CALLBACK(image_destroyed_cb), NULL); g_signal_connect(G_OBJECT(image), "style-set", G_CALLBACK(image_style_change_cb), NULL); } return; } libayatana-indicator-0.9.4/src/indicator-image-helper.h0000644000000000000000000000236614566140211017751 0ustar /* A little helper to make a themed image with fallbacks that is only constrained in the vertical dimention. Copyright 2010 Canonical Ltd. Authors: Ted Gould This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #ifndef __INDICATOR_IMAGE_HELPER_H__ #define __INDICATOR_IMAGE_HELPER_H__ #include GtkImage * indicator_image_helper (const gchar * name); void indicator_image_helper_update (GtkImage * image, const gchar * name); void indicator_image_helper_update_from_gicon (GtkImage * image, GIcon * icon); #endif /* __INDICATOR_IMAGE_HELPER_H__ */ libayatana-indicator-0.9.4/src/indicator-ng.c0000644000000000000000000010645614566140211016016 0ustar /* * Copyright 2013 Canonical Ltd. * Copyright 2021-2022 Robert Tari * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License version 3, as published * by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranties of * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR * PURPOSE. See the GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program. If not, see . * * Authors: * Lars Uebernickel * Robert Tari */ #include "indicator-ng.h" #include "indicator-image-helper.h" #include #include #define MENU_SECTIONS 20 struct _IndicatorNg { IndicatorObject parent; gchar *service_file; gchar *name; gchar *object_path; gchar *menu_object_path; gchar *bus_name; gchar *profile; gchar *header_action; gchar *scroll_action; gchar *secondary_action; gchar *submenu_action; gint position; gchar *sTooltip; guint name_watch_id; gboolean bMenuShown; GDBusConnection *session_bus; GActionGroup *actions; GMenuModel *menu; IndicatorObjectEntry entry; gchar *accessible_desc; gint64 last_service_restart; GMenuModel *lMenuSections[MENU_SECTIONS]; }; static void indicator_ng_initable_iface_init (GInitableIface *initable); G_DEFINE_TYPE_WITH_CODE (IndicatorNg, indicator_ng, INDICATOR_OBJECT_TYPE, G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, indicator_ng_initable_iface_init)) enum { PROP_0, PROP_SERVICE_FILE, PROP_PROFILE, N_PROPERTIES }; static GQuark m_pActionMuxer = 0; static GParamSpec *properties[N_PROPERTIES]; static void indicator_ng_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { IndicatorNg *self = INDICATOR_NG (object); switch (property_id) { case PROP_SERVICE_FILE: g_value_set_string (value, self->service_file); break; case PROP_PROFILE: g_value_set_string (value, self->profile); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); } } static void indicator_ng_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { IndicatorNg *self = INDICATOR_NG (object); switch (property_id) { case PROP_SERVICE_FILE: /* construct-only */ self->service_file = g_strdup (g_value_get_string (value)); break; case PROP_PROFILE: /* construct-only */ self->profile = g_strdup (g_value_get_string (value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); } } static void indicator_ng_free_actions_and_menu (IndicatorNg *self) { if (self->actions) { gtk_widget_insert_action_group (GTK_WIDGET (self->entry.menu), "indicator", NULL); g_signal_handlers_disconnect_by_data (self->actions, self); g_clear_object (&self->actions); } if (self->menu) { for (guint nMenuSection = 0; nMenuSection < MENU_SECTIONS; nMenuSection++) { if (self->lMenuSections[nMenuSection]) { g_object_unref(self->lMenuSections[nMenuSection]); self->lMenuSections[nMenuSection] = NULL; } } g_signal_handlers_disconnect_by_data (self->menu, self); g_clear_object (&self->menu); } } static void indicator_ng_dispose (GObject *object) { IndicatorNg *self = INDICATOR_NG (object); if (self->name_watch_id) { g_bus_unwatch_name (self->name_watch_id); self->name_watch_id = 0; } g_clear_object (&self->session_bus); indicator_ng_free_actions_and_menu (self); g_clear_object (&self->entry.label); g_clear_object (&self->entry.image); g_clear_object (&self->entry.menu); G_OBJECT_CLASS (indicator_ng_parent_class)->dispose (object); } static void indicator_ng_finalize (GObject *object) { IndicatorNg *self = INDICATOR_NG (object); g_free (self->service_file); g_free (self->name); g_free (self->object_path); g_free (self->menu_object_path); g_free (self->bus_name); g_free (self->accessible_desc); g_free (self->header_action); g_free (self->scroll_action); g_free (self->secondary_action); g_free (self->submenu_action); G_OBJECT_CLASS (indicator_ng_parent_class)->finalize (object); } static GList * indicator_ng_get_entries (IndicatorObject *io) { IndicatorNg *self = INDICATOR_NG (io); return g_list_append (NULL, &self->entry); } static gint indicator_ng_get_position (IndicatorObject *io) { IndicatorNg *self = INDICATOR_NG (io); return self->position; } static void indicator_ng_entry_scrolled (IndicatorObject *io, __attribute__((unused)) IndicatorObjectEntry *entry, gint delta, IndicatorScrollDirection direction) { IndicatorNg *self = INDICATOR_NG (io); if (self->actions && self->scroll_action) { if (direction == INDICATOR_OBJECT_SCROLL_DOWN || direction == INDICATOR_OBJECT_SCROLL_LEFT) { delta *= -1; } g_action_group_activate_action (self->actions, self->scroll_action, g_variant_new_int32 (delta)); } } void indicator_ng_secondary_activate (IndicatorObject *io, __attribute__((unused)) IndicatorObjectEntry *entry, __attribute__((unused)) guint timestamp, __attribute__((unused)) gpointer user_data) { IndicatorNg *self = INDICATOR_NG (io); if (self->actions && self->secondary_action) { g_action_group_activate_action (self->actions, self->secondary_action, NULL); } } static gboolean indicator_ng_menu_insert_idos(IndicatorNg *self, GMenuModel *pSection, guint nModelItem, guint nMenuItem, gboolean bNamespace, gchar *sNamespace) { gboolean bChanged = FALSE; gchar *sType; gboolean bHasType = g_menu_model_get_item_attribute(pSection, nModelItem, "x-ayatana-type", "s", &sType); if (bHasType) { GList *lMenuItems = gtk_container_get_children(GTK_CONTAINER(self->entry.menu)); GtkWidget *pMenuItemOld = GTK_WIDGET(g_list_nth_data(lMenuItems, nMenuItem)); const gchar *sName = gtk_widget_get_name(pMenuItemOld); if (sName != NULL && !g_str_equal(sName, sType)) { GActionGroup *pActionGroup = (GActionGroup*)g_object_get_qdata(G_OBJECT(self->entry.menu), m_pActionMuxer); GMenuItem *pMenuModelItem = g_menu_item_new_from_model(pSection, nModelItem); GtkMenuItem* pMenuItemNew = NULL; gchar *sAction; if (bNamespace && g_menu_item_get_attribute(pMenuModelItem, G_MENU_ATTRIBUTE_ACTION, "s", &sAction)) { gchar *sNamespacedAction = g_strconcat(sNamespace, ".", sAction, NULL); g_menu_item_set_attribute(pMenuModelItem, G_MENU_ATTRIBUTE_ACTION, "s", sNamespacedAction); g_free (sNamespacedAction); g_free (sAction); } for (GList *pFactory = ayatana_menu_item_factory_get_all(); pFactory != NULL && pMenuItemNew == NULL; pFactory = pFactory->next) { pMenuItemNew = ayatana_menu_item_factory_create_menu_item(pFactory->data, sType, pMenuModelItem, pActionGroup); bChanged = TRUE; } if (pMenuItemNew == NULL) { pMenuItemNew = GTK_MENU_ITEM(gtk_menu_item_new_with_label("Failed to create IDO object")); } gtk_widget_set_name(GTK_WIDGET(pMenuItemNew), sType); gtk_widget_show(GTK_WIDGET(pMenuItemNew)); gtk_container_remove(GTK_CONTAINER(self->entry.menu), pMenuItemOld); gtk_menu_shell_insert(GTK_MENU_SHELL(self->entry.menu), GTK_WIDGET(pMenuItemNew), nMenuItem); g_object_unref(pMenuModelItem); } g_list_free(lMenuItems); g_free(sType); } return bChanged; } static void indicator_ng_menu_size_allocate(__attribute__((unused)) GtkWidget *pWidget, __attribute__((unused)) GtkAllocation *pAllocation, gpointer pUserData) { IndicatorNg *self = pUserData; GList *pMenuItem = gtk_container_get_children(GTK_CONTAINER(self->entry.menu)); guint nWidth = 0; guint nHeight = 0; GdkWindow *pWindowBin = NULL; while (pMenuItem) { if (!pWindowBin) { pWindowBin = gtk_widget_get_parent_window(pMenuItem->data); } gint nWidthNat; gint nHeightNat; gtk_widget_get_preferred_width(pMenuItem->data, NULL, &nWidthNat); gtk_widget_get_preferred_height(pMenuItem->data, NULL, &nHeightNat); nWidth = MAX((gint)nWidth, nWidthNat); nHeight += nHeightNat; GtkBorder cPadding; GtkStyleContext *pContext = gtk_widget_get_style_context(GTK_WIDGET(pMenuItem->data)); gtk_style_context_get_padding(pContext, gtk_style_context_get_state(pContext), &cPadding); nWidth += cPadding.left + cPadding.right; pMenuItem = g_list_next(pMenuItem); } g_list_free(pMenuItem); GtkBorder cPadding; GtkStyleContext *pContext = gtk_widget_get_style_context(GTK_WIDGET(self->entry.menu)); gtk_style_context_get_padding(pContext, gtk_style_context_get_state(pContext), &cPadding); gint nBorderWidth = gtk_container_get_border_width(GTK_CONTAINER(self->entry.menu)); gint nIconWidth; gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &nIconWidth, NULL); nWidth += (2 * nBorderWidth) + cPadding.left + cPadding.right + (nIconWidth * 3) / 2; nHeight += (2 * nBorderWidth) + cPadding.top + cPadding.bottom + (nIconWidth * 3) / 4; GdkRectangle cRectangle = {0}; GdkDisplay *pDisplay = gdk_display_get_default(); GdkMonitor *pMonitor = gdk_display_get_primary_monitor(pDisplay); gdk_monitor_get_workarea(pMonitor, &cRectangle); if ((gint)nHeight <= cRectangle.height) { gdk_window_move_resize(pWindowBin, 0, 0, nWidth, nHeight); } nHeight = MIN((gint)nHeight, cRectangle.height); GdkWindow *pWindow = gtk_widget_get_parent_window(GTK_WIDGET(self->entry.menu)); gdk_window_resize(pWindow, nWidth, nHeight); gtk_menu_reposition(self->entry.menu); } static void indicator_ng_menu_section_changed(__attribute__((unused)) GMenuModel *pMenuSection, __attribute__((unused)) gint nPosition, __attribute__((unused)) gint nRemoved, __attribute__((unused)) gint nAdded, gpointer pUserData) { IndicatorNg *self = pUserData; GMenuModel *pModel = g_menu_model_get_item_link(self->menu, 0, G_MENU_LINK_SUBMENU); guint nMenuItem = 0; gboolean bChanged = FALSE; if (pModel) { guint nSections = g_menu_model_get_n_items(pModel); for (guint nSection = 0; nSection < nSections; nSection++) { GMenuModel *pSection = g_menu_model_get_item_link(pModel, nSection, G_MENU_LINK_SECTION); guint nSubsections = 0; if (pSection) { gchar *sNamespace; gboolean bNamespace = g_menu_model_get_item_attribute(pModel, nSection, G_MENU_ATTRIBUTE_ACTION_NAMESPACE, "s", &sNamespace); nSubsections = g_menu_model_get_n_items(pSection); for (guint nSubsection = 0; nSubsection < nSubsections; nSubsection++) { GMenuModel *pSubsection = g_menu_model_get_item_link(pSection, nSubsection, G_MENU_LINK_SECTION); if (pSubsection) { guint nItems = g_menu_model_get_n_items(pSubsection); // Skip the subsection separator (if there is one) GList *lMenuItems = gtk_container_get_children(GTK_CONTAINER(self->entry.menu)); GtkWidget *pMenuItem = GTK_WIDGET(g_list_nth_data(lMenuItems, nMenuItem)); if (GTK_IS_SEPARATOR_MENU_ITEM(pMenuItem)) { nMenuItem++; } g_list_free(lMenuItems); for (guint nItem = 0; nItem < nItems; nItem++) { bChanged = indicator_ng_menu_insert_idos(self, pSubsection, nItem, nMenuItem, bNamespace, sNamespace) || bChanged; nMenuItem++; } } g_object_unref(pSubsection); bChanged = indicator_ng_menu_insert_idos(self, pSection, nSubsection, nMenuItem, bNamespace, sNamespace) || bChanged; if (!g_str_equal(self->name, "ayatana-indicator-messages")) { nMenuItem++; } } if (bNamespace) { g_free(sNamespace); } g_object_unref(pSection); } if (pSection && nSubsections) { nMenuItem++; } } g_object_unref(pModel); } if (bChanged) { indicator_ng_menu_size_allocate(NULL, NULL, self); } } static void indicator_ng_set_tooltip(IndicatorNg *self, gchar *sTooltip) { if (self->entry.label != NULL) { gtk_widget_set_tooltip_text(GTK_WIDGET(self->entry.label), sTooltip); } if (self->entry.image != NULL) { gtk_widget_set_tooltip_text(GTK_WIDGET(self->entry.image), sTooltip); } } static void indicator_ng_menu_shown(__attribute__((unused)) GtkWidget *pWidget, gpointer pUserData) { IndicatorNg *self = pUserData; guint nSectionCount = 0; self->bMenuShown = TRUE; indicator_ng_set_tooltip(self, NULL); if (!self->lMenuSections[0]) { self->lMenuSections[0] = g_menu_model_get_item_link(self->menu, 0, G_MENU_LINK_SUBMENU); if (self->lMenuSections[0]) { guint nSections = g_menu_model_get_n_items(self->lMenuSections[0]); for (guint nSection = 0; nSection < nSections; nSection++) { self->lMenuSections[++nSectionCount] = g_menu_model_get_item_link(self->lMenuSections[0], nSection, G_MENU_LINK_SECTION); if (self->lMenuSections[nSectionCount]) { g_signal_connect(self->lMenuSections[nSectionCount], "items-changed", G_CALLBACK(indicator_ng_menu_section_changed), self); guint nSubsections = g_menu_model_get_n_items(self->lMenuSections[nSectionCount]); guint nParent = nSectionCount; for (guint nSubsection = 0; nSubsection < nSubsections; nSubsection++) { self->lMenuSections[++nSectionCount] = g_menu_model_get_item_link(self->lMenuSections[nParent], nSubsection, G_MENU_LINK_SECTION); if (self->lMenuSections[nSectionCount]) { g_signal_connect(self->lMenuSections[nSectionCount], "items-changed", G_CALLBACK(indicator_ng_menu_section_changed), self); } } } } g_signal_connect(self->lMenuSections[0], "items-changed", G_CALLBACK(indicator_ng_menu_section_changed), self); indicator_ng_menu_section_changed(self->lMenuSections[0], 0, 0, 1, self); } } if (self->submenu_action) { g_action_group_change_action_state(self->actions, self->submenu_action, g_variant_new_boolean(TRUE)); } } static void indicator_ng_menu_hidden (__attribute__((unused)) GtkWidget *widget, gpointer user_data) { IndicatorNg *self = user_data; self->bMenuShown = FALSE; if (self->submenu_action) g_action_group_change_action_state (self->actions, self->submenu_action, g_variant_new_boolean (FALSE)); indicator_ng_set_tooltip(self, self->sTooltip); } static void indicator_ng_set_accessible_desc (IndicatorNg *self, const gchar *accessible_desc) { g_free (self->accessible_desc); self->accessible_desc = g_strdup (accessible_desc); self->entry.accessible_desc = self->accessible_desc; g_signal_emit_by_name (self, INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE, &self->entry); } static void indicator_ng_set_icon_from_variant (IndicatorNg *self, GVariant *variant) { GIcon *icon; if (variant == NULL) { if (self->entry.image) { gtk_image_clear (self->entry.image); gtk_widget_hide (GTK_WIDGET (self->entry.image)); } return; } gtk_widget_show (GTK_WIDGET (self->entry.image)); icon = g_icon_deserialize (variant); if (icon) { indicator_image_helper_update_from_gicon (self->entry.image, icon); g_object_unref (icon); } else { gchar *text = g_variant_print (variant, TRUE); g_warning ("invalid icon variant '%s'", text); gtk_image_set_from_icon_name (self->entry.image, "image-missing", GTK_ICON_SIZE_LARGE_TOOLBAR); g_free (text); } } static void indicator_ng_set_label(IndicatorNg *self, const gchar *label) { if (!self->entry.label) { return; } const gchar *sLabel = label; guint nSpacing = 3; guint nPadding = 6; if (label == NULL || *label == '\0' || !self->entry.image || !gtk_widget_get_visible(GTK_WIDGET(self->entry.image))) { nSpacing = 0; nPadding = 0; } GtkWidget *pParent = gtk_widget_get_parent(GTK_WIDGET(self->entry.label)); GtkCssProvider *pCssProvider = gtk_css_provider_new(); GtkStyleContext *pStyleContext = gtk_widget_get_style_context(GTK_WIDGET(self->entry.label)); gtk_style_context_add_provider(pStyleContext, GTK_STYLE_PROVIDER(pCssProvider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); gchar *sCss = g_strdup_printf("label{padding-left: %ipx;}", nPadding); gtk_css_provider_load_from_data(pCssProvider, sCss, -1, NULL); g_free(sCss); g_object_unref(pCssProvider); 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) { gtk_widget_show(GTK_WIDGET (self->entry.label)); } } static void indicator_ng_update_entry (IndicatorNg *self) { GVariant *state; const gchar *label = NULL; GVariant *icon = NULL; const gchar *accessible_desc = NULL; gboolean visible = TRUE; g_return_if_fail (self->menu != NULL); g_return_if_fail (self->actions != NULL); if (!self->header_action || !g_action_group_has_action (self->actions, self->header_action)) { indicator_object_set_visible (INDICATOR_OBJECT (self), FALSE); return; } state = g_action_group_get_action_state (self->actions, self->header_action); if (state && g_variant_is_of_type (state, G_VARIANT_TYPE ("(sssb)"))) { const gchar *iconstr = NULL; g_variant_get (state, "(&s&s&sb)", &label, &iconstr, &accessible_desc, &visible); if (iconstr) icon = g_variant_ref_sink (g_variant_new_string (iconstr)); } else if (state && g_variant_is_of_type (state, G_VARIANT_TYPE ("a{sv}"))) { g_variant_lookup (state, "label", "&s", &label); g_variant_lookup (state, "icon", "*", &icon); g_variant_lookup (state, "accessible-desc", "&s", &accessible_desc); g_variant_lookup (state, "visible", "b", &visible); g_variant_lookup (state, "tooltip", "&s", &self->sTooltip); } else g_warning ("the action of the indicator menu item must have state with type (sssb) or a{sv}"); indicator_ng_set_label (self, label); indicator_ng_set_icon_from_variant (self, icon); indicator_ng_set_accessible_desc (self, accessible_desc); indicator_ng_set_tooltip (self, self->bMenuShown ? NULL : self->sTooltip); indicator_object_set_visible (INDICATOR_OBJECT (self), visible); if (icon) g_variant_unref (icon); if (state) g_variant_unref (state); } static gboolean indicator_ng_menu_item_is_of_type (GMenuModel *menu, gint index, const gchar *expected_type) { gchar *type; gboolean has_type = FALSE; if (g_menu_model_get_item_attribute (menu, index, "x-ayatana-type", "s", &type)) { has_type = g_str_equal (type, expected_type); g_free (type); } return has_type; } static void indicator_ng_menu_changed (__attribute__((unused)) GMenuModel *menu, gint position, gint removed, gint added, gpointer user_data) { IndicatorNg *self = user_data; /* The menu may only contain one item (the indicator title menu). * Thus, the position is always 0, and there is either exactly one * item added or exactly one item removed. */ g_return_if_fail (position == 0); g_return_if_fail (added < 2 && removed < 2 && added ^ removed); if (removed) indicator_object_set_visible (INDICATOR_OBJECT (self), FALSE); if (added) { g_clear_pointer (&self->header_action, g_free); g_clear_pointer (&self->scroll_action, g_free); g_clear_pointer (&self->secondary_action, g_free); if (indicator_ng_menu_item_is_of_type (self->menu, 0, "org.ayatana.indicator.root")) { GMenuModel *popup; gchar *action; if (g_menu_model_get_item_attribute (self->menu, 0, G_MENU_ATTRIBUTE_ACTION, "s", &action)) { if (g_str_has_prefix (action, "indicator.")) self->header_action = g_strdup (action + strlen ("indicator.")); g_free (action); } if (g_menu_model_get_item_attribute (self->menu, 0, "x-ayatana-scroll-action", "s", &action)) { if (g_str_has_prefix (action, "indicator.")) self->scroll_action = g_strdup (action + strlen ("indicator.")); g_free (action); } if (g_menu_model_get_item_attribute (self->menu, 0, "x-ayatana-secondary-action", "s", &action)) { if (g_str_has_prefix (action, "indicator.")) self->secondary_action = g_strdup (action + strlen ("indicator.")); g_free (action); } if (g_menu_model_get_item_attribute (self->menu, 0, "submenu-action", "s", &action)) { if (g_str_has_prefix (action, "indicator.")) self->submenu_action = g_strdup (action + strlen ("indicator.")); g_free (action); } for (guint nMenuSection = 0; nMenuSection < MENU_SECTIONS; nMenuSection++) { if (self->lMenuSections[nMenuSection]) { g_object_unref(self->lMenuSections[nMenuSection]); } } popup = g_menu_model_get_item_link (self->menu, 0, G_MENU_LINK_SUBMENU); if (popup) { gtk_menu_shell_bind_model (GTK_MENU_SHELL (self->entry.menu), popup, NULL, TRUE); g_object_unref (popup); } indicator_ng_update_entry (self); } else g_warning ("indicator menu item must be of type 'org.ayatana.indicator.root'"); } } static void indicator_ng_service_appeared (GDBusConnection *connection, __attribute__((unused)) const gchar *name, const gchar *name_owner, gpointer user_data) { IndicatorNg *self = user_data; g_assert (!self->actions); g_assert (!self->menu); /* watch is not established when menu_object_path == NULL */ g_assert (self->menu_object_path); self->session_bus = g_object_ref (connection); self->actions = G_ACTION_GROUP (g_dbus_action_group_get (connection, name_owner, self->object_path)); gtk_widget_insert_action_group (GTK_WIDGET (self->entry.menu), "indicator", self->actions); g_signal_connect_swapped (self->actions, "action-added", G_CALLBACK (indicator_ng_update_entry), self); g_signal_connect_swapped (self->actions, "action-removed", G_CALLBACK (indicator_ng_update_entry), self); g_signal_connect_swapped (self->actions, "action-state-changed", G_CALLBACK (indicator_ng_update_entry), self); self->menu = G_MENU_MODEL (g_dbus_menu_model_get (connection, name_owner, self->menu_object_path)); g_signal_connect (self->menu, "items-changed", G_CALLBACK (indicator_ng_menu_changed), self); if (g_menu_model_get_n_items (self->menu)) indicator_ng_menu_changed (self->menu, 0, 0, 1, self); indicator_ng_update_entry (self); } static void indicator_ng_service_started (GObject *source_object, GAsyncResult *res, gpointer user_data) { IndicatorNg *self = user_data; GError *error = NULL; GVariant *result; guint32 start_service_reply; result = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source_object), res, &error); if (!result) { g_warning ("Could not activate service '%s': %s", self->name, error->message); indicator_object_set_visible (INDICATOR_OBJECT (self), FALSE); g_error_free (error); return; } start_service_reply = 0; g_variant_get (result, "(u)", &start_service_reply); switch (start_service_reply) { case 1: /* DBUS_START_REPLY_SUCCESS */ break; case 2: /* DBUS_START_REPLY_ALREADY_RUNNING */ g_warning ("could not start service '%s': it is already running", self->name); break; default: g_assert_not_reached (); } g_variant_unref (result); } static void indicator_ng_service_vanished (__attribute__((unused)) GDBusConnection *connection, __attribute__((unused)) const gchar *name, gpointer user_data) { IndicatorNg *self = user_data; indicator_ng_free_actions_and_menu (self); /* Names may vanish because the service decided it doesn't need to * show its indicator anymore, or because it crashed. Let's assume it * crashes and restart it unless it explicitly hid its indicator. */ if (indicator_object_entry_is_visible (INDICATOR_OBJECT (self), &self->entry)) { gint64 now; /* take care not to start it if it repeatedly crashes */ now = g_get_monotonic_time (); if (now - self->last_service_restart < 1 * G_USEC_PER_SEC) { g_warning ("The indicator '%s' vanished too quickly after appearing. It won't " "be respawned anymore, as it could be crashing repeatedly.", self->name); return; } self->last_service_restart = now; g_dbus_connection_call (self->session_bus, "org.freedesktop.DBus", "/", "org.freedesktop.DBus", "StartServiceByName", g_variant_new ("(su)", self->bus_name, 0), G_VARIANT_TYPE ("(u)"), G_DBUS_CALL_FLAGS_NONE, -1, NULL, indicator_ng_service_started, self); } } /* Get an integer from a keyfile. Returns @default_value if the key * doesn't exist exists or is not an integer */ static gint g_key_file_maybe_get_integer (GKeyFile *keyfile, const gchar *group, const gchar *key, gint default_value) { GError *error = NULL; gint i; i = g_key_file_get_integer (keyfile, group, key, &error); if (error) { g_error_free (error); return default_value; } return i; } static gboolean indicator_ng_load_from_keyfile (IndicatorNg *self, GKeyFile *keyfile, GError **error) { g_assert (self->name == NULL); g_assert (self->object_path == NULL); g_assert (self->menu_object_path == NULL); self->name = g_key_file_get_string (keyfile, "Indicator Service", "Name", error); if (self->name == NULL) return FALSE; self->object_path = g_key_file_get_string (keyfile, "Indicator Service", "ObjectPath", error); if (self->object_path == NULL) return FALSE; self->position = g_key_file_maybe_get_integer (keyfile, "Indicator Service", "Position", -1); /* * Don't throw an error when the profile doesn't exist. Non-existant * profiles are silently ignored by not showing an indicator at all. */ if (g_key_file_has_group (keyfile, self->profile)) { /* however, if the profile exists, it must have "ObjectPath" */ self->menu_object_path = g_key_file_get_string (keyfile, self->profile, "ObjectPath", error); if (self->menu_object_path == NULL) return FALSE; /* a position in the profile overrides the global one */ self->position = g_key_file_maybe_get_integer (keyfile, self->profile, "Position", self->position); } return TRUE; } static gboolean indicator_ng_initable_init (GInitable *initable, __attribute__((unused)) GCancellable *cancellable, GError **error) { IndicatorNg *self = INDICATOR_NG (initable); GKeyFile *keyfile; gboolean success = FALSE; self->bus_name = g_path_get_basename (self->service_file); keyfile = g_key_file_new (); if (g_key_file_load_from_file (keyfile, self->service_file, G_KEY_FILE_NONE, error) && indicator_ng_load_from_keyfile (self, keyfile, error)) { self->entry.name_hint = self->name; /* only watch the service when it supports the proile we're interested in */ if (self->menu_object_path) { self->name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION, self->bus_name, G_BUS_NAME_WATCHER_FLAGS_AUTO_START, indicator_ng_service_appeared, indicator_ng_service_vanished, self, NULL); } success = TRUE; } g_key_file_free (keyfile); return success; } static void indicator_ng_class_init (IndicatorNgClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); IndicatorObjectClass *io_class = INDICATOR_OBJECT_CLASS (class); object_class->get_property = indicator_ng_get_property; object_class->set_property = indicator_ng_set_property; object_class->dispose = indicator_ng_dispose; object_class->finalize = indicator_ng_finalize; io_class->get_entries = indicator_ng_get_entries; io_class->get_position = indicator_ng_get_position; io_class->entry_scrolled = indicator_ng_entry_scrolled; io_class->secondary_activate = indicator_ng_secondary_activate; properties[PROP_SERVICE_FILE] = g_param_spec_string ("service-file", "Service file", "Path of the service file", NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); properties[PROP_PROFILE] = g_param_spec_string ("profile", "Profile", "Indicator profile", "desktop", G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); g_object_class_install_properties(object_class, N_PROPERTIES, properties); } static void indicator_ng_initable_iface_init (GInitableIface *initable) { initable->init = indicator_ng_initable_init; } static void indicator_ng_init (IndicatorNg *self) { self->sTooltip = NULL; self->bMenuShown = FALSE; m_pActionMuxer = g_quark_from_static_string ("gtk-widget-action-muxer"); for (guint nMenuSection = 0; nMenuSection < MENU_SECTIONS; nMenuSection++) { self->lMenuSections[nMenuSection] = NULL; } self->entry.label = (GtkLabel*)g_object_ref_sink (gtk_label_new (NULL)); self->entry.image = (GtkImage*)g_object_ref_sink (gtk_image_new ()); self->entry.menu = (GtkMenu*)g_object_ref_sink (gtk_menu_new ()); g_signal_connect (self->entry.menu, "show", G_CALLBACK (indicator_ng_menu_shown), self); g_signal_connect (self->entry.menu, "hide", G_CALLBACK (indicator_ng_menu_hidden), self); g_signal_connect (self->entry.menu, "size-allocate", G_CALLBACK (indicator_ng_menu_size_allocate), self); GtkCssProvider *pCssProvider = gtk_css_provider_new(); GtkStyleContext *pStyleContext = gtk_widget_get_style_context(GTK_WIDGET(self->entry.menu)); gtk_style_context_add_provider(pStyleContext, GTK_STYLE_PROVIDER(pCssProvider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); gtk_css_provider_load_from_data(pCssProvider, "menu > arrow{min-height: 0; padding: 0; margin: 0;}", -1, NULL); GtkWidget *pWindow = gtk_widget_get_parent(GTK_WIDGET(self->entry.menu)); pStyleContext = gtk_widget_get_style_context(pWindow); gtk_style_context_add_provider(pStyleContext, GTK_STYLE_PROVIDER(pCssProvider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); gtk_css_provider_load_from_data(pCssProvider, "window > decoration {box-shadow: 0 1px 2px rgba(0,0,0,0.2), 0 0 0 1px rgba(0,0,0,0.13);}", -1, NULL); g_object_unref(pCssProvider); /* work around IndicatorObject's warning that the accessible * description is missing. We never set it on construction, but when * the menu model has arrived on the bus. */ self->accessible_desc = g_strdup (""); self->entry.accessible_desc = self->accessible_desc; self->position = -1; indicator_object_set_visible (INDICATOR_OBJECT (self), FALSE); } IndicatorNg * indicator_ng_new (const gchar *service_file, GError **error) { return g_initable_new (INDICATOR_TYPE_NG, NULL, error, "service-file", service_file, NULL); } IndicatorNg * indicator_ng_new_for_profile (const gchar *service_file, const gchar *profile, GError **error) { return g_initable_new (INDICATOR_TYPE_NG, NULL, error, "service-file", service_file, "profile", profile, NULL); } const gchar * indicator_ng_get_service_file (IndicatorNg *self) { g_return_val_if_fail (INDICATOR_IS_NG (self), NULL); return self->service_file; } const gchar * indicator_ng_get_profile (IndicatorNg *self) { g_return_val_if_fail (INDICATOR_IS_NG (self), NULL); return self->profile; } libayatana-indicator-0.9.4/src/indicator-ng.h0000644000000000000000000000405414566140211016012 0ustar /* * Copyright 2013 Canonical Ltd. * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License version 3, as published * by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranties of * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR * PURPOSE. See the GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program. If not, see . * * Authors: * Lars Uebernickel */ #ifndef __INDICATOR_NG_H__ #define __INDICATOR_NG_H__ #include "indicator-object.h" #define INDICATOR_TYPE_NG (indicator_ng_get_type ()) #define INDICATOR_NG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_TYPE_NG, IndicatorNg)) #define INDICATOR_NG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_TYPE_NG, IndicatorNgClass)) #define INDICATOR_IS_NG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_TYPE_NG)) #define INDICATOR_IS_NG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_TYPE_NG)) #define INDICATOR_NG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_TYPE_NG, IndicatorNgClass)) typedef struct _IndicatorNg IndicatorNg; typedef IndicatorObjectClass IndicatorNgClass; GType indicator_ng_get_type (void); IndicatorNg * indicator_ng_new (const gchar *service_file, GError **error); IndicatorNg * indicator_ng_new_for_profile (const gchar *service_file, const gchar *profile, GError **error); const gchar * indicator_ng_get_service_file (IndicatorNg *indicator); const gchar * indicator_ng_get_profile (IndicatorNg *indicator); #endif libayatana-indicator-0.9.4/src/indicator-object.c0000644000000000000000000007326614566140211016662 0ustar /* An object to represent loadable indicator modules to make loading them easy and objectified. Copyright 2009 Canonical Ltd. Authors: Ted Gould This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #ifdef HAVE_CONFIG_H #include "config.h" #endif #include "indicator.h" #include "indicator-object.h" #include "indicator-object-marshal.h" #include "indicator-object-enum-types.h" /** @ENTRY_INIT: The entry hasn't been initialized yet, so its visibility will depend upon the inital-visibility property. @ENTRY_VISIBLE: The entry is visible @ENTRY_INVISIBLE: The entry is invisible */ typedef enum { ENTRY_INIT, ENTRY_VISIBLE, ENTRY_INVISIBLE } EntryVisibility; typedef struct _IndicatorObjectEntryPrivate { EntryVisibility visibility; } IndicatorObjectEntryPrivate; /** IndicatorObjectPrivate: @module: The loaded module representing the object. Note to subclasses: This will not be set when you're initalized. @entry: A default entry for objects that don't need all the fancy stuff. This works with #get_entries_default. @gotten_entries: A check to see if the @entry has been populated intelligently yet. Structure to define the memory for the private area of the object instance. */ struct _IndicatorObjectPrivate { GModule * module; /* For get_entries_default */ IndicatorObjectEntry entry; gboolean gotten_entries; /* Whether or not entries are visible by default */ gboolean default_visibility; GHashTable * entry_privates; GStrv environments; }; /* Signals Stuff */ enum { ENTRY_ADDED, ENTRY_REMOVED, ENTRY_MOVED, ENTRY_SCROLLED, MENU_SHOW, SHOW_NOW_CHANGED, ACCESSIBLE_DESC_UPDATE, SECONDARY_ACTIVATE, LAST_SIGNAL }; /* Properties */ /* Enum for the properties so that they can be quickly found and looked up. */ enum { PROP_0, PROP_GSETTINGS_SCHEMA_ID, PROP_DEFAULT_VISIBILITY, }; static guint signals[LAST_SIGNAL] = { 0 }; /* GObject stuff */ static void indicator_object_class_init (IndicatorObjectClass *klass); static void indicator_object_init (IndicatorObject *self); static void indicator_object_dispose (GObject *object); static void indicator_object_finalize (GObject *object); static void set_property (GObject*, guint prop_id, const GValue*, GParamSpec* ); static void get_property (GObject*, guint prop_id, GValue*, GParamSpec* ); /* entries' visibility */ static GList * get_entries_default (IndicatorObject*); static GList * get_all_entries (IndicatorObject*); static void indicator_object_entry_being_removed (IndicatorObject*, IndicatorObjectEntry*); static void indicator_object_entry_was_added (IndicatorObject*, IndicatorObjectEntry*); static gint indicator_object_real_get_position (IndicatorObject*); static IndicatorObjectEntryPrivate * entry_get_private (IndicatorObject*, IndicatorObjectEntry*); G_DEFINE_TYPE_WITH_PRIVATE (IndicatorObject, indicator_object, G_TYPE_OBJECT); /* Setup the class and put the functions into the class structure */ static void indicator_object_class_init (IndicatorObjectClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->dispose = indicator_object_dispose; object_class->finalize = indicator_object_finalize; object_class->set_property = set_property; object_class->get_property = get_property; klass->get_label = NULL; klass->get_menu = NULL; klass->get_image = NULL; klass->get_accessible_desc = NULL; klass->get_entries = get_entries_default; klass->get_location = NULL; klass->entry_being_removed = NULL; klass->entry_was_added = NULL; klass->get_position = indicator_object_real_get_position; klass->entry_activate = NULL; klass->entry_activate_window = NULL; klass->entry_close = NULL; /** IndicatorObject::entry-added: @arg0: The #IndicatorObject object @arg1: A pointer to the #IndicatorObjectEntry that is being added. Signaled when a new entry is added and should be shown by the person using this object. */ signals[ENTRY_ADDED] = g_signal_new (INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED, G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (IndicatorObjectClass, entry_added), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER, G_TYPE_NONE); /** IndicatorObject::entry-removed: @arg0: The #IndicatorObject object @arg1: A pointer to the #IndicatorObjectEntry that is being removed. Signaled when an entry is removed and should be removed by the person using this object. */ signals[ENTRY_REMOVED] = g_signal_new (INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (IndicatorObjectClass, entry_removed), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER, G_TYPE_NONE); /** IndicatorObject::entry-moved: @arg0: The #IndicatorObject object @arg1: A pointer to the #IndicatorObjectEntry that is being moved. @arg2: The old location of the entry @arg3: The new location of the entry When the order of the entries change, then this signal is sent to tell the new location. */ signals[ENTRY_MOVED] = g_signal_new (INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED, G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (IndicatorObjectClass, entry_moved), NULL, NULL, _indicator_object_marshal_VOID__POINTER_UINT_UINT, G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_NONE); /** IndicatorObject::entry-scrolled: @arg0: The #IndicatorObject object @arg1: A pointer to the #IndicatorObjectEntry that receives the scroll event. @arg2: The delta of the scroll event @arg3: The orientation of the scroll event. When the indicator receives a mouse scroll wheel event from the user, this signal is emitted. */ signals[ENTRY_SCROLLED] = g_signal_new (INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED, G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (IndicatorObjectClass, entry_scrolled), NULL, NULL, _indicator_object_marshal_VOID__POINTER_UINT_ENUM, G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_UINT, INDICATOR_OBJECT_TYPE_SCROLL_DIRECTION); /** IndicatorObject::secondary-activate: @arg0: The #IndicatorObject object @arg1: A pointer to the #IndicatorObjectEntry that receives the secondary activate event. @arg2: The timestamp of the event When the indicator receives a secondary activation event from the user, this signal is emitted. */ signals[SECONDARY_ACTIVATE] = g_signal_new (INDICATOR_OBJECT_SIGNAL_SECONDARY_ACTIVATE, G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (IndicatorObjectClass, secondary_activate), NULL, NULL, _indicator_object_marshal_VOID__POINTER_UINT, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_UINT); /** IndicatorObject::menu-show: @arg0: The #IndicatorObject object @arg1: A pointer to the #IndicatorObjectEntry that is being shown. @arg2: The timestamp of the event Used when the indicator wants to signal up the stack that the menu should be shown. */ signals[MENU_SHOW] = g_signal_new (INDICATOR_OBJECT_SIGNAL_MENU_SHOW, G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (IndicatorObjectClass, menu_show), NULL, NULL, _indicator_object_marshal_VOID__POINTER_UINT, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_UINT); /** IndicatorObject::show-now-changed: @arg0: The #IndicatorObject object @arg1: A pointer to the #IndicatorObjectEntry that is changing it's state @arg2: The state of whether the entry should be shown Whether the entry should be shown or not has changed so we need to tell whoever is displaying it. */ signals[SHOW_NOW_CHANGED] = g_signal_new (INDICATOR_OBJECT_SIGNAL_SHOW_NOW_CHANGED, G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (IndicatorObjectClass, show_now_changed), NULL, NULL, _indicator_object_marshal_VOID__POINTER_BOOLEAN, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_BOOLEAN); /** IndicatorObject::accessible-desc-update:: @arg0: The #IndicatorObject object @arg1: A pointer to the #IndicatorObjectEntry whos accessible description has been updated. Signaled when an indicator's accessible description has been updated, so that the displayer of the indicator can fetch the new description. */ signals[ACCESSIBLE_DESC_UPDATE] = g_signal_new (INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE, G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (IndicatorObjectClass, accessible_desc_update), NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER, G_TYPE_NONE); /* Properties */ GParamSpec * pspec = g_param_spec_boolean (INDICATOR_OBJECT_DEFAULT_VISIBILITY, "default visibility", "Whether or not entries should initially be visible.", TRUE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); g_object_class_install_property (object_class, PROP_DEFAULT_VISIBILITY, pspec); } /* Initialize an instance */ static void indicator_object_init (IndicatorObject *self) { IndicatorObjectPrivate * priv = indicator_object_get_instance_private(self); priv->module = NULL; priv->entry.parent_object = self; priv->entry.menu = NULL; priv->entry.label = NULL; priv->entry.image = NULL; priv->entry.accessible_desc = NULL; priv->entry.name_hint = NULL; priv->entry.parent_window = 0; priv->gotten_entries = FALSE; priv->default_visibility = TRUE; priv->entry_privates = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_free); priv->environments = NULL; self->priv = priv; GObject * o = G_OBJECT(self); /* Invoke the entry-being-removed virtual function first */ g_signal_connect (o, INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, G_CALLBACK(indicator_object_entry_being_removed), NULL); /* Invoke the entry-was-added virtual function last */ g_signal_connect_after (o, INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED, G_CALLBACK(indicator_object_entry_was_added), NULL); } /* Unref the objects that we're holding on to. */ static void indicator_object_dispose (GObject *object) { /* Ensure that hidden entries are re-added so their widgetry will be cleaned up properly by the client */ indicator_object_set_visible (INDICATOR_OBJECT (object), TRUE); G_OBJECT_CLASS (indicator_object_parent_class)->dispose (object); } /* A small helper function that closes a module but in the function prototype of a GSourceFunc. */ static gboolean module_unref (gpointer data) { if (!g_module_close((GModule *)data)) { /* All we can do is warn. */ g_warning("Unable to close module!"); } return FALSE; } /* Free memory */ static void indicator_object_finalize (GObject *object) { IndicatorObject * obj = INDICATOR_OBJECT (object); IndicatorObjectPrivate * priv = indicator_object_get_instance_private(obj); if (priv->entry_privates != NULL) { g_hash_table_destroy (priv->entry_privates); priv->entry_privates = NULL; } if (priv->environments != NULL) { g_strfreev(priv->environments); priv->environments = NULL; } if (priv->module != NULL) { /* Wow, this is convoluted. So basically we want to unref the module which will cause the code it included to be removed. But, since its finalize function is the function that called this one, we can't really remove it before it finishes being executed. So we're putting the job into the main loop to remove it the next time it gets a chance. Slightly non-deterministic, but should work. */ g_idle_add(module_unref, priv->module); priv->module = NULL; } G_OBJECT_CLASS (indicator_object_parent_class)->finalize (object); return; } /** indicator_object_new_from_file: @file: Filename containing a loadable module This function builds an #IndicatorObject using the symbols that are found in @file. The module is loaded and the references are all kept by the object. To unload the module the object must be destroyed. Return value: A valid #IndicatorObject or #NULL if error. */ IndicatorObject * indicator_object_new_from_file (const gchar * file) { GObject * object = NULL; GModule * module = NULL; /* Check to make sure the name exists and that the file itself exists */ if (file == NULL) { g_warning("Invalid filename."); return NULL; } if (!g_file_test(file, G_FILE_TEST_EXISTS)) { g_warning("File '%s' does not exist.", file); return NULL; } /* Grab the g_module reference, pull it in but let's keep the symbols local to avoid conflicts. */ module = g_module_open(file, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); if (module == NULL) { g_warning("Unable to load module: %s", file); return NULL; } /* Look for the version function, error if not found. */ get_version_t lget_version = NULL; if (!g_module_symbol(module, INDICATOR_GET_VERSION_S, (gpointer *)(&lget_version))) { g_warning("Unable to get the symbol for getting the version."); return NULL; } /* Check the version with the macro and make sure we're all talking the same language. */ if (!INDICATOR_VERSION_CHECK(lget_version())) { g_warning("Indicator using API version '%s' we're expecting '%s'", lget_version(), INDICATOR_VERSION); return NULL; } /* The function for grabbing a label from the module execute it, and make sure everything is a-okay */ get_type_t lget_type = NULL; if (!g_module_symbol(module, INDICATOR_GET_TYPE_S, (gpointer *)(&lget_type))) { g_warning("Unable to get '" INDICATOR_GET_TYPE_S "' symbol from module: %s", file); goto unrefandout; } if (lget_type == NULL) { g_warning("Symbol '" INDICATOR_GET_TYPE_S "' is (null) in module: %s", file); goto unrefandout; } /* A this point we allocate the object, any code beyond here needs to deallocate it if we're returning in an error'd state. */ object = g_object_new(lget_type(), NULL); if (object == NULL) { g_warning("Unable to build an object if type '%d' in module: %s", (gint)lget_type(), file); goto unrefandout; } if (!INDICATOR_IS_OBJECT(object)) { g_warning("Type '%d' in file %s is not a subclass of IndicatorObject.", (gint)lget_type(), file); goto unrefandout; } /* Now we can track the module */ IndicatorObject * obj = INDICATOR_OBJECT(object); IndicatorObjectPrivate * priv = indicator_object_get_instance_private(obj); priv->module = module; return obj; /* Error, let's drop the object and return NULL. Sad when this happens. */ unrefandout: g_clear_object (&object); g_clear_object (&module); g_warning("Error building IndicatorObject from file: %s", file); return NULL; } /* The default get entries function uses the other single entries in the class to create an entry structure and put it into a list. This makes it simple for simple objects to create the list. Small changes from the way they previously were. */ static GList * get_entries_default (IndicatorObject * io) { IndicatorObjectPrivate * priv = indicator_object_get_instance_private(io); if (!priv->gotten_entries) { IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io); priv->entry.parent_object = io; if (class->get_label) { priv->entry.label = class->get_label(io); } if (class->get_image) { priv->entry.image = class->get_image(io); } if (priv->entry.image == NULL && priv->entry.label == NULL) { g_warning("IndicatorObject class does not create an image or a label. We need one of those."); return NULL; } if (class->get_menu) { priv->entry.menu = class->get_menu(io); } if (priv->entry.menu == NULL) { g_warning("IndicatorObject class does not create a menu. We need one of those."); return NULL; } if (class->get_accessible_desc) { priv->entry.accessible_desc = class->get_accessible_desc(io); } if (priv->entry.accessible_desc == NULL) { g_warning("IndicatorObject class does not have an accessible description."); } if (class->get_name_hint) { priv->entry.name_hint = class->get_name_hint(io); } if (class->get_parent_window) { priv->entry.parent_window = class->get_parent_window(io); } priv->gotten_entries = TRUE; } return g_list_append(NULL, &(priv->entry)); } /* returns a list of all IndicatorObjectEntries, visible or not */ static GList* get_all_entries (IndicatorObject * io) { GList * all_entries = NULL, *l; g_return_val_if_fail(INDICATOR_IS_OBJECT(io), NULL); IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io); if (class->get_entries == NULL) g_error("No get_entries function on object. It must have been deleted?!?!"); else { all_entries = class->get_entries(io); for (l = all_entries; l; l = l->next) { IndicatorObjectEntry *entry = l->data; if (entry) entry->parent_object = io; } } return all_entries; } /* get the private structure that corresponds to a caller-specified entry */ static IndicatorObjectEntryPrivate * entry_get_private (IndicatorObject * io, IndicatorObjectEntry * entry) { g_return_val_if_fail (INDICATOR_IS_OBJECT(io), NULL); g_return_val_if_fail (io->priv != NULL, NULL); GHashTable * h = io->priv->entry_privates; IndicatorObjectEntryPrivate * priv = g_hash_table_lookup (h, entry); if (priv == NULL) { priv = g_new0 (IndicatorObjectEntryPrivate, 1); priv->visibility = ENTRY_INIT; g_hash_table_insert (h, entry, priv); } return priv; } /** indicator_object_get_entries: @io: #IndicatorObject to query This function returns a list of visible entries. The list is built by calling the object's #IndicatorObjectClass::get_entries virtual function and testing each of the results for visibility. Callers should free the GList with g_list_free(), but the entries are owned by the IndicatorObject and should not be freed. Return value: (element-type IndicatorObjectEntry) (transfer container): A list if #IndicatorObjectEntry structures or NULL on error. */ GList * indicator_object_get_entries (IndicatorObject * io) { GList * l; GList * ret = NULL; GList * all_entries = get_all_entries (io); IndicatorObjectPrivate * priv = indicator_object_get_instance_private(io); const gboolean default_visibility = priv->default_visibility; for (l=all_entries; l!=NULL; l=l->next) { gboolean show_me; IndicatorObjectEntry * entry = l->data; switch (entry_get_private(io,entry)->visibility) { case ENTRY_VISIBLE: show_me = TRUE; break; case ENTRY_INVISIBLE: show_me = FALSE; break; case ENTRY_INIT: show_me = default_visibility; break; default: show_me = TRUE; g_warn_if_reached(); break; } if (show_me) ret = g_list_prepend (ret, entry); } g_list_free (all_entries); return g_list_reverse (ret); } /** indicator_object_get_location: @io: #IndicatorObject to query @entry: The #IndicatorObjectEntry to look for. This function looks on the class for the object and calls it's #IndicatorObjectClass::get_location function. If the function doesn't exist it returns zero. Return value: Location of the @entry in the display or zero if no location is specified. */ guint indicator_object_get_location (IndicatorObject * io, IndicatorObjectEntry * entry) { g_return_val_if_fail(INDICATOR_IS_OBJECT(io), 0); IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io); if (class->get_location) { return class->get_location(io, entry); } return 0; } /** indicator_object_get_show_now: @io: #IndicatorObject to query @entry: The #IndicatorObjectEntry to look for. This function returns whether the entry should be shown with priority on the panel. If the object does not support checking it assumes that its entries should never have priority. Return value: Whether the entry should be shown with priority. */ guint indicator_object_get_show_now (IndicatorObject * io, IndicatorObjectEntry * entry) { g_return_val_if_fail(INDICATOR_IS_OBJECT(io), 0); IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io); if (class->get_show_now) { return class->get_show_now(io, entry); } return FALSE; } /** indicator_object_entry_activate_window: @io: #IndicatorObject to query @entry: The #IndicatorObjectEntry whose entry was shown @windowid: ID of the window that is currently focused (or will be very shortly) @timestamp: The X11 timestamp of the event Used to signal to the indicator that the menu on an entry has been clicked on. This can either be an activate or a showing of the menu. Also includes a window ID so that we can know what application is going to be getting focused soon. If there is no override of this function, it is the same as calling indicator_object_entry_activate and in general is preferable if you have that information available. */ void indicator_object_entry_activate_window (IndicatorObject * io, IndicatorObjectEntry * entry, guint windowid, guint timestamp) { g_return_if_fail(INDICATOR_IS_OBJECT(io)); IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io); if (class->entry_activate_window != NULL) { return class->entry_activate_window(io, entry, windowid, timestamp); } else { indicator_object_entry_activate(io, entry, timestamp); } return; } /** indicator_object_entry_activate: @io: #IndicatorObject to query @entry: The #IndicatorObjectEntry whose entry was shown @timestamp: The X11 timestamp of the event Used to signal to the indicator that the menu on an entry has been clicked on. This can either be an activate or a showing of the menu. Note, this does not actually show the menu that's left up to the reader. */ void indicator_object_entry_activate (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp) { g_return_if_fail(INDICATOR_IS_OBJECT(io)); IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io); if (class->entry_activate != NULL) { return class->entry_activate(io, entry, timestamp); } return; } /** indicator_object_entry_close: @io: #IndicatorObject to query @entry: The #IndicatorObjectEntry whose menu was closed @timestamp: The X11 timestamp of the event Used to tell the indicator that a menu has been closed for the entry that is specified. */ void indicator_object_entry_close (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp) { g_return_if_fail(INDICATOR_IS_OBJECT(io)); IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io); if (class->entry_close != NULL) { return class->entry_close(io, entry, timestamp); } return; } static void indicator_object_entry_being_removed (IndicatorObject * io, IndicatorObjectEntry * entry) { g_return_if_fail(INDICATOR_IS_OBJECT(io)); IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io); entry_get_private (io, entry)->visibility = ENTRY_INVISIBLE; if (entry) entry->parent_object = NULL; if (class->entry_being_removed != NULL) { class->entry_being_removed (io, entry); } } static void indicator_object_entry_was_added (IndicatorObject * io, IndicatorObjectEntry * entry) { g_return_if_fail(INDICATOR_IS_OBJECT(io)); IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io); entry_get_private (io, entry)->visibility = ENTRY_VISIBLE; if (entry) entry->parent_object = io; if (class->entry_was_added != NULL) { class->entry_was_added (io, entry); } } static gint indicator_object_real_get_position (IndicatorObject *io) { g_return_val_if_fail (INDICATOR_IS_OBJECT (io), -1); return -1; } /** indicator_object_set_environment: @io: #IndicatorObject to set on @env: List of enviroment names to use Sets the names of the environment that the indicator is being loaded into. This allows for indicators to behave differently in different hosts if need be. */ void indicator_object_set_environment (IndicatorObject * io, GStrv env) { /* FIXME: should this be a property? */ g_return_if_fail(INDICATOR_IS_OBJECT(io)); if (io->priv->environments != NULL) { g_strfreev(io->priv->environments); io->priv->environments = NULL; } io->priv->environments = g_strdupv(env); return; } /** indicator_object_get_environment: @io: #IndicatorObject to get the environment from Gets the list of environment strings that this object is placed into. Return value: (transfer none): Gets the list of strings that represent the environment or NULL if none were given. */ GStrv indicator_object_get_environment (IndicatorObject * io) { g_return_val_if_fail(INDICATOR_IS_OBJECT(io), NULL); return io->priv->environments; } /** indicator_object_check_environment: @io: #IndicatorObject to check on @env: Environment that we're looking for Convience function to check to see if the specified environment @env is in our list of environments. Return Value: Whether we're in environment @env */ gboolean indicator_object_check_environment (IndicatorObject * io, const gchar * env) { g_return_val_if_fail(INDICATOR_IS_OBJECT(io), FALSE); g_return_val_if_fail(env != NULL, FALSE); if (io->priv->environments == NULL) { return FALSE; } int i; for (i = 0; io->priv->environments[i] != NULL; i++) { if (g_strcmp0(env, io->priv->environments[i]) == 0) { return TRUE; } } return FALSE; } /** indicator_object_set_visible: @io: #IndicatorObject to check on @visible: whether or not the entries should be visible Used to set all of an indicator's entries to be visible or hidden. */ void indicator_object_set_visible (IndicatorObject * io, gboolean visible) { g_return_if_fail(INDICATOR_IS_OBJECT(io)); GList * l; GList * entries = get_all_entries (io); const guint signal_id = signals[visible ? ENTRY_ADDED : ENTRY_REMOVED]; EntryVisibility visibility = visible ? ENTRY_VISIBLE : ENTRY_INVISIBLE; const GQuark detail = (GQuark)0; for (l=entries; l!=NULL; l=l->next) { IndicatorObjectEntry *entry = l->data; if (entry_get_private (io, entry)->visibility != visibility) g_signal_emit(io, signal_id, detail, entry); } g_list_free (entries); } static void get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec) { IndicatorObject * self = INDICATOR_OBJECT(object); g_return_if_fail(self != NULL); IndicatorObjectPrivate * priv = indicator_object_get_instance_private(self); g_return_if_fail(priv != NULL); switch (prop_id) { /* *********************** */ case PROP_DEFAULT_VISIBILITY: if (G_VALUE_HOLDS_BOOLEAN(value)) { g_value_set_boolean(value, priv->default_visibility); } else { g_warning("default-visibility property requires a boolean value."); } break; /* *********************** */ default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } } static void set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec) { IndicatorObject * self = INDICATOR_OBJECT(object); g_return_if_fail (self != NULL); IndicatorObjectPrivate * priv = indicator_object_get_instance_private(self); g_return_if_fail (priv != NULL); switch (prop_id) { /* *********************** */ case PROP_DEFAULT_VISIBILITY: if (G_VALUE_HOLDS_BOOLEAN(value)) { priv->default_visibility = g_value_get_boolean (value); } else { g_warning("default-visibility property requires a boolean value."); } break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } } gboolean indicator_object_entry_is_visible (IndicatorObject * io, IndicatorObjectEntry * entry) { g_return_val_if_fail (INDICATOR_IS_OBJECT (io), FALSE); return entry_get_private (io, entry)->visibility == ENTRY_VISIBLE; } gint indicator_object_get_position (IndicatorObject *io) { g_return_val_if_fail (INDICATOR_IS_OBJECT (io), FALSE); return INDICATOR_OBJECT_GET_CLASS (io)->get_position (io); } libayatana-indicator-0.9.4/src/indicator-object-enum-types.c.template0000644000000000000000000000137214566140211022565 0ustar /*** BEGIN file-header ***/ #include "indicator-object-enum-types.h" /*** END file-header ***/ /*** BEGIN file-production ***/ /* enumerations from "@basename@" */ #include "@basename@" /*** END file-production ***/ /*** BEGIN value-header ***/ GType @enum_name@_get_type (void) { static GType enum_type_id = 0; if (G_UNLIKELY (!enum_type_id)) { static const G@Type@Value values[] = { /*** END value-header ***/ /*** BEGIN value-production ***/ { @VALUENAME@, "@VALUENAME@", "@valuenick@" }, /*** END value-production ***/ /*** BEGIN value-tail ***/ { 0, NULL, NULL } }; enum_type_id = g_@type@_register_static (g_intern_static_string ("@EnumName@"), values); } return enum_type_id; } /*** END value-tail ***/ libayatana-indicator-0.9.4/src/indicator-object-enum-types.h.template0000644000000000000000000000106714566140211022573 0ustar /*** BEGIN file-header ***/ #ifndef __INDICATOR_OBJECT_ENUM_TYPES_H__ #define __INDICATOR_OBJECT_ENUM_TYPES_H__ #include G_BEGIN_DECLS /*** END file-header ***/ /*** BEGIN file-production ***/ /* enumerations from "@basename@" */ /*** END file-production ***/ /*** BEGIN file-tail ***/ G_END_DECLS #endif /* !__INDICATOR_OBJECT_ENUM_TYPES_H__ */ /*** END file-tail ***/ /*** BEGIN value-header ***/ GType @enum_name@_get_type (void) G_GNUC_CONST; #define INDICATOR_OBJECT_TYPE_@ENUMSHORT@ (@enum_name@_get_type()) /*** END value-header ***/ libayatana-indicator-0.9.4/src/indicator-object.h0000644000000000000000000002424014566140211016653 0ustar /* An object to represent loadable indicator modules to make loading them easy and objectified. Copyright 2009 Canonical Ltd. Authors: Ted Gould This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #ifndef __INDICATOR_OBJECT_H__ #define __INDICATOR_OBJECT_H__ #include G_BEGIN_DECLS typedef enum { INDICATOR_OBJECT_SCROLL_UP, INDICATOR_OBJECT_SCROLL_DOWN, INDICATOR_OBJECT_SCROLL_LEFT, INDICATOR_OBJECT_SCROLL_RIGHT } IndicatorScrollDirection; #define INDICATOR_OBJECT_TYPE (indicator_object_get_type ()) #define INDICATOR_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_OBJECT_TYPE, IndicatorObject)) #define INDICATOR_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_OBJECT_TYPE, IndicatorObjectClass)) #define INDICATOR_IS_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_OBJECT_TYPE)) #define INDICATOR_IS_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_OBJECT_TYPE)) #define INDICATOR_OBJECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_OBJECT_TYPE, IndicatorObjectClass)) #define INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED "entry-added" #define INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED, INDICATOR_OBJECT_TYPE)) #define INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED "entry-removed" #define INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, INDICATOR_OBJECT_TYPE)) #define INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED "entry-moved" #define INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED, INDICATOR_OBJECT_TYPE)) #define INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED "entry-scrolled" #define INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED, INDICATOR_OBJECT_TYPE)) #define INDICATOR_OBJECT_SIGNAL_MENU_SHOW "menu-show" #define INDICATOR_OBJECT_SIGNAL_MENU_SHOW_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_MENU_SHOW, INDICATOR_OBJECT_TYPE)) #define INDICATOR_OBJECT_SIGNAL_SHOW_NOW_CHANGED "show-now-changed" #define INDICATOR_OBJECT_SIGNAL_SHOW_NOW_CHANGED_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_SHOW_NOW_CHANGED, INDICATOR_OBJECT_TYPE)) #define INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE "accessible-desc-update" #define INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE, INDICATOR_OBJECT_TYPE)) #define INDICATOR_OBJECT_SIGNAL_SECONDARY_ACTIVATE "secondary-activate" #define INDICATOR_OBJECT_SIGNAL_SECONDARY_ACTIVATE_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_SECONDARY_ACTIVATE, INDICATOR_OBJECT_TYPE)) /* the name of the property to decide whether or not entries are visible by default */ #define INDICATOR_OBJECT_DEFAULT_VISIBILITY "indicator-object-default-visibility" typedef struct _IndicatorObject IndicatorObject; typedef struct _IndicatorObjectClass IndicatorObjectClass; typedef struct _IndicatorObjectPrivate IndicatorObjectPrivate; typedef struct _IndicatorObjectEntry IndicatorObjectEntry; /** IndicatorObjectClass: @parent_class: #GObjectClass @get_label: Gets the label for this object. Should be set to #NULL if @get_entries is set. Should NOT ref the object. @get_image: Gets the image for this object. Should be set to #NULL if @get_entries is set. Should NOT ref the object. @get_menu: Gets the image for this object. Should be set to #NULL if @get_entries is set. Should NOT ref the object. @get_accessible_desc: Gets the accessible descriptionfor this object. @get_name_hint: Gets the hint of the type of indicator that this is for the caller. @get_entries: Gets all of the entires for this object returning a #GList of #IndicatorObjectEntries. The list should be under the ownership of the caller but the entires will not be. @get_location: Returns the location that a particular entry should be placed in. This is really only relevant for indicators that have more than one entry. @get_show_now: Returns whether the entry is requesting to be shown "right now" in that it has something important to tell the user. @entry_being_removed: Called before an entry is removed. The default implementation is to ref and unparent the entry's widgets so that they can be re-added later. @entry_was_added: Called after an entry is added. The default implementation is to unref the entry's widgets if previously reffed by entry_being_removed's default impementation @entry_activate: Should be called when the menus for a given entry are shown to the user. @entry_close: Called when the menu is closed. @entry_added: Slot for #IndicatorObject::entry-added @entry_removed: Slot for #IndicatorObject::entry-removed @entry_moved: Slot for #IndicatorObject::entry-moved @menu_show: Slot for #IndicatorObject::menu-show @entry_scrolled: Slot for #IndicatorObject::entry-scrolled @show_now_changed: Slot for #IndicatorObject::show-now-changed @accessible_desc_update: Slot for #IndicatorObject::accessible-desc-update @secondary_activate: Slot for #IndicatorObject::secondary-activate @get_position: returns the desired position on the panel (0 is right-most), or -1 */ struct _IndicatorObjectClass { GObjectClass parent_class; /* Virtual Functions */ GtkLabel * (*get_label) (IndicatorObject * io); GtkImage * (*get_image) (IndicatorObject * io); GtkMenu * (*get_menu) (IndicatorObject * io); const gchar * (*get_accessible_desc) (IndicatorObject * io); const gchar * (*get_name_hint) (IndicatorObject * io); GList * (*get_entries) (IndicatorObject * io); guint (*get_location) (IndicatorObject * io, IndicatorObjectEntry * entry); gboolean (*get_show_now) (IndicatorObject * io, IndicatorObjectEntry * entry); void (*entry_being_removed) (IndicatorObject * io, IndicatorObjectEntry * entry); void (*entry_was_added) (IndicatorObject * io, IndicatorObjectEntry * entry); void (*entry_activate) (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp); void (*entry_activate_window) (IndicatorObject * io, IndicatorObjectEntry * entry, guint windowid, guint timestamp); void (*entry_close) (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp); /* Signals */ void (*entry_added) (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data); void (*entry_removed) (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data); void (*entry_moved) (IndicatorObject * io, IndicatorObjectEntry * entry, guint old_pos, guint new_pos, gpointer user_data); void (*entry_scrolled) (IndicatorObject * io, IndicatorObjectEntry * entry, gint delta, IndicatorScrollDirection direction); void (*menu_show) (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp, gpointer user_data); void (*show_now_changed) (IndicatorObject * io, IndicatorObjectEntry * entry, gboolean show_now_state, gpointer user_data); void (*accessible_desc_update) (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data); void (*secondary_activate) (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp, gpointer user_data); gint (*get_position) (IndicatorObject *io); guint (*get_parent_window) (IndicatorObject *io); /* Reserved */ void (*reserved1) (void); void (*reserved2) (void); void (*reserved3) (void); }; /** IndicatorObject: @parent: #GObject @priv: A cached reference to the private data for the instance. */ struct _IndicatorObject { GObject parent; IndicatorObjectPrivate * priv; }; /** IndicatorObjectEntry: @parent_object: The #IndicatorObject that created this entry @label: The label to be shown on the panel @image: The image to be shown on the panel @menu: The menu to be added to the menubar @accessible_desc: The accessible description of the indicator @name_hint: A name to describe the indicator being placed to allow the caller to be more aware of the individual entries. @parent_window: the id of the parent window of the indicator entry (if any). @reserved1: Reserved for future use @reserved2: Reserved for future use @reserved3: Reserved for future use */ struct _IndicatorObjectEntry { IndicatorObject * parent_object; GtkLabel * label; GtkImage * image; GtkMenu * menu; const gchar * accessible_desc; const gchar * name_hint; guint parent_window; void (*reserved1) (void); void (*reserved2) (void); void (*reserved3) (void); }; GType indicator_object_get_type (void); IndicatorObject * indicator_object_new_from_file (const gchar * file); GList * indicator_object_get_entries (IndicatorObject * io); guint indicator_object_get_location (IndicatorObject * io, IndicatorObjectEntry * entry); guint indicator_object_get_show_now (IndicatorObject * io, IndicatorObjectEntry * entry); void indicator_object_set_visible (IndicatorObject * io, gboolean visible); gboolean indicator_object_entry_is_visible (IndicatorObject * io, IndicatorObjectEntry * entry); void indicator_object_entry_activate (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp); void indicator_object_entry_activate_window (IndicatorObject * io, IndicatorObjectEntry * entry, guint windowid, guint timestamp); void indicator_object_entry_close (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp); gint indicator_object_get_position (IndicatorObject *io); void indicator_object_set_environment (IndicatorObject * io, GStrv env); GStrv indicator_object_get_environment (IndicatorObject * io); gboolean indicator_object_check_environment (IndicatorObject * io, const gchar * env); G_END_DECLS #endif libayatana-indicator-0.9.4/src/indicator-object-marshal.list0000644000000000000000000000013714566140211021023 0ustar VOID: POINTER, UINT, UINT VOID: POINTER, UINT, ENUM VOID: POINTER, UINT VOID: POINTER, BOOLEAN libayatana-indicator-0.9.4/src/indicator-service.c0000644000000000000000000005466714566140211017060 0ustar /* An object used to provide a simple interface for a service to query version and manage whether it's running. Copyright 2009 Canonical Ltd. Copyright 2022 Robert Tari Authors: Ted Gould Robert Tari This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #ifdef HAVE_CONFIG_H #include "config.h" #endif #include #include "indicator-service.h" #include "gen-indicator-service.xml.h" #include "dbus-shared.h" static void unwatch_core (IndicatorService * service, const gchar * name); static void watchers_remove (gpointer value); static void bus_get_cb (GObject * object, GAsyncResult * res, gpointer user_data); static GVariant * bus_watch (IndicatorService * service, const gchar * sender); /* Private Stuff */ /** IndicatorSevicePrivate: @name: The DBus well known name for the service. @timeout: The source ID for the timeout event. @watcher: A list of processes on dbus that are watching us. @this_service_version: The version to hand out that we're implementing. May not be set, so we'll send zero (default). @dbus_registration: The handle for this object being registered on dbus. */ typedef struct _IndicatorServicePrivate IndicatorServicePrivate; struct _IndicatorServicePrivate { gchar * name; GDBusConnection * bus; GCancellable * bus_cancel; guint timeout; guint timeout_length; GHashTable * watchers; guint this_service_version; guint dbus_registration; gboolean replace_mode; }; /* Signals Stuff */ enum { SHUTDOWN, LAST_SIGNAL }; static guint signals[LAST_SIGNAL] = { 0 }; /* Properties */ /* Enum for the properties so that they can be quickly found and looked up. */ enum { PROP_0, PROP_NAME, PROP_VERSION }; /* The strings so that they can be slowly looked up. */ #define PROP_NAME_S "name" #define PROP_VERSION_S "version" /* GObject Stuff */ #define INDICATOR_SERVICE_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), INDICATOR_SERVICE_TYPE, IndicatorServicePrivate)) static void indicator_service_class_init (IndicatorServiceClass *klass); static void indicator_service_init (IndicatorService *self); static void indicator_service_dispose (GObject *object); static void indicator_service_finalize (GObject *object); /* Other prototypes */ static void set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec); static void get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); static void try_and_get_name (IndicatorService * service); static void bus_method_call (GDBusConnection * connection, const gchar * sender, const gchar * path, const gchar * interface, const gchar * method, GVariant * params, GDBusMethodInvocation * invocation, gpointer user_data); /* GDBus Stuff */ static GDBusNodeInfo * node_info = NULL; static GDBusInterfaceInfo * interface_info = NULL; static GDBusInterfaceVTable interface_table = { .method_call = bus_method_call, .get_property = NULL, /* No properties */ .set_property = NULL /* No properties */ }; /* THE define */ G_DEFINE_TYPE_WITH_PRIVATE (IndicatorService, indicator_service, G_TYPE_OBJECT); static void indicator_service_class_init (IndicatorServiceClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->dispose = indicator_service_dispose; object_class->finalize = indicator_service_finalize; /* Property funcs */ object_class->set_property = set_property; object_class->get_property = get_property; /* Properties */ g_object_class_install_property(object_class, PROP_NAME, g_param_spec_string(PROP_NAME_S, "The DBus name for this service", "This is the name that should be used on DBus for this service.", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property(object_class, PROP_VERSION, g_param_spec_uint(PROP_VERSION_S, "The version of the service that we're implementing.", "A number to represent the version of the other APIs the service provides. This should match across the manager and the service", 0, G_MAXUINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /* Signals */ /** IndicatorService::shutdown: @arg0: The #IndicatorService object Signaled when the service should shutdown as no one is listening anymore. */ signals[SHUTDOWN] = g_signal_new (INDICATOR_SERVICE_SIGNAL_SHUTDOWN, G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (IndicatorServiceClass, shutdown), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0, G_TYPE_NONE); /* Setting up the DBus interfaces */ if (node_info == NULL) { GError * error = NULL; node_info = g_dbus_node_info_new_for_xml(_indicator_service, &error); if (error != NULL) { g_error("Unable to parse Indicator Service Interface description: %s", error->message); g_error_free(error); } } if (interface_info == NULL) { interface_info = g_dbus_node_info_lookup_interface(node_info, INDICATOR_SERVICE_INTERFACE); if (interface_info == NULL) { g_error("Unable to find interface '" INDICATOR_SERVICE_INTERFACE "'"); } } return; } /* This function builds the variables, sets up the dbus proxy and registers the object on dbus. Importantly, it does not request a name as we don't know what name we have yet. */ static void indicator_service_init (IndicatorService *self) { IndicatorServicePrivate * priv = indicator_service_get_instance_private(self); /* Get the private variables in a decent state */ priv->name = NULL; priv->timeout = 0; priv->watchers = NULL; priv->bus = NULL; priv->bus_cancel = NULL; priv->this_service_version = 0; priv->timeout_length = 500; priv->dbus_registration = 0; priv->replace_mode = FALSE; const gchar * timeoutenv = g_getenv("INDICATOR_SERVICE_SHUTDOWN_TIMEOUT"); if (timeoutenv != NULL) { gdouble newtimeout = g_strtod(timeoutenv, NULL); if (newtimeout >= 1.0f) { priv->timeout_length = newtimeout; g_debug("Setting shutdown timeout to: %u", priv->timeout_length); } } const gchar * replaceenv = g_getenv("INDICATOR_SERVICE_REPLACE_MODE"); if (replaceenv != NULL) { priv->replace_mode = TRUE; g_debug("Putting into replace mode"); } /* NOTE: We're using g_free here because that's what needs to happen and we're watchers_remove as well to clean up the dbus watches we've setup. */ priv->watchers = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, watchers_remove); priv->bus_cancel = g_cancellable_new(); g_bus_get(G_BUS_TYPE_SESSION, priv->bus_cancel, bus_get_cb, self); return; } /* Unrefcounting the proxies and making sure that our timeout doesn't come to haunt us. */ static void indicator_service_dispose (GObject *object) { IndicatorService * service = INDICATOR_SERVICE(object); IndicatorServicePrivate * priv = indicator_service_get_instance_private(service); g_clear_pointer (&priv->watchers, g_hash_table_destroy); if (priv->timeout != 0) { g_source_remove(priv->timeout); priv->timeout = 0; } if (priv->dbus_registration != 0) { g_dbus_connection_unregister_object(priv->bus, priv->dbus_registration); /* Don't care if it fails, there's nothing we can do */ priv->dbus_registration = 0; } g_clear_object (&priv->bus); if (priv->bus_cancel != NULL) { g_cancellable_cancel(priv->bus_cancel); g_object_unref(priv->bus_cancel); priv->bus_cancel = NULL; } G_OBJECT_CLASS (indicator_service_parent_class)->dispose (object); return; } /* Freeing the name we're looking for and all of the information on the watchers we're tracking. */ static void indicator_service_finalize (GObject *object) { IndicatorService * service = INDICATOR_SERVICE(object); IndicatorServicePrivate * priv = indicator_service_get_instance_private(service); g_free (priv->name); g_clear_pointer (&priv->watchers, g_hash_table_destroy); G_OBJECT_CLASS (indicator_service_parent_class)->finalize (object); return; } /* Either copies a string for the name or it just grabs the value of the version. */ static void set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec) { IndicatorService * self = INDICATOR_SERVICE(object); g_return_if_fail(self != NULL); IndicatorServicePrivate * priv = indicator_service_get_instance_private(self); g_return_if_fail(priv != NULL); switch (prop_id) { /* *********************** */ case PROP_NAME: if (G_VALUE_HOLDS_STRING(value)) { if (priv->name != NULL) { g_error("Name can not be set twice!"); } priv->name = g_value_dup_string(value); try_and_get_name(self); } else { g_warning("Name property requires a string value."); } break; /* *********************** */ case PROP_VERSION: priv->this_service_version = g_value_get_uint(value); break; /* *********************** */ default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } return; } /* Copies out the name into a value or the version number. Probably this is the least useful code in this file. */ static void get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec) { IndicatorService * self = INDICATOR_SERVICE(object); g_return_if_fail(self != NULL); IndicatorServicePrivate * priv = indicator_service_get_instance_private(self); g_return_if_fail(priv != NULL); switch (prop_id) { /* *********************** */ case PROP_NAME: if (G_VALUE_HOLDS_STRING(value)) { g_value_set_string(value, priv->name); } else { g_warning("Name property requires a string value."); } break; /* *********************** */ case PROP_VERSION: g_value_set_uint(value, priv->this_service_version); break; /* *********************** */ default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } return; } /* Callback for getting our connection to DBus */ static void bus_get_cb (__attribute__((unused)) GObject * object, GAsyncResult * res, gpointer user_data) { GError * error = NULL; GDBusConnection * connection = g_bus_get_finish(res, &error); if (error != NULL) { g_error("Unable to get a connection to the session DBus: %s", error->message); } IndicatorServicePrivate * priv = indicator_service_get_instance_private(user_data); g_warn_if_fail(priv->bus == NULL); priv->bus = connection; if (priv->bus_cancel != NULL) { g_object_unref(priv->bus_cancel); priv->bus_cancel = NULL; } /* Now register our object on our new connection */ priv->dbus_registration = g_dbus_connection_register_object(priv->bus, INDICATOR_SERVICE_OBJECT, interface_info, &interface_table, user_data, NULL, &error); if (error != NULL) { g_error("Unable to register the object to DBus: %s", error->message); } return; } /* A method has been called from our dbus inteface. Figure out what it is and dispatch it. */ static void bus_method_call (__attribute__((unused)) GDBusConnection * connection, const gchar * sender, __attribute__((unused)) const gchar * path, __attribute__((unused)) const gchar * interface, const gchar * method, __attribute__((unused)) GVariant * params, GDBusMethodInvocation * invocation, gpointer user_data) { IndicatorService * service = INDICATOR_SERVICE(user_data); GVariant * retval = NULL; if (g_strcmp0(method, "Watch") == 0) { retval = bus_watch(service, sender); } else if (g_strcmp0(method, "UnWatch") == 0) { unwatch_core(service, sender); } else if (g_strcmp0(method, "Shutdown") == 0) { g_signal_emit(G_OBJECT(service), signals[SHUTDOWN], 0, TRUE); } else { g_warning("Calling method '%s' on the indicator service and it's unknown", method); } g_dbus_method_invocation_return_value(invocation, retval); return; } /* A function to remove the signals on a proxy before we destroy it because in this case we've stopped caring. */ static void watchers_remove (gpointer value) { g_bus_unwatch_name(GPOINTER_TO_UINT(value)); return; } /* This is the function that gets executed if we timeout because there are no watchers. We sent the shutdown signal and hope someone does something sane with it. */ static gboolean timeout_no_watchers (gpointer data) { g_warning("No watchers, service timing out."); if (g_getenv("INDICATOR_ALLOW_NO_WATCHERS") == NULL) { g_signal_emit(G_OBJECT(data), signals[SHUTDOWN], 0, TRUE); } else { g_warning("\tblocked by environment variable."); } return FALSE; } /* Callback saying that the name we were looking for has been found and we've got it. Now start the timer to see if anyone cares about us. */ static void try_and_get_name_acquired_cb (GDBusConnection * connection, __attribute__((unused)) const gchar * name, gpointer user_data) { g_return_if_fail(connection != NULL); g_return_if_fail(INDICATOR_IS_SERVICE(user_data)); IndicatorServicePrivate * priv = indicator_service_get_instance_private(user_data); /* Check to see if we already had a timer, if so we want to extend it a bit. */ if (priv->timeout != 0) { g_source_remove(priv->timeout); priv->timeout = 0; } /* Allow some extra time at start up as things can be in high contention then. */ priv->timeout = g_timeout_add(priv->timeout_length * 2, timeout_no_watchers, user_data); return; } /* Callback saying that we didn't get the name, so we need to shutdown this service. */ static void try_and_get_name_lost_cb (GDBusConnection * connection, const gchar * name, gpointer user_data) { g_return_if_fail(connection != NULL); g_return_if_fail(INDICATOR_IS_SERVICE(user_data)); IndicatorServicePrivate * priv = indicator_service_get_instance_private(user_data); if (!priv->replace_mode) { g_warning("Name request failed."); g_signal_emit(G_OBJECT(user_data), signals[SHUTDOWN], 0, TRUE); } else { /* If we're in replace mode we can be a little more trickey here. We're going to tell the other guy to shutdown and hope that we get the name. */ GDBusMessage * message = NULL; message = g_dbus_message_new_method_call(name, INDICATOR_SERVICE_OBJECT, INDICATOR_SERVICE_INTERFACE, "Shutdown"); g_dbus_connection_send_message(connection, message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL); g_object_unref(message); /* Check to see if we need to clean up a timeout */ if (priv->timeout != 0) { g_source_remove(priv->timeout); priv->timeout = 0; } /* Set a timeout for no watchers if we can't get the name */ priv->timeout = g_timeout_add(priv->timeout_length * 4, timeout_no_watchers, user_data); } return; } /* This function sets up the request for the name on dbus. */ static void try_and_get_name (IndicatorService * service) { IndicatorServicePrivate * priv = indicator_service_get_instance_private(service); g_return_if_fail(priv->name != NULL); g_bus_own_name(G_BUS_TYPE_SESSION, priv->name, G_BUS_NAME_OWNER_FLAGS_NONE, NULL, /* bus acquired */ try_and_get_name_acquired_cb, /* name acquired */ try_and_get_name_lost_cb, /* name lost */ service, NULL); /* user data destroy */ return; } /* When the watcher vanishes we don't really care about it anymore. */ static void watcher_vanished_cb (__attribute__((unused)) GDBusConnection * connection, const gchar * name, gpointer user_data) { g_return_if_fail(INDICATOR_IS_SERVICE(user_data)); IndicatorServicePrivate * priv = indicator_service_get_instance_private(user_data); gpointer finddata = g_hash_table_lookup(priv->watchers, name); if (finddata != NULL) { unwatch_core(INDICATOR_SERVICE(user_data), name); } else { g_warning("Odd, we were watching for '%s' and it disappeard, but then it wasn't in the hashtable.", name); } return; } /* Here is the function that gets called by the dbus interface "Watch" function. It is an async function so that we can get the sender and store that information. We put them in a list and reset the timeout. */ static GVariant * bus_watch (IndicatorService * service, const gchar * sender) { g_return_val_if_fail(INDICATOR_IS_SERVICE(service), NULL); IndicatorServicePrivate * priv = indicator_service_get_instance_private(service); if (GPOINTER_TO_UINT(g_hash_table_lookup(priv->watchers, sender)) == 0) { guint watch = g_bus_watch_name_on_connection(priv->bus, sender, G_BUS_NAME_WATCHER_FLAGS_NONE, NULL, /* appeared, we dont' care, should have already happened. */ watcher_vanished_cb, service, NULL); if (watch != 0) { g_hash_table_insert(priv->watchers, g_strdup(sender), GUINT_TO_POINTER(watch)); } else { g_warning("Unable watch for '%s'", sender); } } if (priv->timeout != 0) { g_source_remove(priv->timeout); priv->timeout = 0; } return g_variant_new("(uu)", INDICATOR_SERVICE_VERSION, priv->this_service_version); } /* Performs the core of loosing a watcher; it removes them from the list of watchers. If there are none left, it then starts the timer for the shutdown signal. */ static void unwatch_core (IndicatorService * service, const gchar * name) { g_return_if_fail(name != NULL); g_return_if_fail(INDICATOR_IS_SERVICE(service)); IndicatorServicePrivate * priv = indicator_service_get_instance_private(service); /* Remove us from the watcher list here */ gpointer watcher_item = g_hash_table_lookup(priv->watchers, name); if (watcher_item != NULL) { gchar * safe_name = g_strdup(name); g_hash_table_remove(priv->watchers, safe_name); g_free(safe_name); } else { /* Odd that we couldn't find the person, but, eh */ g_warning("Unable to find watcher who is unwatching: %s", name); } /* If we're out of watchers set the timeout for shutdown */ if (g_hash_table_size(priv->watchers) == 0) { if (priv->timeout != 0) { /* This should never really happen, but let's ensure that bad things don't happen if it does. */ g_warning("No watchers timeout set twice. Resolving, but odd."); g_source_remove(priv->timeout); priv->timeout = 0; } /* If we don't get a new watcher quickly, we'll shutdown. */ priv->timeout = g_timeout_add(priv->timeout_length, timeout_no_watchers, service); } return; } /* API */ /** indicator_service_new: @name: The name for the service on dbus This function creates the service on DBus and tries to get a well-known name specified in @name. If the name can't be estabilished then the #IndicatorService::shutdown signal will be sent. Return value: A brand new #IndicatorService object or #NULL if there is an error. */ IndicatorService * indicator_service_new (gchar * name) { GObject * obj = g_object_new(INDICATOR_SERVICE_TYPE, PROP_NAME_S, name, NULL); return INDICATOR_SERVICE(obj); } /** indicator_service_new_version: @name: The name for the service on dbus @version: The version of the other interfaces provide by the service. This function creates the service on DBus and tries to get a well-known name specified in @name. If the name can't be estabilished then the #IndicatorService::shutdown signal will be sent. Return value: A brand new #IndicatorService object or #NULL if there is an error. */ IndicatorService * indicator_service_new_version (gchar * name, guint version) { GObject * obj = g_object_new(INDICATOR_SERVICE_TYPE, PROP_NAME_S, name, PROP_VERSION_S, version, NULL); return INDICATOR_SERVICE(obj); } libayatana-indicator-0.9.4/src/indicator-service.h0000644000000000000000000000530014566140211017041 0ustar /* An object used to provide a simple interface for a service to query version and manage whether it's running. Copyright 2009 Canonical Ltd. Authors: Ted Gould This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #ifndef __INDICATOR_SERVICE_H__ #define __INDICATOR_SERVICE_H__ #include #include G_BEGIN_DECLS #define INDICATOR_SERVICE_TYPE (indicator_service_get_type ()) #define INDICATOR_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_SERVICE_TYPE, IndicatorService)) #define INDICATOR_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_SERVICE_TYPE, IndicatorServiceClass)) #define INDICATOR_IS_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_SERVICE_TYPE)) #define INDICATOR_IS_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_SERVICE_TYPE)) #define INDICATOR_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_SERVICE_TYPE, IndicatorServiceClass)) #define INDICATOR_SERVICE_SIGNAL_SHUTDOWN "shutdown" typedef struct _IndicatorService IndicatorService; typedef struct _IndicatorServiceClass IndicatorServiceClass; /** IndicatorServiceClass: @parent_class: #GObjectClass @shutdown: Slot for IndicatorServiceClass::shutdown @indicator_service_reserved1: Reserved for future use @indicator_service_reserved2: Reserved for future use @indicator_service_reserved3: Reserved for future use @indicator_service_reserved4: Reserved for future use */ struct _IndicatorServiceClass { GObjectClass parent_class; /* Signals */ void (*shutdown) (IndicatorService * service, gpointer user_data); /* Reserved */ void (*indicator_service_reserved1) (void); void (*indicator_service_reserved2) (void); void (*indicator_service_reserved3) (void); void (*indicator_service_reserved4) (void); }; /** IndicatorService: @parent: #GObject */ struct _IndicatorService { GObject parent; }; GType indicator_service_get_type (void); IndicatorService * indicator_service_new (gchar * name); IndicatorService * indicator_service_new_version (gchar * name, guint version); G_END_DECLS #endif libayatana-indicator-0.9.4/src/indicator-service-manager.c0000644000000000000000000005604414566140211020457 0ustar /* An object used to manage services. Either start them or just connect to them. Copyright 2009 Canonical Ltd. Authors: Ted Gould This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #ifdef HAVE_CONFIG_H #include "config.h" #endif #include #include #include "indicator-service-manager.h" #include "gen-indicator-service.xml.h" #include "dbus-shared.h" /* Private Stuff */ /** IndicatorServiceManagerPrivate: @name: The well known dbus name the service should be on. @service_proxy: The proxy to the service itself. @connected: Whether we're connected to the service or not. @this_service_version: The version of the service that we're looking for. @restart_count: The number of times we've restarted this service. */ typedef struct _IndicatorServiceManagerPrivate IndicatorServiceManagerPrivate; struct _IndicatorServiceManagerPrivate { gchar * name; GDBusProxy * service_proxy; GCancellable * service_proxy_cancel; guint name_watcher; gboolean connected; guint this_service_version; guint restart_count; gint restart_source; GCancellable * watch_cancel; }; /* Signals Stuff */ enum { CONNECTION_CHANGE, LAST_SIGNAL }; static guint signals[LAST_SIGNAL] = { 0 }; /* If this env variable is set, we don't restart */ #define TIMEOUT_ENV_NAME "INDICATOR_SERVICE_RESTART_DISABLE" #define TIMEOUT_MULTIPLIER 100 /* In ms */ /* What to reset the restart_count to if we know that we're in a recoverable error condition, but waiting a little bit will probably make things better. 5 ~= 3 sec. */ #define TIMEOUT_A_LITTLE_WHILE 5 /* Properties */ /* Enum for the properties so that they can be quickly found and looked up. */ enum { PROP_0, PROP_NAME, PROP_VERSION }; /* The strings so that they can be slowly looked up. */ #define PROP_NAME_S "name" #define PROP_VERSION_S "version" /* GDBus Stuff */ static GDBusNodeInfo * node_info = NULL; static GDBusInterfaceInfo * interface_info = NULL; static void indicator_service_manager_class_init (IndicatorServiceManagerClass *klass); static void indicator_service_manager_init (IndicatorServiceManager *self); static void indicator_service_manager_dispose (GObject *object); static void indicator_service_manager_finalize (GObject *object); /* Prototypes */ static void set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec); static void get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); static void start_service (IndicatorServiceManager * service); static void start_service_again (IndicatorServiceManager * manager); static void unwatch (GDBusProxy * proxy); static void service_proxy_cb (GObject * object, GAsyncResult * res, gpointer user_data); static void service_proxy_name_changed (GDBusConnection * connection, const gchar * sender_name, const gchar * object_path, const gchar * interface_name, const gchar * signal_name, GVariant * parameters, gpointer user_data); G_DEFINE_TYPE_WITH_PRIVATE (IndicatorServiceManager, indicator_service_manager, G_TYPE_OBJECT); /* Build all of our signals and proxies and tie everything all together. Lovely. */ static void indicator_service_manager_class_init (IndicatorServiceManagerClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->dispose = indicator_service_manager_dispose; object_class->finalize = indicator_service_manager_finalize; /* Property funcs */ object_class->set_property = set_property; object_class->get_property = get_property; /** IndicatorServiceManager::connecton-change: @arg0: The #IndicatorServiceManager object @arg1: The state of the connection, TRUE is connected. Signaled when the service is connected or disconnected depending on it's previous state. */ signals[CONNECTION_CHANGE] = g_signal_new (INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (IndicatorServiceManagerClass, connection_change), NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN, G_TYPE_NONE); /* Properties */ g_object_class_install_property(object_class, PROP_NAME, g_param_spec_string(PROP_NAME_S, "The DBus name for the service to monitor", "This is the name that should be used to start a service.", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property(object_class, PROP_VERSION, g_param_spec_uint(PROP_VERSION_S, "The version of the service that we're expecting.", "A number to check and reject a service if it gives us the wrong number. This should match across the manager and the service", 0, G_MAXUINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /* Setting up the DBus interfaces */ if (node_info == NULL) { GError * error = NULL; node_info = g_dbus_node_info_new_for_xml(_indicator_service, &error); if (error != NULL) { g_error("Unable to parse Indicator Service Interface description: %s", error->message); g_error_free(error); } } if (interface_info == NULL) { interface_info = g_dbus_node_info_lookup_interface(node_info, INDICATOR_SERVICE_INTERFACE); if (interface_info == NULL) { g_error("Unable to find interface '" INDICATOR_SERVICE_INTERFACE "'"); } } return; } /* This inits all the variable and sets up the proxy to dbus. It doesn't look for the service as at this point we don't know it's name. */ static void indicator_service_manager_init (IndicatorServiceManager *self) { IndicatorServiceManagerPrivate * priv = indicator_service_manager_get_instance_private(self); /* Get the private variables in a decent state */ priv->name = NULL; priv->service_proxy = NULL; priv->service_proxy_cancel = NULL; priv->name_watcher = 0; priv->connected = FALSE; priv->this_service_version = 0; priv->restart_count = 0; priv->restart_source = 0; priv->watch_cancel = NULL; return; } /* If we're connected this provides all the signals to say that we're about to not be. Then it takes down the proxies and tells the service that we're not interested in being its friend anymore either. */ static void indicator_service_manager_dispose (GObject *object) { IndicatorServiceManager * sm = INDICATOR_SERVICE_MANAGER(object); IndicatorServiceManagerPrivate * priv = indicator_service_manager_get_instance_private(sm); /* Removing the idle task to restart if it exists. */ if (priv->restart_source != 0) { g_source_remove(priv->restart_source); } /* Block any restart calls */ priv->restart_source = -1; /* If we were connected we need to make sure to tell people that it's no longer the case. */ if (priv->connected) { priv->connected = FALSE; g_signal_emit(object, signals[CONNECTION_CHANGE], 0, FALSE, TRUE); } if (priv->name_watcher != 0) { g_dbus_connection_signal_unsubscribe(g_dbus_proxy_get_connection(priv->service_proxy), priv->name_watcher); priv->name_watcher = 0; } /* If we're still getting the proxy, stop looking so we can then clean up some more. */ if (priv->service_proxy_cancel != NULL) { g_cancellable_cancel(priv->service_proxy_cancel); g_object_unref(priv->service_proxy_cancel); priv->service_proxy_cancel = NULL; } /* If we've sent a watch, cancel looking for the reply before sending the unwatch */ if (priv->watch_cancel != NULL) { g_cancellable_cancel(priv->watch_cancel); g_object_unref(priv->watch_cancel); priv->watch_cancel = NULL; } /* If we have a proxy, tell it we're shutting down. Just to be polite about it. */ if (priv->service_proxy != NULL) { unwatch(priv->service_proxy); } /* Destory our service proxy, we won't need it. */ if (priv->service_proxy != NULL) { g_object_unref(G_OBJECT(priv->service_proxy)); priv->service_proxy = NULL; } /* Let's see if our parents want to do anything. */ G_OBJECT_CLASS (indicator_service_manager_parent_class)->dispose (object); return; } /* Ironically, we don't allocate a lot of memory ourselves. */ static void indicator_service_manager_finalize (GObject *object) { IndicatorServiceManager * sm = INDICATOR_SERVICE_MANAGER(object); IndicatorServiceManagerPrivate * priv = indicator_service_manager_get_instance_private(sm); if (priv->name != NULL) { g_free(priv->name); priv->name = NULL; } G_OBJECT_CLASS (indicator_service_manager_parent_class)->finalize (object); return; } /* Either copies the name into the private variable or sets the version. Do it wrong and it'll get upset. */ static void set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec) { IndicatorServiceManager * self = INDICATOR_SERVICE_MANAGER(object); g_return_if_fail(self != NULL); IndicatorServiceManagerPrivate * priv = indicator_service_manager_get_instance_private(self); g_return_if_fail(priv != NULL); switch (prop_id) { /* *********************** */ case PROP_NAME: if (priv->name != NULL) { g_error("Name can not be set twice!"); } priv->name = g_value_dup_string(value); start_service(self); break; /* *********************** */ case PROP_VERSION: priv->this_service_version = g_value_get_uint(value); break; /* *********************** */ default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } return; } /* Grabs the values from the private variables and puts them into the value. */ static void get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec) { IndicatorServiceManager * self = INDICATOR_SERVICE_MANAGER(object); g_return_if_fail(self != NULL); IndicatorServiceManagerPrivate * priv = indicator_service_manager_get_instance_private(self); g_return_if_fail(priv != NULL); switch (prop_id) { /* *********************** */ case PROP_NAME: g_value_set_string(value, priv->name); break; /* *********************** */ case PROP_VERSION: g_value_set_uint(value, priv->this_service_version); break; /* *********************** */ default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } return; } /* Small little function to make a long function call a little bit cleaner. */ static void unwatch (GDBusProxy * proxy) { g_dbus_proxy_call(proxy, "UnWatch", NULL, /* parameters */ G_DBUS_CALL_FLAGS_NONE, -1, /* timeout */ NULL, /* cancelable */ NULL, /* callback */ NULL); /* user data */ return; } /* A callback from telling a service that we want to watch it. It gives us the service API version and the version of the other APIs it supports. We check both of those. If they don't match then we unwatch it. Otherwise, we signal a connection change to tell the rest of the world that we have a service now. */ static void watch_cb (GObject * object, GAsyncResult * res, gpointer user_data) { GError * error = NULL; IndicatorServiceManagerPrivate * priv = indicator_service_manager_get_instance_private(user_data); GVariant * params = g_dbus_proxy_call_finish(G_DBUS_PROXY(object), res, &error); if (error != NULL) { g_warning("Unable to set watch on '%s': '%s'", priv->name, error->message); g_error_free(error); start_service_again(INDICATOR_SERVICE_MANAGER(user_data)); return; } guint service_api_version; guint this_service_version; g_variant_get(params, "(uu)", &service_api_version, &this_service_version); g_variant_unref(params); /* We've done it, now let's stop counting. */ /* Note: we're not checking versions. Because, the hope is that the guy holding the name we want with the wrong version will drop and we can start another service quickly. */ priv->restart_count = 0; if (service_api_version != INDICATOR_SERVICE_VERSION) { g_warning("Service is using a different version of the service interface. Expecting %d and got %d.", INDICATOR_SERVICE_VERSION, service_api_version); unwatch(priv->service_proxy); /* Let's make us wait a little while, then try again */ priv->restart_count = TIMEOUT_A_LITTLE_WHILE; start_service_again(INDICATOR_SERVICE_MANAGER(user_data)); return; } if (this_service_version != priv->this_service_version) { g_warning("Service is using a different API version than the manager. Expecting %d and got %d.", priv->this_service_version, this_service_version); unwatch(priv->service_proxy); /* Let's make us wait a little while, then try again */ priv->restart_count = TIMEOUT_A_LITTLE_WHILE; start_service_again(INDICATOR_SERVICE_MANAGER(user_data)); return; } if (!priv->connected) { priv->connected = TRUE; g_signal_emit(G_OBJECT(user_data), signals[CONNECTION_CHANGE], 0, TRUE, TRUE); } return; } /* The function that handles getting us connected to the service. In many cases it will start the service, but if the service is already there it just allocates the service proxy and acts like it was no big deal. */ static void start_service (IndicatorServiceManager * service) { IndicatorServiceManagerPrivate * priv = indicator_service_manager_get_instance_private(service); g_return_if_fail(priv->name != NULL); if (priv->service_proxy_cancel != NULL) { /* A service proxy is being gotten currently */ return; } if (priv->service_proxy != NULL) { g_object_unref(priv->service_proxy); priv->service_proxy = NULL; } priv->service_proxy_cancel = g_cancellable_new(); g_dbus_proxy_new_for_bus(G_BUS_TYPE_SESSION, G_DBUS_PROXY_FLAGS_NONE, interface_info, priv->name, INDICATOR_SERVICE_OBJECT, INDICATOR_SERVICE_INTERFACE, priv->service_proxy_cancel, service_proxy_cb, service); return; } /* Callback from trying to create the proxy for the service, this could include starting the service. Sometime it'll fail and we'll try to start that dang service again! */ static void service_proxy_cb (__attribute__((unused)) GObject * object, GAsyncResult * res, gpointer user_data) { GError * error = NULL; IndicatorServiceManager * service = INDICATOR_SERVICE_MANAGER(user_data); g_return_if_fail(service != NULL); GDBusProxy * proxy = g_dbus_proxy_new_for_bus_finish(res, &error); IndicatorServiceManagerPrivate * priv = indicator_service_manager_get_instance_private(user_data); if (priv->service_proxy_cancel != NULL) { g_object_unref(priv->service_proxy_cancel); priv->service_proxy_cancel = NULL; } if (error != NULL) { /* Unable to create the proxy, eh, let's try again in a bit */ g_error_free(error); start_service_again(service); return; } gchar * name = g_dbus_proxy_get_name_owner(proxy); if (name == NULL) { /* Hmm, since creating the proxy should start it, it seems very odd that it wouldn't have an owner at this point. But, all we can do is try again. */ g_object_unref(proxy); start_service_again(service); return; } g_free(name); /* Okay, we're good to grab the proxy at this point, we're sure that it's ours. */ priv->service_proxy = proxy; /* Signal for drop */ priv->name_watcher = g_dbus_connection_signal_subscribe( g_dbus_proxy_get_connection(proxy), "org.freedesktop.DBus", "org.freedesktop.DBus", "NameOwnerChanged", "/org/freedesktop/DBus", g_dbus_proxy_get_name(proxy), G_DBUS_SIGNAL_FLAGS_NONE, service_proxy_name_changed, user_data, NULL); /* Build cancelable if we need it */ if (priv->watch_cancel == NULL) { priv->watch_cancel = g_cancellable_new(); } /* Send watch */ g_dbus_proxy_call(priv->service_proxy, "Watch", NULL, /* params */ G_DBUS_CALL_FLAGS_NONE, -1, priv->watch_cancel, watch_cb, user_data); return; } /* Responds to the name owner changing of the proxy, this usually means the service died. We're dropping the proxy and recreating it so that it'll restart the service. */ static void service_proxy_name_changed (__attribute__((unused)) GDBusConnection * connection, __attribute__((unused)) const gchar * sender_name, __attribute__((unused)) const gchar * object_path, __attribute__((unused)) const gchar * interface_name, __attribute__((unused)) const gchar * signal_name, GVariant * parameters, gpointer user_data) { IndicatorServiceManagerPrivate * priv = indicator_service_manager_get_instance_private(user_data); const gchar * new_name = NULL; const gchar * prev_name = NULL; g_variant_get(parameters, "(&s&s&s)", NULL, &prev_name, &new_name); if (new_name == NULL || new_name[0] == 0) { if (priv->connected) { priv->connected = FALSE; g_signal_emit(G_OBJECT(user_data), signals[CONNECTION_CHANGE], 0, FALSE, TRUE); } start_service_again(INDICATOR_SERVICE_MANAGER(user_data)); } else { /* If we weren't connected before, we are now. Let's tell the world! */ if (!priv->connected) { priv->connected = TRUE; g_signal_emit(G_OBJECT(user_data), signals[CONNECTION_CHANGE], 0, TRUE, TRUE); } /* If the names are both valid, and they're not the same, it means that we've actually changed. So we need to tell the new guy that we're watching them */ if (new_name != NULL && prev_name != NULL && new_name[0] != 0 && prev_name != 0 && g_strcmp0(prev_name, new_name) != 0) { /* Send watch */ g_dbus_proxy_call(priv->service_proxy, "Watch", NULL, /* params */ G_DBUS_CALL_FLAGS_NONE, -1, priv->watch_cancel, watch_cb, user_data); } } return; } /* The callback that starts the service for real after the timeout as determined in 'start_service_again'. This could be in the idle or a timer. */ static gboolean start_service_again_cb (gpointer data) { IndicatorServiceManagerPrivate * priv = indicator_service_manager_get_instance_private(data); priv->restart_count++; g_debug("Restarting service '%s' count %d", priv->name, priv->restart_count); start_service(INDICATOR_SERVICE_MANAGER(data)); priv->restart_source = 0; return FALSE; } /* This function tries to start a new service, perhaps after a timeout that it determines. The real issue here is that it throttles restarting if we're not being successful. */ static void start_service_again (IndicatorServiceManager * manager) { IndicatorServiceManagerPrivate * priv = indicator_service_manager_get_instance_private(manager); /* If we've already got a restart source running then let's not do this again. */ if (priv->restart_source != 0) { return; } /* Allow the restarting to be disabled */ if (g_getenv(TIMEOUT_ENV_NAME)) { return; } if (priv->restart_count == 0) { /* First time, do it in idle */ g_idle_add(start_service_again_cb, manager); } else { /* Not our first time 'round the block. Let's slow this down. */ if (priv->restart_count > 16) priv->restart_count = 16; /* Not more than 1024x */ priv->restart_source = g_timeout_add((1 << priv->restart_count) * TIMEOUT_MULTIPLIER, start_service_again_cb, manager); } return; } /* API */ /** indicator_service_manager_new: @dbus_name: The well known name of the service on DBus This creates a new service manager object. If the service is not running it will start it. No matter what, it will give a IndicatorServiceManager::connection-changed event signal when it gets connected. Return value: A brand new lovely #IndicatorServiceManager object. */ IndicatorServiceManager * indicator_service_manager_new (const gchar * dbus_name) { GObject * obj = g_object_new(INDICATOR_SERVICE_MANAGER_TYPE, PROP_NAME_S, dbus_name, NULL); return INDICATOR_SERVICE_MANAGER(obj); } /** inicator_service_manager_new_version: @dbus_name: The well known name of the service on DBus @version: Version of the service we expect This creates a new service manager object. It also sets the version of the service that we're expecting to see. In general, it behaves similarly to #indicator_service_manager_new() except that it checks @version against the version returned by the service. Return value: A brand new lovely #IndicatorServiceManager object. */ IndicatorServiceManager * indicator_service_manager_new_version (const gchar * dbus_name, guint version) { GObject * obj = g_object_new(INDICATOR_SERVICE_MANAGER_TYPE, PROP_NAME_S, dbus_name, PROP_VERSION_S, version, NULL); return INDICATOR_SERVICE_MANAGER(obj); } /** indicator_service_manager_connected: @sm: #IndicatorServiceManager object to check Checks to see if the service manager is connected to a service. Return value: #TRUE if there is a service connceted. */ gboolean indicator_service_manager_connected (IndicatorServiceManager * sm) { g_return_val_if_fail(INDICATOR_IS_SERVICE_MANAGER(sm), FALSE); IndicatorServiceManagerPrivate * priv = indicator_service_manager_get_instance_private(sm); return priv->connected; } /** indicator_service_manager_set_refresh: @sm: #IndicatorServiceManager object to configure @time_in_ms: The refresh time in milliseconds Use this function to set the amount of time between restarting services that may crash or shutdown. This is mostly useful for testing and development. NOTE: Not yet implemented. */ void indicator_service_manager_set_refresh (__attribute__((unused)) IndicatorServiceManager * sm, __attribute__((unused)) guint time_in_ms) { return; } libayatana-indicator-0.9.4/src/indicator-service-manager.h0000644000000000000000000000650714566140211020463 0ustar /* An object used to manage services. Either start them or just connect to them. Copyright 2009 Canonical Ltd. Authors: Ted Gould This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #ifndef __INDICATOR_SERVICE_MANAGER_H__ #define __INDICATOR_SERVICE_MANAGER_H__ #include #include G_BEGIN_DECLS #define INDICATOR_SERVICE_MANAGER_TYPE (indicator_service_manager_get_type ()) #define INDICATOR_SERVICE_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_SERVICE_MANAGER_TYPE, IndicatorServiceManager)) #define INDICATOR_SERVICE_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_SERVICE_MANAGER_TYPE, IndicatorServiceManagerClass)) #define INDICATOR_IS_SERVICE_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_SERVICE_MANAGER_TYPE)) #define INDICATOR_IS_SERVICE_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_SERVICE_MANAGER_TYPE)) #define INDICATOR_SERVICE_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_SERVICE_MANAGER_TYPE, IndicatorServiceManagerClass)) #define INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE "connection-change" typedef struct _IndicatorServiceManager IndicatorServiceManager; typedef struct _IndicatorServiceManagerClass IndicatorServiceManagerClass; /** IndicatorServiceManagerClass: @parent: #GObjectClass @connection_changed: Slot for #IndicatorServiceManager::connection-changed. @indicator_service_manager_reserved1: Reserved for future use. @indicator_service_manager_reserved2: Reserved for future use. @indicator_service_manager_reserved3: Reserved for future use. @indicator_service_manager_reserved4: Reserved for future use. */ struct _IndicatorServiceManagerClass { GObjectClass parent_class; /* Signals */ void (*connection_change) (IndicatorServiceManager * sm, gboolean connected, gpointer user_data); /* Buffer */ void (*indicator_service_manager_reserved1) (void); void (*indicator_service_manager_reserved2) (void); void (*indicator_service_manager_reserved3) (void); void (*indicator_service_manager_reserved4) (void); }; /** IndicatorServiceManager: @parent: #GObject */ struct _IndicatorServiceManager { GObject parent; }; GType indicator_service_manager_get_type (void); IndicatorServiceManager * indicator_service_manager_new (const gchar * dbus_name); IndicatorServiceManager * indicator_service_manager_new_version (const gchar * dbus_name, guint version); gboolean indicator_service_manager_connected (IndicatorServiceManager * sm); void indicator_service_manager_set_refresh (IndicatorServiceManager * sm, guint time_in_ms); G_END_DECLS #endif libayatana-indicator-0.9.4/src/indicator-service.xml0000644000000000000000000000111514566140211017412 0ustar libayatana-indicator-0.9.4/src/indicator.symbols0000644000000000000000000000015114566140211016643 0ustar { global: indicator_*; INDICATOR_*; ICON_SIZE*; local: _indicator_*; }; libayatana-indicator-0.9.4/tests/CMakeLists.txt0000644000000000000000000003156214566140211016402 0ustar if (FLAVOUR_GTK3) # libayatana-indicator3.so set (ayatana_indicator_gtkver "ayatana-indicator3") else() # libayatana-indicator.so set (ayatana_indicator_gtkver "ayatana-indicator") endif() find_program(DBUS_TEST_RUNNER dbus-test-runner) function(add_test_library_by_name name) set (TEST_LIBRARY_NAME ${name}) add_library("${TEST_LIBRARY_NAME}" SHARED ${TEST_LIBRARY_NAME}.c) target_include_directories("${TEST_LIBRARY_NAME}" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS}) target_include_directories("${TEST_LIBRARY_NAME}" PUBLIC "${CMAKE_SOURCE_DIR}/src") target_link_libraries("${TEST_LIBRARY_NAME}" ${PROJECT_DEPS_LIBRARIES} -l${ayatana_indicator_gtkver}) target_link_directories("${TEST_LIBRARY_NAME}" PUBLIC "${CMAKE_BINARY_DIR}/src") add_dependencies("${TEST_LIBRARY_NAME}" "${ayatana_indicator_gtkver}") endfunction() function(add_test_executable_by_name name) set (TEST_EXECUTABLE_NAME ${name}) add_executable("${TEST_EXECUTABLE_NAME}" ${TEST_EXECUTABLE_NAME}.c) target_compile_definitions("${TEST_EXECUTABLE_NAME}" PUBLIC BUILD_DIR="${CMAKE_CURRENT_BINARY_DIR}") target_compile_definitions("${TEST_EXECUTABLE_NAME}" PUBLIC SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}") target_include_directories("${TEST_EXECUTABLE_NAME}" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS}) target_include_directories("${TEST_EXECUTABLE_NAME}" PUBLIC "${CMAKE_SOURCE_DIR}/src") target_link_libraries("${TEST_EXECUTABLE_NAME}" ${PROJECT_DEPS_LIBRARIES} -l${ayatana_indicator_gtkver}) target_link_directories("${TEST_EXECUTABLE_NAME}" PUBLIC "${CMAKE_BINARY_DIR}/src") add_dependencies("${TEST_EXECUTABLE_NAME}" "${ayatana_indicator_gtkver}") endfunction() add_test_library_by_name(dummy-indicator-blank) add_test_library_by_name(dummy-indicator-entry-func) add_test_library_by_name(dummy-indicator-null) add_test_library_by_name(dummy-indicator-signaler) add_test_library_by_name(dummy-indicator-simple) add_test_library_by_name(dummy-indicator-visible) # session.conf configure_file("${CMAKE_CURRENT_SOURCE_DIR}/session.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/session.conf" @ONLY) # service-manager-connect.service configure_file("${CMAKE_CURRENT_SOURCE_DIR}/service-manager-connect.service.in" "${CMAKE_CURRENT_BINARY_DIR}/service-manager-connect.service" @ONLY) # service-manager-connect add_test_executable_by_name(service-manager-connect) # service-manager-connect-tester add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/service-manager-connect-tester" DEPENDS "service-manager-connect" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} VERBATIM COMMAND echo "#!/bin/sh" > "${CMAKE_CURRENT_BINARY_DIR}/service-manager-connect-tester" COMMAND echo "${DBUS_TEST_RUNNER} --dbus-config ${CMAKE_CURRENT_BINARY_DIR}/session.conf --task ${CMAKE_CURRENT_BINARY_DIR}/service-manager-connect" >> "${CMAKE_CURRENT_BINARY_DIR}/service-manager-connect-tester" COMMAND chmod +x "${CMAKE_CURRENT_BINARY_DIR}/service-manager-connect-tester" ) add_test("service-manager-connect-tester" "service-manager-connect-tester") # service-manager-connect-service add_test_executable_by_name(service-manager-connect-service) # service-manager-no-connect add_test_executable_by_name(service-manager-no-connect) # service-manager-no-connect-tester add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/service-manager-no-connect-tester" DEPENDS "service-manager-no-connect" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} VERBATIM COMMAND echo "#!/bin/sh" > "${CMAKE_CURRENT_BINARY_DIR}/service-manager-no-connect-tester" COMMAND echo "${DBUS_TEST_RUNNER} --dbus-config /usr/share/dbus-test-runner/session.conf --task ${CMAKE_CURRENT_BINARY_DIR}/service-manager-no-connect" >> "${CMAKE_CURRENT_BINARY_DIR}/service-manager-no-connect-tester" COMMAND chmod +x "${CMAKE_CURRENT_BINARY_DIR}/service-manager-no-connect-tester" ) add_test("service-manager-no-connect-tester" "service-manager-no-connect-tester") # service-manager-nostart-connect add_test_executable_by_name(service-manager-nostart-connect) # service-manager-connect-nostart-tester add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/service-manager-connect-nostart-tester" DEPENDS "service-manager-connect-service" DEPENDS "service-manager-nostart-connect" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} VERBATIM COMMAND echo "#!/bin/sh" > "${CMAKE_CURRENT_BINARY_DIR}/service-manager-connect-nostart-tester" COMMAND echo "${DBUS_TEST_RUNNER} --task ${CMAKE_CURRENT_BINARY_DIR}/service-manager-nostart-connect --task ${CMAKE_CURRENT_BINARY_DIR}/service-manager-connect-service" >> "${CMAKE_CURRENT_BINARY_DIR}/service-manager-connect-nostart-tester" COMMAND chmod +x "${CMAKE_CURRENT_BINARY_DIR}/service-manager-connect-nostart-tester" ) add_test("service-manager-connect-nostart-tester" "service-manager-connect-nostart-tester") # service-shutdown-timeout add_test_executable_by_name(service-shutdown-timeout) # service-shutdown-timeout-tester add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/service-shutdown-timeout-tester" DEPENDS "service-shutdown-timeout" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} VERBATIM COMMAND echo "#!/bin/sh" > "${CMAKE_CURRENT_BINARY_DIR}/service-shutdown-timeout-tester" COMMAND echo "${DBUS_TEST_RUNNER} --dbus-config /usr/share/dbus-test-runner/session.conf --task ${CMAKE_CURRENT_BINARY_DIR}/service-shutdown-timeout" >> "${CMAKE_CURRENT_BINARY_DIR}/service-shutdown-timeout-tester" COMMAND chmod +x "${CMAKE_CURRENT_BINARY_DIR}/service-shutdown-timeout-tester" ) add_test("service-shutdown-timeout-tester" "service-shutdown-timeout-tester") # service-version-bad.service configure_file("${CMAKE_CURRENT_SOURCE_DIR}/service-version-bad.service.in" "${CMAKE_CURRENT_BINARY_DIR}/service-version-bad.service" @ONLY) # service-version-bad-service add_test_executable_by_name(service-version-bad-service) # service-version-good.service configure_file("${CMAKE_CURRENT_SOURCE_DIR}/service-version-good.service.in" "${CMAKE_CURRENT_BINARY_DIR}/service-version-good.service" @ONLY) # service-version-good-service add_test_executable_by_name(service-version-good-service) # service-version-manager add_test_executable_by_name(service-version-manager) # service-version-tester add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/service-version-tester" DEPENDS "service-shutdown-timeout" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} VERBATIM COMMAND echo "#!/bin/sh" > "${CMAKE_CURRENT_BINARY_DIR}/service-version-tester" COMMAND echo "${DBUS_TEST_RUNNER} --dbus-config ${CMAKE_CURRENT_BINARY_DIR}/session.conf --task ${CMAKE_CURRENT_BINARY_DIR}/service-version-manager" >> "${CMAKE_CURRENT_BINARY_DIR}/service-version-tester" COMMAND chmod +x "${CMAKE_CURRENT_BINARY_DIR}/service-version-tester" ) add_test("service-version-tester" "service-version-tester") # service-version-multiwatch-manager add_test_executable_by_name(service-version-multiwatch-manager) # service-version-multiwatch-manager-impolite add_test_executable_by_name(service-version-multiwatch-manager-impolite) # service-version-multiwatch-service add_test_executable_by_name(service-version-multiwatch-service) # service-version-multiwatch-tester add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/service-version-multiwatch-tester" DEPENDS "service-version-multiwatch-manager" DEPENDS "service-version-multiwatch-manager-impolite" DEPENDS "service-version-multiwatch-service" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} VERBATIM COMMAND echo "#!/bin/sh" > "${CMAKE_CURRENT_BINARY_DIR}/service-version-multiwatch-tester" COMMAND echo "${DBUS_TEST_RUNNER} --task ${CMAKE_CURRENT_BINARY_DIR}/service-version-multiwatch-service --task-name Service --task ${CMAKE_CURRENT_BINARY_DIR}/service-version-multiwatch-manager --task-name Manager1 --task ${CMAKE_CURRENT_BINARY_DIR}/service-version-multiwatch-manager --task-name Manager2 --task ${CMAKE_CURRENT_BINARY_DIR}/service-version-multiwatch-manager --task-name Manager3 --task ${CMAKE_CURRENT_BINARY_DIR}/service-version-multiwatch-manager --task-name Manager4 --task ${CMAKE_CURRENT_BINARY_DIR}/service-version-multiwatch-manager --task-name Manager5 --task ${CMAKE_CURRENT_BINARY_DIR}/service-version-multiwatch-manager-impolite --task-name Impolite1 --task ${CMAKE_CURRENT_BINARY_DIR}/service-version-multiwatch-manager-impolite --task-name Impolite2 --task ${CMAKE_CURRENT_BINARY_DIR}/service-version-multiwatch-manager-impolite --task-name Impolite3" >> "${CMAKE_CURRENT_BINARY_DIR}/service-version-multiwatch-tester" COMMAND chmod +x "${CMAKE_CURRENT_BINARY_DIR}/service-version-multiwatch-tester" ) add_test("service-version-multiwatch-tester" "service-version-multiwatch-tester") # test-desktop-shortcuts add_test_executable_by_name(test-desktop-shortcuts) # test-desktop-shortcuts-tester add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/test-desktop-shortcuts-tester" DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/test-desktop-shortcuts" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} VERBATIM COMMAND echo "#!/bin/bash" > "${CMAKE_CURRENT_BINARY_DIR}/test-desktop-shortcuts-tester" COMMAND echo ". ${CMAKE_CURRENT_SOURCE_DIR}/run-xvfb.sh" >> "${CMAKE_CURRENT_BINARY_DIR}/test-desktop-shortcuts-tester" COMMAND echo "gtester -k --verbose -o=${CMAKE_CURRENT_BINARY_DIR}/loader-check-results.xml ${CMAKE_CURRENT_BINARY_DIR}/test-desktop-shortcuts" >> "${CMAKE_CURRENT_BINARY_DIR}/test-desktop-shortcuts-tester" COMMAND chmod +x "${CMAKE_CURRENT_BINARY_DIR}/test-desktop-shortcuts-tester" ) add_test("test-desktop-shortcuts-tester" "test-desktop-shortcuts-tester") if (FLAVOUR_GTK3 AND ENABLE_IDO) # test-indicator-ng add_test_executable_by_name(test-indicator-ng) # org.ayatana.indicator.test.service configure_file("${CMAKE_CURRENT_SOURCE_DIR}/org.ayatana.indicator.test.service.in" "${CMAKE_CURRENT_BINARY_DIR}/org.ayatana.indicator.test.service" @ONLY) # test-indicator-ng-dbus-runner add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/test-indicator-ng-dbus-runner" DEPENDS "test-indicator-ng" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} VERBATIM COMMAND echo "#!/bin/sh" > "${CMAKE_CURRENT_BINARY_DIR}/test-indicator-ng-dbus-runner" COMMAND echo "${DBUS_TEST_RUNNER} --dbus-config /usr/share/dbus-test-runner/session.conf --task ${CMAKE_CURRENT_BINARY_DIR}/test-indicator-ng" >> "${CMAKE_CURRENT_BINARY_DIR}/test-indicator-ng-dbus-runner" COMMAND chmod +x "${CMAKE_CURRENT_BINARY_DIR}/test-indicator-ng-dbus-runner" ) # test-indicator-ng-tester add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/test-indicator-ng-tester" DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/test-indicator-ng-dbus-runner" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} VERBATIM COMMAND echo "#!/bin/bash" > "${CMAKE_CURRENT_BINARY_DIR}/test-indicator-ng-tester" COMMAND echo ". ${CMAKE_CURRENT_SOURCE_DIR}/run-xvfb.sh" >> "${CMAKE_CURRENT_BINARY_DIR}/test-indicator-ng-tester" COMMAND echo "gtester -k --verbose -o=${CMAKE_CURRENT_BINARY_DIR}/loader-check-results.xml ${CMAKE_CURRENT_BINARY_DIR}/test-indicator-ng-dbus-runner" >> "${CMAKE_CURRENT_BINARY_DIR}/test-indicator-ng-tester" COMMAND chmod +x "${CMAKE_CURRENT_BINARY_DIR}/test-indicator-ng-tester" ) add_test("test-indicator-ng-tester" "test-indicator-ng-tester") endif(FLAVOUR_GTK3 AND ENABLE_IDO) # test-loader add_test_executable_by_name(test-loader) # loader-tester add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/loader-tester" DEPENDS "test-loader" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} VERBATIM COMMAND echo "#!/bin/bash" > "${CMAKE_CURRENT_BINARY_DIR}/loader-tester" COMMAND echo ". ${CMAKE_CURRENT_SOURCE_DIR}/run-xvfb.sh" >> "${CMAKE_CURRENT_BINARY_DIR}/loader-tester" COMMAND echo "gtester -k --verbose -o=${CMAKE_CURRENT_BINARY_DIR}/loader-check-results.xml ${CMAKE_CURRENT_BINARY_DIR}/test-loader" >> "${CMAKE_CURRENT_BINARY_DIR}/loader-tester" COMMAND chmod +x "${CMAKE_CURRENT_BINARY_DIR}/loader-tester" ) add_test("loader-tester" "loader-tester") # indicator-test-service add_executable("indicator-test-service" indicator-test-service.c) target_include_directories("indicator-test-service" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS}) target_link_libraries("indicator-test-service" ${PROJECT_DEPS_LIBRARIES}) set (ALL_TESTERS "service-manager-connect-tester" "service-manager-no-connect-tester" "service-manager-connect-nostart-tester" "service-shutdown-timeout-tester" "service-version-tester" "service-version-multiwatch-tester" "test-desktop-shortcuts-tester" "loader-tester" ) if (FLAVOUR_GTK3 AND ENABLE_IDO) set (ALL_TESTERS ${ALL_TESTERS} "test-indicator-ng-tester" ) endif() add_custom_target("tests" ALL DEPENDS ${ALL_TESTERS} ) libayatana-indicator-0.9.4/tests/dummy-indicator-blank.c0000644000000000000000000000141014566140211020165 0ustar /* Test for libindicator Copyright 2009 Canonical Ltd. Copyright 2021 Robert Tari Authors: Ted Gould Robert Tari This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #include "indicator.h" INDICATOR_SET_VERSION libayatana-indicator-0.9.4/tests/dummy-indicator-entry-func.c0000644000000000000000000000622314566140211021177 0ustar /* Test for libindicator Copyright 2012 Canonical Ltd. Authors: Ted Gould This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #include "dummy-indicator-entry-func.h" GType dummy_indicator_entry_func_get_type (void); INDICATOR_SET_VERSION INDICATOR_SET_TYPE(DUMMY_INDICATOR_ENTRY_FUNC_TYPE) GtkLabel * get_label (IndicatorObject * io) { return NULL; } GtkImage * get_icon (IndicatorObject * io) { return NULL; } GtkMenu * get_menu (IndicatorObject * io) { return NULL; } const gchar * get_accessible_desc (IndicatorObject * io) { return NULL; } static void entry_activate (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp) { DummyIndicatorEntryFunc * self = DUMMY_INDICATOR_ENTRY_FUNC(io); self->entry_activate_called = TRUE; return; } static void entry_activate_window (IndicatorObject * io, IndicatorObjectEntry * entry, guint windowid, guint timestamp) { DummyIndicatorEntryFunc * self = DUMMY_INDICATOR_ENTRY_FUNC(io); self->entry_activate_window_called = TRUE; return; } static void entry_close (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp) { DummyIndicatorEntryFunc * self = DUMMY_INDICATOR_ENTRY_FUNC(io); self->entry_close_called = TRUE; return; } static void dummy_indicator_entry_func_class_init (DummyIndicatorEntryFuncClass *klass); static void dummy_indicator_entry_func_init (DummyIndicatorEntryFunc *self); static void dummy_indicator_entry_func_dispose (GObject *object); static void dummy_indicator_entry_func_finalize (GObject *object); G_DEFINE_TYPE (DummyIndicatorEntryFunc, dummy_indicator_entry_func, INDICATOR_OBJECT_TYPE); static void dummy_indicator_entry_func_class_init (DummyIndicatorEntryFuncClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->dispose = dummy_indicator_entry_func_dispose; object_class->finalize = dummy_indicator_entry_func_finalize; IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass); io_class->get_label = get_label; io_class->get_image = get_icon; io_class->get_menu = get_menu; io_class->get_accessible_desc = get_accessible_desc; io_class->entry_activate = entry_activate; io_class->entry_activate_window = entry_activate_window; io_class->entry_close = entry_close; return; } static void dummy_indicator_entry_func_init (DummyIndicatorEntryFunc *self) { return; } static void dummy_indicator_entry_func_dispose (GObject *object) { G_OBJECT_CLASS (dummy_indicator_entry_func_parent_class)->dispose (object); return; } static void dummy_indicator_entry_func_finalize (GObject *object) { G_OBJECT_CLASS (dummy_indicator_entry_func_parent_class)->finalize (object); return; } libayatana-indicator-0.9.4/tests/dummy-indicator-entry-func.h0000644000000000000000000000414714566140211021207 0ustar /* Test for libindicator Copyright 2012 Canonical Ltd. Copyright 2021 Robert Tari Authors: Ted Gould Robert Tari This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #ifndef __DUMMY_INDICATOR_ENTRY_FUNC__ #define __DUMMY_INDICATOR_ENTRY_FUNC__ #include #include #include "indicator.h" #include "indicator-object.h" G_BEGIN_DECLS #define DUMMY_INDICATOR_ENTRY_FUNC_TYPE (dummy_indicator_entry_func_get_type ()) #define DUMMY_INDICATOR_ENTRY_FUNC(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DUMMY_INDICATOR_ENTRY_FUNC_TYPE, DummyIndicatorEntryFunc)) #define DUMMY_INDICATOR_ENTRY_FUNC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DUMMY_INDICATOR_ENTRY_FUNC_TYPE, DummyIndicatorEntryFuncClass)) #define IS_DUMMY_INDICATOR_ENTRY_FUNC(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DUMMY_INDICATOR_ENTRY_FUNC_TYPE)) #define IS_DUMMY_INDICATOR_ENTRY_FUNC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DUMMY_INDICATOR_ENTRY_FUNC_TYPE)) #define DUMMY_INDICATOR_ENTRY_FUNC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DUMMY_INDICATOR_ENTRY_FUNC_TYPE, DummyIndicatorEntryFuncClass)) typedef struct _DummyIndicatorEntryFunc DummyIndicatorEntryFunc; typedef struct _DummyIndicatorEntryFuncClass DummyIndicatorEntryFuncClass; struct _DummyIndicatorEntryFuncClass { IndicatorObjectClass parent_class; }; struct _DummyIndicatorEntryFunc { IndicatorObject parent; gboolean entry_activate_called; gboolean entry_activate_window_called; gboolean entry_close_called; }; #endif /* __DUMMY_INDICATOR_ENTRY_FUNC__ */ libayatana-indicator-0.9.4/tests/dummy-indicator-null.c0000644000000000000000000000654014566140211020061 0ustar /* Test for libindicator Copyright 2009 Canonical Ltd. Copyright 2021 Robert Tari Authors: Ted Gould Robert Tari This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #include #include #include "indicator.h" #include "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)) #define DUMMY_INDICATOR_NULL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DUMMY_INDICATOR_NULL_TYPE, DummyIndicatorNullClass)) #define IS_DUMMY_INDICATOR_NULL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DUMMY_INDICATOR_NULL_TYPE)) #define IS_DUMMY_INDICATOR_NULL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DUMMY_INDICATOR_NULL_TYPE)) #define DUMMY_INDICATOR_NULL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DUMMY_INDICATOR_NULL_TYPE, DummyIndicatorNullClass)) typedef struct _DummyIndicatorNull DummyIndicatorNull; typedef struct _DummyIndicatorNullClass DummyIndicatorNullClass; struct _DummyIndicatorNullClass { IndicatorObjectClass parent_class; }; struct _DummyIndicatorNull { IndicatorObject parent; }; GType dummy_indicator_null_get_type (void); INDICATOR_SET_VERSION INDICATOR_SET_TYPE(DUMMY_INDICATOR_NULL_TYPE) GtkLabel * get_label (IndicatorObject * io) { return NULL; } GtkImage * get_icon (IndicatorObject * io) { return NULL; } GtkMenu * get_menu (IndicatorObject * io) { return NULL; } const gchar * get_accessible_desc (IndicatorObject * io) { return NULL; } static void dummy_indicator_null_class_init (DummyIndicatorNullClass *klass); static void dummy_indicator_null_init (DummyIndicatorNull *self); static void dummy_indicator_null_dispose (GObject *object); static void dummy_indicator_null_finalize (GObject *object); G_DEFINE_TYPE (DummyIndicatorNull, dummy_indicator_null, INDICATOR_OBJECT_TYPE); static void dummy_indicator_null_class_init (DummyIndicatorNullClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->dispose = dummy_indicator_null_dispose; object_class->finalize = dummy_indicator_null_finalize; IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass); io_class->get_label = get_label; io_class->get_image = get_icon; io_class->get_menu = get_menu; io_class->get_accessible_desc = get_accessible_desc; return; } static void dummy_indicator_null_init (DummyIndicatorNull *self) { return; } static void dummy_indicator_null_dispose (GObject *object) { G_OBJECT_CLASS (dummy_indicator_null_parent_class)->dispose (object); return; } static void dummy_indicator_null_finalize (GObject *object) { G_OBJECT_CLASS (dummy_indicator_null_parent_class)->finalize (object); return; } libayatana-indicator-0.9.4/tests/dummy-indicator-signaler.c0000644000000000000000000001153114566140211020707 0ustar /* Test for libindicator Copyright 2009 Canonical Ltd. Copyright 2021 Robert Tari Authors: Ted Gould Robert Tari This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #include #include #include "indicator.h" #include "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)) #define DUMMY_INDICATOR_SIGNALER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DUMMY_INDICATOR_SIGNALER_TYPE, DummyIndicatorSignalerClass)) #define IS_DUMMY_INDICATOR_SIGNALER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DUMMY_INDICATOR_SIGNALER_TYPE)) #define IS_DUMMY_INDICATOR_SIGNALER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DUMMY_INDICATOR_SIGNALER_TYPE)) #define DUMMY_INDICATOR_SIGNALER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DUMMY_INDICATOR_SIGNALER_TYPE, DummyIndicatorSignalerClass)) typedef struct _DummyIndicatorSignaler DummyIndicatorSignaler; typedef struct _DummyIndicatorSignalerClass DummyIndicatorSignalerClass; struct _DummyIndicatorSignalerClass { IndicatorObjectClass parent_class; }; struct _DummyIndicatorSignaler { IndicatorObject parent; IndicatorObjectEntry *entries; }; GType dummy_indicator_signaler_get_type (void); INDICATOR_SET_VERSION INDICATOR_SET_TYPE(DUMMY_INDICATOR_SIGNALER_TYPE) GtkLabel * get_label (IndicatorObject * io) { return GTK_LABEL(gtk_label_new("Signaler Item")); } GtkImage * get_icon (IndicatorObject * io) { return GTK_IMAGE(gtk_image_new()); } GtkMenu * get_menu (IndicatorObject * io) { GtkMenu * main_menu = GTK_MENU(gtk_menu_new()); GtkWidget * loading_item = gtk_menu_item_new_with_label("Loading..."); gtk_menu_shell_append(GTK_MENU_SHELL(main_menu), loading_item); gtk_widget_show(GTK_WIDGET(loading_item)); return main_menu; } const gchar * get_accessible_desc (IndicatorObject * io) { return "Signaler Item"; } static void dummy_indicator_signaler_class_init (DummyIndicatorSignalerClass *klass); static void dummy_indicator_signaler_init (DummyIndicatorSignaler *self); static void dummy_indicator_signaler_dispose (GObject *object); static void dummy_indicator_signaler_finalize (GObject *object); G_DEFINE_TYPE (DummyIndicatorSignaler, dummy_indicator_signaler, INDICATOR_OBJECT_TYPE); static void dummy_indicator_signaler_class_init (DummyIndicatorSignalerClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->dispose = dummy_indicator_signaler_dispose; object_class->finalize = dummy_indicator_signaler_finalize; IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass); io_class->get_label = get_label; io_class->get_image = get_icon; io_class->get_menu = get_menu; io_class->get_accessible_desc = get_accessible_desc; io_class->entry_being_removed = NULL; io_class->entry_was_added = NULL; return; } static gboolean idle_signal (gpointer data) { DummyIndicatorSignaler * self = DUMMY_INDICATOR_SIGNALER(data); IndicatorObjectEntry *added_entry, *removed_entry, *moved_entry; added_entry = &self->entries[0]; moved_entry = &self->entries[1]; removed_entry = &self->entries[2]; added_entry->name_hint = "added"; moved_entry->name_hint = "moved"; removed_entry->name_hint = "removed"; g_signal_emit(G_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED_ID, 0, added_entry); g_signal_emit(G_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED_ID, 0, moved_entry, 0, 1); g_signal_emit(G_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED_ID, 0, removed_entry); return FALSE; /* Don't queue again */ } static void dummy_indicator_signaler_init (DummyIndicatorSignaler *self) { self->entries = g_new0(IndicatorObjectEntry, 3); g_idle_add(idle_signal, self); return; } static void dummy_indicator_signaler_dispose (GObject *object) { G_OBJECT_CLASS (dummy_indicator_signaler_parent_class)->dispose (object); return; } static void dummy_indicator_signaler_finalize (GObject *object) { DummyIndicatorSignaler * self = DUMMY_INDICATOR_SIGNALER(object); g_free (self->entries); G_OBJECT_CLASS (dummy_indicator_signaler_parent_class)->finalize (object); return; } libayatana-indicator-0.9.4/tests/dummy-indicator-simple.c0000644000000000000000000000735314566140211020403 0ustar /* Test for libindicator Copyright 2009 Canonical Ltd. Copyright 2021 Robert Tari Authors: Ted Gould Robert Tari This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #include #include #include "indicator.h" #include "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)) #define DUMMY_INDICATOR_SIMPLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DUMMY_INDICATOR_SIMPLE_TYPE, DummyIndicatorSimpleClass)) #define IS_DUMMY_INDICATOR_SIMPLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DUMMY_INDICATOR_SIMPLE_TYPE)) #define IS_DUMMY_INDICATOR_SIMPLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DUMMY_INDICATOR_SIMPLE_TYPE)) #define DUMMY_INDICATOR_SIMPLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DUMMY_INDICATOR_SIMPLE_TYPE, DummyIndicatorSimpleClass)) typedef struct _DummyIndicatorSimple DummyIndicatorSimple; typedef struct _DummyIndicatorSimpleClass DummyIndicatorSimpleClass; struct _DummyIndicatorSimpleClass { IndicatorObjectClass parent_class; }; struct _DummyIndicatorSimple { IndicatorObject parent; }; GType dummy_indicator_simple_get_type (void); INDICATOR_SET_VERSION INDICATOR_SET_TYPE(DUMMY_INDICATOR_SIMPLE_TYPE) GtkLabel * get_label (IndicatorObject * io) { return GTK_LABEL(gtk_label_new("Simple Item")); } GtkImage * get_icon (IndicatorObject * io) { return GTK_IMAGE(gtk_image_new()); } GtkMenu * get_menu (IndicatorObject * io) { GtkMenu * main_menu = GTK_MENU(gtk_menu_new()); GtkWidget * loading_item = gtk_menu_item_new_with_label("Loading..."); gtk_menu_shell_append(GTK_MENU_SHELL(main_menu), loading_item); gtk_widget_show(GTK_WIDGET(loading_item)); return main_menu; } const gchar * get_accessible_desc (IndicatorObject * io) { return "Simple Item"; } static void dummy_indicator_simple_class_init (DummyIndicatorSimpleClass *klass); static void dummy_indicator_simple_init (DummyIndicatorSimple *self); static void dummy_indicator_simple_dispose (GObject *object); static void dummy_indicator_simple_finalize (GObject *object); G_DEFINE_TYPE (DummyIndicatorSimple, dummy_indicator_simple, INDICATOR_OBJECT_TYPE); static void dummy_indicator_simple_class_init (DummyIndicatorSimpleClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->dispose = dummy_indicator_simple_dispose; object_class->finalize = dummy_indicator_simple_finalize; IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass); io_class->get_label = get_label; io_class->get_image = get_icon; io_class->get_menu = get_menu; io_class->get_accessible_desc = get_accessible_desc; return; } static void dummy_indicator_simple_init (DummyIndicatorSimple *self) { return; } static void dummy_indicator_simple_dispose (GObject *object) { G_OBJECT_CLASS (dummy_indicator_simple_parent_class)->dispose (object); return; } static void dummy_indicator_simple_finalize (GObject *object) { G_OBJECT_CLASS (dummy_indicator_simple_parent_class)->finalize (object); return; } libayatana-indicator-0.9.4/tests/dummy-indicator-visible.c0000644000000000000000000001130614566140211020540 0ustar /* Test for libindicator Copyright 2012 Canonical Ltd. Copyright 2021 Robert Tari Authors: Charles Kerr Robert Tari This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #include #include #include "indicator.h" #include "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)) #define DUMMY_INDICATOR_VISIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DUMMY_INDICATOR_VISIBLE_TYPE, DummyIndicatorVisibleClass)) #define IS_DUMMY_INDICATOR_VISIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DUMMY_INDICATOR_VISIBLE_TYPE)) #define IS_DUMMY_INDICATOR_VISIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DUMMY_INDICATOR_VISIBLE_TYPE)) #define DUMMY_INDICATOR_VISIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DUMMY_INDICATOR_VISIBLE_TYPE, DummyIndicatorVisibleClass)) typedef struct _DummyIndicatorVisible DummyIndicatorVisible; typedef struct _DummyIndicatorVisibleClass DummyIndicatorVisibleClass; struct _DummyIndicatorVisibleClass { IndicatorObjectClass parent_class; }; struct _DummyIndicatorVisible { IndicatorObject parent; }; GType dummy_indicator_visible_get_type (void); INDICATOR_SET_VERSION INDICATOR_SET_TYPE(DUMMY_INDICATOR_VISIBLE_TYPE) GtkLabel * get_label (IndicatorObject * io) { return GTK_LABEL(gtk_label_new("Visible Item")); } GtkImage * get_icon (IndicatorObject * io) { return GTK_IMAGE(gtk_image_new()); } GtkMenu * get_menu (IndicatorObject * io) { GtkMenu * main_menu = GTK_MENU(gtk_menu_new()); GtkWidget * loading_item = gtk_menu_item_new_with_label("Loading..."); gtk_menu_shell_append(GTK_MENU_SHELL(main_menu), loading_item); gtk_widget_show(GTK_WIDGET(loading_item)); return main_menu; } const gchar * get_accessible_desc (IndicatorObject * io) { return "Visible Item"; } static void dummy_indicator_visible_class_init (DummyIndicatorVisibleClass *klass); static void dummy_indicator_visible_init (DummyIndicatorVisible *self); static void dummy_indicator_visible_dispose (GObject *object); static void dummy_indicator_visible_finalize (GObject *object); G_DEFINE_TYPE (DummyIndicatorVisible, dummy_indicator_visible, INDICATOR_OBJECT_TYPE); static void dummy_indicator_entry_being_removed (IndicatorObject * io, IndicatorObjectEntry * entry) { IndicatorObjectClass * indicator_object_class = INDICATOR_OBJECT_CLASS (dummy_indicator_visible_parent_class); g_object_set_data(G_OBJECT(entry->label), "is-hidden", GINT_TO_POINTER(1)); if (indicator_object_class->entry_being_removed != NULL) { indicator_object_class->entry_being_removed (io, entry); } } static void dummy_indicator_entry_was_added (IndicatorObject * io, IndicatorObjectEntry * entry) { IndicatorObjectClass * indicator_object_class = INDICATOR_OBJECT_CLASS (dummy_indicator_visible_parent_class); g_object_steal_data(G_OBJECT(entry->label), "is-hidden"); if (indicator_object_class->entry_was_added != NULL) { indicator_object_class->entry_was_added (io, entry); } } static void dummy_indicator_visible_class_init (DummyIndicatorVisibleClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->dispose = dummy_indicator_visible_dispose; object_class->finalize = dummy_indicator_visible_finalize; IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass); io_class->get_label = get_label; io_class->get_image = get_icon; io_class->get_menu = get_menu; io_class->get_accessible_desc = get_accessible_desc; io_class->entry_being_removed = dummy_indicator_entry_being_removed; io_class->entry_was_added = dummy_indicator_entry_was_added; } static void dummy_indicator_visible_init (DummyIndicatorVisible *self) { } static void dummy_indicator_visible_dispose (GObject *object) { G_OBJECT_CLASS (dummy_indicator_visible_parent_class)->dispose (object); } static void dummy_indicator_visible_finalize (GObject *object) { G_OBJECT_CLASS (dummy_indicator_visible_parent_class)->finalize (object); } libayatana-indicator-0.9.4/tests/indicator-test-service.c0000644000000000000000000000656414566140211020401 0ustar #include typedef struct { GSimpleActionGroup *actions; GMenu *menu; guint actions_export_id; guint menu_export_id; } IndicatorTestService; static void bus_acquired (GDBusConnection *connection, const gchar *name, gpointer user_data) { IndicatorTestService *indicator = user_data; GError *error = NULL; indicator->actions_export_id = g_dbus_connection_export_action_group (connection, "/org/ayatana/indicator/test", G_ACTION_GROUP (indicator->actions), &error); if (indicator->actions_export_id == 0) { g_warning ("cannot export action group: %s", error->message); g_error_free (error); return; } indicator->menu_export_id = g_dbus_connection_export_menu_model (connection, "/org/ayatana/indicator/test/desktop", G_MENU_MODEL (indicator->menu), &error); if (indicator->menu_export_id == 0) { g_warning ("cannot export menu: %s", error->message); g_error_free (error); return; } } static void name_lost (GDBusConnection *connection, const gchar *name, gpointer user_data) { IndicatorTestService *indicator = user_data; if (indicator->actions_export_id) g_dbus_connection_unexport_action_group (connection, indicator->actions_export_id); if (indicator->menu_export_id) g_dbus_connection_unexport_menu_model (connection, indicator->menu_export_id); } static void activate_show (GSimpleAction *action, GVariant *parameter, gpointer user_data) { g_message ("showing"); } int main (int argc, char **argv) { IndicatorTestService indicator = { 0 }; GMenuItem *item; GMenu *submenu; GActionEntry entries[] = { { "_header", NULL, NULL, "{'label': <'Test'>," " 'icon': <'indicator-test'>," " 'accessible-desc': <'Test indicator'> }", NULL }, { "show", activate_show, NULL, NULL, NULL } }; GMainLoop *loop; indicator.actions = g_simple_action_group_new (); g_action_map_add_action_entries(G_ACTION_MAP(indicator.actions), entries, G_N_ELEMENTS (entries), NULL); 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-ayatana-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, "org.ayatana.indicator.test", G_BUS_NAME_OWNER_FLAGS_NONE, bus_acquired, NULL, name_lost, &indicator, NULL); loop = g_main_loop_new (NULL, FALSE); g_main_loop_run (loop); g_object_unref (submenu); g_object_unref (item); g_object_unref (indicator.actions); g_object_unref (indicator.menu); g_object_unref (loop); return 0; } libayatana-indicator-0.9.4/tests/org.ayatana.indicator.no-such-service0000644000000000000000000000011714566140211022745 0ustar [Indicator Service] Name=indicator-test ObjectPath=/org/ayatana/indicator/test libayatana-indicator-0.9.4/tests/org.ayatana.indicator.test0000644000000000000000000000021114566140211020705 0ustar [Indicator Service] Name=indicator-test ObjectPath=/org/ayatana/indicator/test [desktop] ObjectPath=/org/ayatana/indicator/test/desktop libayatana-indicator-0.9.4/tests/org.ayatana.indicator.test.service.in0000644000000000000000000000014714566140211022761 0ustar [D-BUS Service] Name=org.ayatana.indicator.test Exec=@CMAKE_CURRENT_BINARY_DIR@/indicator-test-service libayatana-indicator-0.9.4/tests/run-xvfb.sh0000644000000000000000000000161414566140211015740 0ustar if [ "$DISPLAY" == "" ]; then Xvfb -ac -noreset -screen 0 800x600x16 -help 2>/dev/null 1>&2 XID=`for id in 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 9995 9996 9997 9998 9999 ; do test -e /tmp/.X$id-lock || { echo $id; exit 0; }; done; exit 1` { Xvfb -ac -noreset -screen 0 800x600x16 :$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & trap "kill -15 $! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } DISPLAY=:$XID export DISPLAY echo Setting display: $DISPLAY fi libayatana-indicator-0.9.4/tests/service-manager-connect.c0000644000000000000000000000401714566140211020500 0ustar /* Test for libayatana-indicator Copyright 2009 Canonical Ltd. Copyright 2021 Robert Tari Authors: Ted Gould Robert Tari This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #include #include "indicator-service-manager.h" static GMainLoop * mainloop = NULL; static gboolean passed = FALSE; gboolean timeout (gpointer data) { passed = FALSE; g_error("Timeout with no connection."); g_main_loop_quit(mainloop); return FALSE; } void connection (IndicatorServiceManager * sm, gboolean connected, gpointer user_data) { static gboolean has_connected = FALSE; if (has_connected && connected) { g_warning("We got two connected signals. FAIL."); passed = FALSE; return; } if (!connected) { g_debug("Not connected"); return; } has_connected = TRUE; g_debug("Connection"); passed = TRUE; g_main_loop_quit(mainloop); return; } int main (int argc, char ** argv) { g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL); IndicatorServiceManager * is = indicator_service_manager_new("org.ayatana.test"); g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection), NULL); g_timeout_add_seconds(1, timeout, NULL); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); g_object_unref(is); g_debug("Quiting"); if (passed) { g_debug("Passed"); return 0; } g_debug("Failed"); return 1; } libayatana-indicator-0.9.4/tests/service-manager-connect-service.c0000644000000000000000000000310414566140211022132 0ustar /* Test for libayatana-indicator Copyright 2009 Canonical Ltd. Copyright 2021 Robert Tari Authors: Ted Gould Robert Tari This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #include #include "indicator-service.h" static GMainLoop * mainloop = NULL; static gboolean passed = FALSE; gboolean timeout (gpointer data) { passed = FALSE; g_debug("Timeout with no shutdown."); g_main_loop_quit(mainloop); return FALSE; } void shutdown (void) { g_debug("Shutdown"); passed = TRUE; g_main_loop_quit(mainloop); return; } int main (int argc, char ** argv) { g_debug("Starting service"); IndicatorService * is = indicator_service_new("org.ayatana.test"); g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, shutdown, NULL); g_timeout_add_seconds(5, timeout, NULL); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); g_debug("Quiting"); if (passed) { g_debug("Passed"); return 0; } g_debug("Failed"); return 1; } libayatana-indicator-0.9.4/tests/service-manager-connect.service.in0000644000000000000000000000014614566140211022322 0ustar [D-BUS Service] Name=org.ayatana.test Exec=@CMAKE_CURRENT_BINARY_DIR@/service-manager-connect-service libayatana-indicator-0.9.4/tests/service-manager-no-connect.c0000644000000000000000000000320114566140211021104 0ustar /* Test for libayatana-indicator Copyright 2009 Canonical Ltd. Copyright 2021 Robert Tari Authors: Ted Gould Robert Tari This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #include #include "indicator-service-manager.h" static GMainLoop * mainloop = NULL; static gboolean passed = FALSE; gboolean timeout (gpointer data) { passed = TRUE; g_debug("Timeout with no connection."); g_main_loop_quit(mainloop); return FALSE; } void connection (void) { g_debug("Connection"); passed = FALSE; g_main_loop_quit(mainloop); return; } int main (int argc, char ** argv) { g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL); IndicatorServiceManager * is = indicator_service_manager_new("my.test.name"); g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, connection, NULL); g_timeout_add_seconds(1, timeout, NULL); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); g_debug("Quiting"); if (passed) { g_debug("Passed"); return 0; } g_debug("Failed"); return 1; } libayatana-indicator-0.9.4/tests/service-manager-nostart-connect.c0000644000000000000000000000404614566140211022172 0ustar /* Test for libayatana-indicator Copyright 2009 Canonical Ltd. Copyright 2021 Robert Tari Authors: Ted Gould Robert Tari This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #include #include "indicator-service-manager.h" static GMainLoop * mainloop = NULL; static gboolean passed = FALSE; gboolean timeout (gpointer data) { passed = FALSE; g_error("Timeout with no connection."); g_main_loop_quit(mainloop); return FALSE; } void connection (IndicatorServiceManager * sm, gboolean connected, gpointer user_data) { static gboolean has_connected = FALSE; if (has_connected && connected) { g_warning("We got two connected signals. FAIL."); passed = FALSE; return; } if (!connected) { g_debug("Not connected"); return; } has_connected = TRUE; g_debug("Connection"); passed = TRUE; g_main_loop_quit(mainloop); return; } int main (int argc, char ** argv) { g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL); g_usleep(150000); IndicatorServiceManager * is = indicator_service_manager_new("org.ayatana.test"); g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection), NULL); g_timeout_add_seconds(1, timeout, NULL); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); g_object_unref(is); g_debug("Quiting"); if (passed) { g_debug("Passed"); return 0; } g_debug("Failed"); return 1; } libayatana-indicator-0.9.4/tests/service-shutdown-timeout.c0000644000000000000000000000303614566140211020776 0ustar /* Test for libayatana-indicator Copyright 2009 Canonical Ltd. Copyright 2021 Robert Tari Authors: Ted Gould Robert Tari This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #include #include "indicator-service.h" static GMainLoop * mainloop = NULL; static gboolean passed = FALSE; gboolean timeout (gpointer data) { passed = FALSE; g_error("Timeout with no shutdown."); g_main_loop_quit(mainloop); return FALSE; } void shutdown (void) { g_debug("Shutdown"); passed = TRUE; g_main_loop_quit(mainloop); return; } int main (int argc, char ** argv) { IndicatorService * is = indicator_service_new("my.test.name"); g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, shutdown, NULL); g_timeout_add_seconds(2, timeout, NULL); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); g_debug("Quiting"); if (passed) { g_debug("Passed"); return 0; } g_debug("Failed"); return 1; } libayatana-indicator-0.9.4/tests/service-version-bad-service.c0000644000000000000000000000315214566140211021305 0ustar /* Test for libayatana-indicator Copyright 2009 Canonical Ltd. Copyright 2021 Robert Tari Authors: Ted Gould Robert Tari This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #include #include "indicator-service.h" #include "service-version-values.h" static GMainLoop * mainloop = NULL; static gboolean passed = FALSE; gboolean timeout (gpointer data) { passed = FALSE; g_debug("Timeout with no shutdown."); g_main_loop_quit(mainloop); return FALSE; } void shutdown (void) { g_debug("Shutdown"); passed = TRUE; g_main_loop_quit(mainloop); return; } int main (int argc, char ** argv) { IndicatorService * is = indicator_service_new_version("org.ayatana.version.bad", SERVICE_VERSION_BAD); g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, shutdown, NULL); g_timeout_add_seconds(1, timeout, NULL); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); g_debug("Quiting"); if (passed) { g_debug("Passed"); return 0; } g_debug("Failed"); return 1; } libayatana-indicator-0.9.4/tests/service-version-bad.service.in0000644000000000000000000000015114566140211021466 0ustar [D-BUS Service] Name=org.ayatana.version.bad Exec=@CMAKE_CURRENT_BINARY_DIR@/service-version-bad-service libayatana-indicator-0.9.4/tests/service-version-good-service.c0000644000000000000000000000343014566140211021506 0ustar /* Test for libayatana-indicator Copyright 2009 Canonical Ltd. Copyright 2021 Robert Tari Authors: Ted Gould Robert Tari This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #include #include "indicator-service.h" #include "service-version-values.h" static GMainLoop * mainloop = NULL; static gboolean passed = FALSE; static IndicatorService * is = NULL; gboolean timeout (gpointer data) { passed = FALSE; g_debug("Timeout with no shutdown."); if (is != NULL) { g_object_unref(is); is = NULL; } g_main_loop_quit(mainloop); return FALSE; } void shutdown (void) { g_debug("Shutdown"); passed = TRUE; if (is != NULL) { g_object_unref(is); is = NULL; } g_main_loop_quit(mainloop); return; } int main (int argc, char ** argv) { is = indicator_service_new_version("org.ayatana.version.good", SERVICE_VERSION_GOOD); g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, shutdown, NULL); g_timeout_add_seconds(1, timeout, NULL); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); g_debug("Quiting"); if (passed) { g_debug("Passed"); return 0; } g_debug("Failed"); return 1; } libayatana-indicator-0.9.4/tests/service-version-good.service.in0000644000000000000000000000015314566140211021672 0ustar [D-BUS Service] Name=org.ayatana.version.good Exec=@CMAKE_CURRENT_BINARY_DIR@/service-version-good-service libayatana-indicator-0.9.4/tests/service-version-manager.c0000644000000000000000000000462414566140211020540 0ustar /* Test for libayatana-indicator Copyright 2009 Canonical Ltd. Copyright 2021 Robert Tari Authors: Ted Gould Robert Tari This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #include #include "indicator-service-manager.h" #include "service-version-values.h" static GMainLoop * mainloop = NULL; static gboolean con_good = FALSE; static gboolean con_bad = FALSE; gboolean timeout (gpointer data) { g_debug("Timeout."); g_main_loop_quit(mainloop); return FALSE; } void connection_bad (IndicatorServiceManager * sm, gboolean connected, gpointer user_data) { if (!connected) return; g_debug("Connection From Bad!"); con_bad = TRUE; return; } void connection_good (IndicatorServiceManager * sm, gboolean connected, gpointer user_data) { if (!connected) return; g_debug("Connection From Good."); con_good = TRUE; return; } int main (int argc, char ** argv) { g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL); g_print("Manager: DBUS_SESSION_BUS_ADDRESS = %s\n", g_getenv("DBUS_SESSION_BUS_ADDRESS")); IndicatorServiceManager * goodis = indicator_service_manager_new_version("org.ayatana.version.good", SERVICE_VERSION_GOOD); g_signal_connect(G_OBJECT(goodis), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_good), NULL); IndicatorServiceManager * badis = indicator_service_manager_new_version("org.ayatana.version.bad", SERVICE_VERSION_GOOD); g_signal_connect(G_OBJECT(badis), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_bad), NULL); g_timeout_add_seconds(1, timeout, NULL); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); g_object_unref(goodis); g_object_unref(badis); g_debug("Quiting"); if (con_good && !con_bad) { g_debug("Passed"); return 0; } g_debug("Failed"); return 1; } libayatana-indicator-0.9.4/tests/service-version-multiwatch-manager.c0000644000000000000000000000414014566140211022710 0ustar /* Test for libayatana-indicator Copyright 2009 Canonical Ltd. Copyright 2021 Robert Tari Authors: Ted Gould Robert Tari This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #include #include "indicator-service-manager.h" #include "service-version-values.h" static GMainLoop * mainloop = NULL; static gboolean passed = FALSE; static IndicatorServiceManager * goodis = NULL; gboolean timeout (gpointer data) { g_debug("Timeout."); passed = FALSE; g_main_loop_quit(mainloop); return FALSE; } void connection_good (IndicatorServiceManager * sm, gboolean connected, gpointer user_data) { if (!connected) return; g_debug("Connection From Service."); passed = TRUE; g_main_loop_quit(mainloop); return; } gboolean delay_start (gpointer data) { g_debug("Starting Manager"); goodis = indicator_service_manager_new_version("org.ayatana.version.good", SERVICE_VERSION_GOOD); g_signal_connect(G_OBJECT(goodis), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_good), NULL); g_timeout_add_seconds(1, timeout, NULL); return FALSE; } int main (int argc, char ** argv) { g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL); g_print("Manager: DBUS_SESSION_BUS_ADDRESS = %s\n", g_getenv("DBUS_SESSION_BUS_ADDRESS")); g_timeout_add(500, delay_start, NULL); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); g_object_unref(goodis); g_debug("Quiting"); if (passed) { g_debug("Passed"); return 0; } g_debug("Failed"); return 1; } libayatana-indicator-0.9.4/tests/service-version-multiwatch-manager-impolite.c0000644000000000000000000000410314566140211024527 0ustar /* Test for libayatana-indicator Copyright 2009 Canonical Ltd. Copyright 2021 Robert Tari Authors: Ted Gould Robert Tari This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #include #include "indicator-service-manager.h" #include "service-version-values.h" static GMainLoop * mainloop = NULL; static gboolean passed = FALSE; static IndicatorServiceManager * goodis = NULL; gboolean timeout (gpointer data) { g_debug("Timeout."); passed = FALSE; g_main_loop_quit(mainloop); return FALSE; } void connection_good (IndicatorServiceManager * sm, gboolean connected, gpointer user_data) { if (!connected) return; g_debug("Connection From Service."); passed = TRUE; g_main_loop_quit(mainloop); return; } gboolean delay_start (gpointer data) { g_debug("Starting Manager"); goodis = indicator_service_manager_new_version("org.ayatana.version.good", SERVICE_VERSION_GOOD); g_signal_connect(G_OBJECT(goodis), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_good), NULL); g_timeout_add_seconds(1, timeout, NULL); return FALSE; } int main (int argc, char ** argv) { g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL); g_print("Manager: DBUS_SESSION_BUS_ADDRESS = %s\n", g_getenv("DBUS_SESSION_BUS_ADDRESS")); g_timeout_add(500, delay_start, NULL); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); g_debug("Quiting"); if (passed) { g_debug("Passed"); return 0; } g_debug("Failed"); return 1; } libayatana-indicator-0.9.4/tests/service-version-multiwatch-service.c0000644000000000000000000000321614566140211022741 0ustar /* Test for libayatana-indicator Copyright 2009 Canonical Ltd. Copyright 2021 Robert Tari Authors: Ted Gould Robert Tari This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #include #include "indicator-service.h" #include "service-version-values.h" static GMainLoop * mainloop = NULL; static gboolean passed = FALSE; gboolean timeout (gpointer data) { passed = FALSE; g_debug("Timeout with no shutdown."); g_main_loop_quit(mainloop); return FALSE; } void shutdown (void) { g_debug("Shutdown"); passed = TRUE; g_main_loop_quit(mainloop); return; } int main (int argc, char ** argv) { g_debug("Service starting"); IndicatorService * is = indicator_service_new_version("org.ayatana.version.good", SERVICE_VERSION_GOOD); g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, shutdown, NULL); g_timeout_add_seconds(2, timeout, NULL); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); g_debug("Quiting"); if (passed) { g_debug("Passed"); return 0; } g_debug("Failed"); return 1; } libayatana-indicator-0.9.4/tests/service-version-values.h0000644000000000000000000000134514566140211020427 0ustar /* Test for libindicator Copyright 2009 Canonical Ltd. Authors: Ted Gould This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #define SERVICE_VERSION_GOOD 1342 #define SERVICE_VERSION_BAD 543 libayatana-indicator-0.9.4/tests/session.conf.in0000644000000000000000000000317414566140211016577 0ustar session unix:tmpdir=/tmp @CMAKE_CURRENT_BINARY_DIR@ 60000 1000000000 1000000000 1000000000 120000 240000 100000 10000 100000 10000 50000 50000 50000 300000 libayatana-indicator-0.9.4/tests/test-desktop-shortcuts.c0000644000000000000000000001055014566140211020462 0ustar /* Test for libayatana-indicator Copyright 2009 Canonical Ltd. Copyright 2021 Robert Tari Authors: Ted Gould Robert Tari This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #include #include "indicator-desktop-shortcuts.h" /* Basic object creation and destruction. Stop big f*** ups here. */ void test_desktop_shortcuts_creation (void) { IndicatorDesktopShortcuts * ids = indicator_desktop_shortcuts_new(SRCDIR "/test-well-formed.desktop", "France"); g_assert(ids != NULL); g_object_add_weak_pointer(G_OBJECT(ids), (gpointer *)&ids); g_object_unref(G_OBJECT(ids)); g_assert(ids == NULL); return; } /* Tests that the NotShowIn the desktop group is watched for */ void test_desktop_shortcuts_globalnoshow (void) { IndicatorDesktopShortcuts * ids = indicator_desktop_shortcuts_new(SRCDIR "/test-well-formed.desktop", "Germany"); g_assert(ids != NULL); const gchar ** nicks = indicator_desktop_shortcuts_get_nicks(ids); g_assert(nicks[0] == NULL); g_object_unref(ids); return; } gboolean nicks_contains (const gchar ** nicks, const gchar * search) { if (nicks[0] == NULL) return FALSE; if (g_strcmp0(nicks[0], search) == 0) return TRUE; return nicks_contains(&nicks[1], search); } /* Checking that the local show OnlyIn works. */ void test_desktop_shortcuts_localfilter (void) { IndicatorDesktopShortcuts * ids = indicator_desktop_shortcuts_new(SRCDIR "/test-well-formed.desktop", "France"); g_assert(ids != NULL); const gchar ** nicks = indicator_desktop_shortcuts_get_nicks(ids); g_assert(nicks_contains(nicks, "bob")); g_assert(nicks_contains(nicks, "alvin")); g_assert(!nicks_contains(nicks, "jim")); g_object_unref(ids); return; } /* Nick names -- checks to see they all have names */ void test_desktop_shortcuts_nicknames (void) { IndicatorDesktopShortcuts * ids = indicator_desktop_shortcuts_new(SRCDIR "/test-well-formed.desktop", "France"); g_assert(ids != NULL); const gchar ** nicks = indicator_desktop_shortcuts_get_nicks(ids); gint i = 0; while (nicks[i] != NULL) { gchar * expectedstr = g_strdup_printf("%s's shortcut", nicks[i]); gchar * name = indicator_desktop_shortcuts_nick_get_name(ids, nicks[i]); g_assert(name != NULL); gboolean same = (g_strcmp0(expectedstr, name) == 0); g_free(name); g_free(expectedstr); g_assert(same); i++; } g_object_unref(ids); return; } /* Try executing a shortcut which will touch a file */ void test_desktop_shortcuts_launch (void) { return; IndicatorDesktopShortcuts * ids = indicator_desktop_shortcuts_new(SRCDIR "/test-well-formed.desktop", "TouchTest"); g_assert(ids != NULL); const gchar ** nicks = indicator_desktop_shortcuts_get_nicks(ids); g_assert(nicks_contains(nicks, "touch")); g_assert(indicator_desktop_shortcuts_nick_exec_with_context(ids, "touch", NULL)); g_usleep(100000); g_assert(g_file_test(BUILD_DIR "/test-desktop-shortcuts-touch-test", G_FILE_TEST_EXISTS)); g_object_unref(ids); return; } /* Build our test suite */ void test_desktop_shortcuts_suite (void) { g_test_add_func ("/libayatana-indicator/desktopshortcuts/creation", test_desktop_shortcuts_creation); g_test_add_func ("/libayatana-indicator/desktopshortcuts/globalnosho", test_desktop_shortcuts_globalnoshow); g_test_add_func ("/libayatana-indicator/desktopshortcuts/nicknames", test_desktop_shortcuts_nicknames); g_test_add_func ("/libayatana-indicator/desktopshortcuts/launch", test_desktop_shortcuts_launch); return; } int main (int argc, char ** argv) { g_test_init (&argc, &argv, NULL); gtk_init(&argc, &argv); test_desktop_shortcuts_suite(); g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL); return g_test_run(); } libayatana-indicator-0.9.4/tests/test-indicator-ng.c0000644000000000000000000001175414566140211017342 0ustar #include "indicator-ng.h" static void indicator_ng_test_func (gconstpointer user_data) { GTestFunc test_func = user_data; GTestDBus *bus; bus = g_test_dbus_new (G_TEST_DBUS_NONE); g_test_dbus_add_service_dir (bus, BUILD_DIR); g_test_dbus_up (bus); test_func (); g_test_dbus_down (bus); g_object_unref (bus); } #define indicator_ng_test_add(name, test_func) \ g_test_add_data_func ("/indicator-ng/" name, test_func, indicator_ng_test_func) static gboolean stop_main_loop (gpointer user_data) { GMainLoop *loop = user_data; g_main_loop_quit (loop); return FALSE; } static void test_non_existing (void) { IndicatorNg *indicator; GError *error = NULL; 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); g_clear_error (&error); } static void test_instantiation (void) { IndicatorNg *indicator; GError *error = NULL; GMainLoop *loop; 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 "/org.ayatana.indicator.no-such-service"); g_assert_cmpstr (indicator_ng_get_profile (indicator), ==, "desktop"); { gchar *service_file; gchar *profile; g_object_get (indicator, "service-file", &service_file, "profile", &profile, NULL); g_assert_cmpstr (service_file, ==, SRCDIR "/org.ayatana.indicator.no-such-service"); g_assert_cmpstr (profile, ==, "desktop"); g_free (service_file); g_free (profile); } loop = g_main_loop_new (NULL, FALSE); g_timeout_add (200, stop_main_loop, loop); g_main_loop_run (loop); /* no such service, so there shouldn't be any indicators */ g_assert (indicator_object_get_entries (INDICATOR_OBJECT (indicator)) == NULL); g_main_loop_unref (loop); g_object_unref (indicator); } static void test_instantiation_with_profile (void) { IndicatorNg *indicator; GError *error = NULL; indicator = indicator_ng_new_for_profile (SRCDIR "/org.ayatana.indicator.test", "greeter", &error); g_assert (indicator); g_assert (error == NULL); g_assert_cmpstr (indicator_ng_get_profile (indicator), ==, "greeter"); g_object_unref (indicator); } /* From gtk+/testsuite/gtk/gtkmenu.c * * Returns the label of a GtkModelMenuItem, for which * gtk_menu_item_get_label() returns NULL, because it uses its own * widgets to accommodate an icon. * */ static const gchar * get_label (GtkMenuItem *item) { GList *children = gtk_container_get_children (GTK_CONTAINER (item)); const gchar *label = NULL; while (children) { if (GTK_IS_CONTAINER (children->data)) children = g_list_concat (children, gtk_container_get_children (children->data)); else if (GTK_IS_LABEL (children->data)) label = gtk_label_get_text (children->data); children = g_list_delete_link (children, children); } return label; } static void test_menu (void) { IndicatorNg *indicator; GError *error = NULL; GMainLoop *loop; GList *entries; IndicatorObjectEntry *entry; indicator = indicator_ng_new (SRCDIR "/org.ayatana.indicator.test", &error); g_assert (indicator); g_assert (error == NULL); loop = g_main_loop_new (NULL, FALSE); g_timeout_add (500, stop_main_loop, loop); g_main_loop_run (loop); entries = indicator_object_get_entries (INDICATOR_OBJECT (indicator)); g_assert_cmpint (g_list_length (entries), ==, 1); entry = entries->data; g_assert_cmpstr (entry->name_hint, ==, "indicator-test"); g_assert_cmpstr (entry->accessible_desc, ==, "Test indicator"); g_assert_cmpstr (gtk_label_get_label (entry->label), ==, "Test"); g_assert (gtk_image_get_storage_type (entry->image) == GTK_IMAGE_ICON_NAME); { GList *children; GtkMenuItem *item; g_assert (entry->menu != NULL); children = gtk_container_get_children (GTK_CONTAINER (entry->menu)); g_assert_cmpint (g_list_length (children), ==, 1); item = children->data; g_assert (GTK_IS_MENU_ITEM (item)); g_assert (gtk_widget_is_sensitive (GTK_WIDGET (item))); g_assert_cmpstr (get_label (item), ==, "Show"); g_list_free (children); } g_list_free (entries); g_main_loop_unref (loop); g_object_unref (indicator); } int main (int argc, char **argv) { /* gvfs, dconf, and appmenu-gtk leak GDbusConnections, which confuses * g_test_dbus_down. Make sure we're not using any of those. */ g_setenv ("GIO_USE_VFS", "local", TRUE); g_setenv ("GSETTINGS_BACKEND", "memory", TRUE); g_unsetenv ("UBUNTU_MENUPROXY"); g_test_init (&argc, &argv, NULL); gtk_init (&argc, &argv); indicator_ng_test_add ("non-existing", test_non_existing); indicator_ng_test_add ("instantiation", test_instantiation); indicator_ng_test_add ("instantiation-with-profile", test_instantiation_with_profile); indicator_ng_test_add ("menu", test_menu); return g_test_run (); } libayatana-indicator-0.9.4/tests/test-loader.c0000644000000000000000000002644114566140211016231 0ustar /* Test for libindicator Copyright 2009 Canonical Ltd. Copyright 2021 Robert Tari Authors: Ted Gould Robert Tari This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 3.0 for more details. You should have received a copy of the GNU General Public License along with this library. If not, see . */ #include #include "indicator-object.h" #include "dummy-indicator-entry-func.h" void entry_func_swap (IndicatorObject * io) { static void (*saved_func) (IndicatorObject * io, IndicatorObjectEntry * entry, guint windowid, guint timestamp) = NULL; IndicatorObjectClass * klass = INDICATOR_OBJECT_GET_CLASS(io); if (saved_func == NULL) { saved_func = klass->entry_activate_window; } if (klass->entry_activate_window == NULL) { klass->entry_activate_window = saved_func; } else { klass->entry_activate_window = NULL; } return; } void test_loader_entry_func_window (void) { IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/libdummy-indicator-entry-func.so"); g_assert(object != NULL); DummyIndicatorEntryFunc * entryfunc = (DummyIndicatorEntryFunc *)(object); entryfunc->entry_activate_called = FALSE; entryfunc->entry_activate_window_called = FALSE; entryfunc->entry_close_called = FALSE; entry_func_swap(object); indicator_object_entry_activate_window(object, NULL, 0, 0); g_assert(entryfunc->entry_activate_called); entry_func_swap(object); indicator_object_entry_activate_window(object, NULL, 0, 0); g_assert(entryfunc->entry_activate_window_called); g_object_unref(object); return; } void test_loader_entry_funcs (void) { IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/libdummy-indicator-entry-func.so"); g_assert(object != NULL); DummyIndicatorEntryFunc * entryfunc = (DummyIndicatorEntryFunc *)(object); entryfunc->entry_activate_called = FALSE; entryfunc->entry_activate_window_called = FALSE; entryfunc->entry_close_called = FALSE; indicator_object_entry_activate(object, NULL, 0); g_assert(entryfunc->entry_activate_called); indicator_object_entry_activate_window(object, NULL, 0, 0); g_assert(entryfunc->entry_activate_window_called); indicator_object_entry_close(object, NULL, 0); g_assert(entryfunc->entry_close_called); g_object_unref(object); return; } void destroy_cb (gpointer data, GObject * object); void entry_change_cb (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer data) { IndicatorObjectEntry *other_entry = data; other_entry->name_hint = entry->name_hint; other_entry->parent_object = entry->parent_object; return; } void entry_move_cb (IndicatorObject * io, IndicatorObjectEntry * entry, gint old, gint new, gpointer data) { return entry_change_cb(io, entry, data); } void test_loader_filename_dummy_signaler (void) { IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/libdummy-indicator-signaler.so"); g_assert(object != NULL); IndicatorObjectEntry *added_entry, *moved_entry, *removed_entry; IndicatorObjectEntry entries[3]; added_entry = &entries[0]; moved_entry = &entries[1]; removed_entry = &entries[2]; g_signal_connect_after(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED, G_CALLBACK(entry_change_cb), added_entry); g_signal_connect_after(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED, G_CALLBACK(entry_move_cb), moved_entry); g_signal_connect_after(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, G_CALLBACK(entry_change_cb), removed_entry); GList * list = indicator_object_get_entries(object); g_assert(list != NULL); g_list_free(list); while (g_main_context_pending(NULL)) { g_main_context_iteration(NULL, TRUE); } g_assert(g_strcmp0(added_entry->name_hint, "added") == 0); g_assert(g_strcmp0(removed_entry->name_hint, "removed") == 0); g_assert(g_strcmp0(moved_entry->name_hint, "moved") == 0); g_assert(added_entry->parent_object == object); g_assert(removed_entry->parent_object == NULL); g_object_unref(object); return; } /*** **** ***/ static void visible_entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer box) { GtkWidget * child = GTK_WIDGET (entry->label); g_assert (child != NULL); if (g_object_get_data (G_OBJECT(child), "frame-parent") == NULL) { GtkWidget * frame = gtk_frame_new (NULL); gtk_container_add (GTK_CONTAINER(frame), child); gtk_box_pack_start (GTK_BOX(box), frame, FALSE, FALSE, 0); g_object_set_data (G_OBJECT(child), "frame-parent", frame); } } static void visible_entry_removed (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer box) { GtkWidget * child = GTK_WIDGET (entry->label); g_assert (child != NULL); g_assert (g_object_get_data (G_OBJECT(child), "frame-parent") != NULL); } void test_loader_filename_dummy_visible (void) { const GQuark is_hidden_quark = g_quark_from_static_string ("is-hidden"); IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/libdummy-indicator-visible.so"); g_assert(object != NULL); // create our local parent widgetry #if GTK_CHECK_VERSION(3,0,0) GtkWidget * box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); #else GtkWidget * box = gtk_hbox_new (TRUE, 0); #endif g_signal_connect(object, INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED, G_CALLBACK(visible_entry_added), box); g_signal_connect(object, INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, G_CALLBACK(visible_entry_removed), box); // on startup, DummyVisible has one entry and it has a label GList * list = indicator_object_get_entries(object); g_assert(g_list_length(list) == 1); IndicatorObjectEntry * entry = list->data; g_assert(entry != NULL); g_list_free(list); g_assert(GTK_IS_LABEL(entry->label)); g_assert(entry->parent_object == object); g_assert(INDICATOR_IS_OBJECT(entry->parent_object)); GtkWidget * label = GTK_WIDGET(entry->label); g_assert(g_object_get_qdata(G_OBJECT(label), is_hidden_quark) == NULL); // add the inital entry to our local parent widgetry visible_entry_added (object, entry, box); entry = NULL; list = gtk_container_get_children (GTK_CONTAINER(box)); g_assert(g_list_length(list) == 1); g_list_free(list); // hide the entries and confirm that the label survived indicator_object_set_visible (object, FALSE); while (g_main_context_pending(NULL)) g_main_context_iteration(NULL, TRUE); g_assert(GTK_IS_LABEL(label)); g_assert(g_object_get_qdata(G_OBJECT(label), is_hidden_quark) != NULL); list = gtk_container_get_children (GTK_CONTAINER(box)); g_assert(g_list_length(list) == 1); g_list_free(list); // restore the entries and confirm that the label survived indicator_object_set_visible (object, TRUE); while (g_main_context_pending(NULL)) g_main_context_iteration(NULL, TRUE); g_assert(GTK_IS_LABEL(label)); g_assert(g_object_get_qdata(G_OBJECT(label), is_hidden_quark) == NULL); list = gtk_container_get_children (GTK_CONTAINER(box)); g_assert(g_list_length(list) == 1); g_list_free(list); // cleanup g_object_unref(object); gtk_widget_destroy(box); } /*** **** ***/ void test_loader_filename_dummy_simple_location (void) { IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/libdummy-indicator-simple.so"); g_assert(object != NULL); GList * entries = indicator_object_get_entries(object); g_assert(entries != NULL); g_assert(g_list_length(entries) == 1); IndicatorObjectEntry *entry = entries->data; g_assert(indicator_object_get_location(object, entry) == 0); g_assert(indicator_object_get_location(object, NULL) == 0); g_assert(entry->parent_object == object); g_object_unref(object); return; } void test_loader_filename_dummy_simple_accessors (void) { IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/libdummy-indicator-simple.so"); g_assert(object != NULL); g_assert(indicator_object_get_entries(object) != NULL); g_object_unref(object); return; } void test_loader_filename_dummy_simple (void) { IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/libdummy-indicator-simple.so"); g_assert(object != NULL); gboolean unreffed = FALSE; g_object_weak_ref(G_OBJECT(object), destroy_cb, &unreffed); g_object_unref(object); g_assert(unreffed == TRUE); return; } void test_loader_filename_dummy_blank (void) { IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/libdummy-indicator-blank.so"); g_assert(object == NULL); return; } void test_loader_filename_dummy_null (void) { IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/libdummy-indicator-null.so"); g_assert(object != NULL); g_assert(indicator_object_get_entries(object) == NULL); g_object_unref(G_OBJECT(object)); return; } void test_loader_filename_bad (void) { IndicatorObject * object = indicator_object_new_from_file("/this/file/should/not/exist.so"); g_assert(object == NULL); return; } void destroy_cb (gpointer data, GObject * object) { gboolean * bob = (gboolean *)data; *bob = TRUE; return; } void test_loader_refunref (void) { GObject * object = g_object_new(INDICATOR_OBJECT_TYPE, NULL); gboolean unreffed = FALSE; g_object_weak_ref(object, destroy_cb, &unreffed); g_object_unref(object); g_assert(unreffed == TRUE); return; } void test_loader_creation_deletion_suite (void) { g_test_add_func ("/libindicator/loader/ref_and_unref", test_loader_refunref); g_test_add_func ("/libindicator/loader/filename_bad", test_loader_filename_bad); g_test_add_func ("/libindicator/loader/dummy/null_load", test_loader_filename_dummy_null); g_test_add_func ("/libindicator/loader/dummy/blank_load", test_loader_filename_dummy_null); g_test_add_func ("/libindicator/loader/dummy/simple_load", test_loader_filename_dummy_simple); g_test_add_func ("/libindicator/loader/dummy/simple_accessors", test_loader_filename_dummy_simple_accessors); g_test_add_func ("/libindicator/loader/dummy/simple_location", test_loader_filename_dummy_simple_location); g_test_add_func ("/libindicator/loader/dummy/signaler", test_loader_filename_dummy_signaler); g_test_add_func ("/libindicator/loader/dummy/entry_funcs", test_loader_entry_funcs); g_test_add_func ("/libindicator/loader/dummy/entry_func_window", test_loader_entry_func_window); g_test_add_func ("/libindicator/loader/dummy/visible", test_loader_filename_dummy_visible); return; } int main (int argc, char ** argv) { g_test_init (&argc, &argv, NULL); gtk_init(&argc, &argv); test_loader_creation_deletion_suite(); g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL); return g_test_run(); } libayatana-indicator-0.9.4/tests/test-well-formed.desktop0000644000000000000000000000061714566140211020424 0ustar [Desktop Entry] Name=My Application Exec=ls NotShowIn=Germany Actions=bob;alvin;jim;touch [Desktop Action bob] Name=bob's shortcut Exec=ls bob [Desktop Action alvin] Name=alvin's shortcut Exec=ls alvin OnlyShowIn=France [Desktop Action jim] Name=Jim's shortcut Exec=ls jim NotShowIn=France [Desktop Action touch] Name=Touch Test Exec=touch test-desktop-shortcuts-touch-test OnlyShowIn=TouchTest libayatana-indicator-0.9.4/tools/80indicator-debugging0000644000000000000000000000117314566140211017633 0ustar # These are environment variables that effect the behavior of # libayatana-indicator's service manager and ayatana-indicator # service objects. They turn off various robustness features # that make debugging difficult and are not recommended for # daily use. Development use only! # To use: either copy or symbolicly link this file to the # Xsession dictory. Specifically: /etc/X11/Xsession.d # Timeout after 1 minute export INDICATOR_SERVICE_SHUTDOWN_TIMEOUT=60000 # If no one connects, still stay alive export INDICATOR_ALLOW_NO_WATCHERS=1 # Don't restart the services if they crash export INDICATOR_SERVICE_RESTART_DISABLE=1 libayatana-indicator-0.9.4/tools/CMakeLists.txt0000644000000000000000000000144114566140211016371 0ustar if (FLAVOUR_GTK3 AND ENABLE_IDO) # ayatana-indicator-loader3 add_executable("ayatana-indicator-loader3" indicator-loader.c) target_include_directories("ayatana-indicator-loader3" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS}) target_include_directories("ayatana-indicator-loader3" PUBLIC "${CMAKE_SOURCE_DIR}/src") target_link_libraries("ayatana-indicator-loader3" ${PROJECT_DEPS_LIBRARIES} "-L${CMAKE_BINARY_DIR}/src" -layatana-indicator3) add_dependencies("ayatana-indicator-loader3" "ayatana-indicator3") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-loader3" DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/${PROJECT_NAME}") install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/80indicator-debugging" DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT_NAME}") endif() libayatana-indicator-0.9.4/tools/indicator-loader.c0000644000000000000000000002445314566140211017225 0ustar /* * A small test loader for loading indicators in test suites * and during development of them. * * Copyright 2009 Canonical Ltd. * Copyright 2021 Robert Tari * * Authors: * Ted Gould * Lars Uebernickel * Charles Kerr * Robert Tari * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 3.0 as published by the Free Software Foundation. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License version 3.0 for more details. * * You should have received a copy of the GNU General Public * License along with this library. If not, see * . */ #include #include #include "indicator-object.h" #if GTK_CHECK_VERSION (3,0,0) #include "indicator-ng.h" #endif static GHashTable * entry_to_menu_item = NULL; G_DEFINE_QUARK (indicator_loader, entry_data) static void activate_entry (GtkWidget * widget, gpointer user_data) { gpointer entry; g_return_if_fail (INDICATOR_IS_OBJECT(user_data)); entry = g_object_get_qdata (G_OBJECT(widget), entry_data_quark()); if (entry == NULL) { g_debug("Activation on: (null)"); } else { indicator_object_entry_activate (INDICATOR_OBJECT(user_data), entry, gtk_get_current_event_time()); } } static void scroll_entry (GtkWidget *widget, GdkEventScroll* event, gpointer user_data) { gpointer entry; g_return_if_fail (INDICATOR_IS_OBJECT(user_data)); entry = g_object_get_qdata (G_OBJECT(widget), entry_data_quark()); IndicatorScrollDirection direction = G_MAXINT; switch (event->direction) { case GDK_SCROLL_UP: direction = INDICATOR_OBJECT_SCROLL_UP; break; case GDK_SCROLL_DOWN: direction = INDICATOR_OBJECT_SCROLL_DOWN; break; case GDK_SCROLL_LEFT: direction = INDICATOR_OBJECT_SCROLL_LEFT; break; case GDK_SCROLL_RIGHT: direction = INDICATOR_OBJECT_SCROLL_RIGHT; break; default: break; } if (entry == NULL) { g_debug("Scroll on: (null)"); } else if (direction == G_MAXINT) { g_debug("Scroll direction not supported"); } else { g_signal_emit_by_name(INDICATOR_OBJECT(user_data), INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED, entry, 1, direction); } } static GtkWidget* create_menu_item (IndicatorObjectEntry * entry) { GtkWidget * menu_item; GtkWidget * hbox; gpointer w; menu_item = gtk_menu_item_new(); #if GTK_CHECK_VERSION (3,0,0) hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); #else hbox = gtk_hbox_new (FALSE, 3); #endif if ((w = entry->image)) gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET(w), FALSE, FALSE, 0); if ((w = entry->label)) gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET(w), FALSE, FALSE, 0); gtk_container_add (GTK_CONTAINER(menu_item), hbox); gtk_widget_show (hbox); if ((w = entry->menu)) gtk_menu_item_set_submenu (GTK_MENU_ITEM(menu_item), GTK_WIDGET(w)); return menu_item; } static void entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data) { GtkWidget * menu_item; g_debug ("Signal: Entry Added"); g_warn_if_fail (entry->parent_object != NULL); menu_item = g_hash_table_lookup (entry_to_menu_item, entry); if (menu_item == NULL) { g_debug ("creating a menuitem for new entry %p", entry); menu_item = create_menu_item (entry); g_hash_table_insert (entry_to_menu_item, entry, menu_item); g_object_set_qdata (G_OBJECT(menu_item), entry_data_quark(), entry); g_signal_connect (menu_item, "activate", G_CALLBACK(activate_entry), io); gtk_widget_set_events (menu_item, gtk_widget_get_events (menu_item) | GDK_SCROLL_MASK); g_signal_connect (menu_item, "scroll-event", G_CALLBACK(scroll_entry), io); gtk_menu_shell_append (GTK_MENU_SHELL(user_data), menu_item); } gtk_widget_show (menu_item); } static void entry_removed (__attribute__((unused)) IndicatorObject * io, IndicatorObjectEntry * entry, __attribute__((unused)) gpointer user_data) { GtkWidget * w; g_debug ("Signal: Entry Removed"); if ((w = g_hash_table_lookup (entry_to_menu_item, entry))) gtk_widget_hide (w); } static void menu_show (__attribute__((unused)) IndicatorObject * io, IndicatorObjectEntry * entry, __attribute__((unused)) guint timestamp, __attribute__((unused)) gpointer user_data) { const char * text; if (entry == NULL) text = "(null)"; else if (entry->label == NULL) text = "(no label)"; else text = gtk_label_get_text (entry->label); g_debug ("Show Menu: %s", text); } /*** **** ***/ static IndicatorObject * load_module (const gchar * file_name) { IndicatorObject * io = NULL; if (file_name && g_str_has_suffix (file_name, G_MODULE_SUFFIX)) { io = indicator_object_new_from_file (file_name); if (io == NULL) g_warning ("could not load indicator from '%s'", file_name); } return io; } static IndicatorObject * load_profile (const char * file_name, const char * profile) { IndicatorObject * io = NULL; #if GTK_CHECK_VERSION (3,0,0) GError * error = NULL; io = INDICATOR_OBJECT (indicator_ng_new_for_profile (file_name, profile, &error)); if (error != NULL) { g_warning ("couldn't load profile '%s' from '%s': %s", profile, file_name, error->message); g_error_free (error); } #endif return io; } /*** **** ***/ static void add_indicator_to_menu (GtkMenuShell * menu_shell, IndicatorObject * io) { GList * entries; GList * entry; g_return_if_fail (INDICATOR_IS_OBJECT (io)); /* connect to its signals */ g_signal_connect (io, INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED, G_CALLBACK(entry_added), menu_shell); g_signal_connect (io, INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, G_CALLBACK(entry_removed), menu_shell); g_signal_connect (io, INDICATOR_OBJECT_SIGNAL_MENU_SHOW, G_CALLBACK(menu_show), NULL); /* process the entries */ entries = indicator_object_get_entries(io); for (entry=entries; entry!=NULL; entry=entry->next) entry_added (io, entry->data, menu_shell); g_list_free (entries); } static void add_menu_to_grid (GtkGrid * grid, int top, const char * text_, GtkWidget * menu) { gchar * text; GtkWidget * label; text = g_strdup_printf ("%s:", text_); label = gtk_label_new (text); g_free (text); gtk_grid_attach (GTK_GRID(grid), label, 0, top, 1, 1); gtk_grid_attach (GTK_GRID(grid), menu, 1, top, 1, 1); g_object_set (label, "halign", GTK_ALIGN_START, "hexpand", FALSE, "margin-right", 6, "valign", GTK_ALIGN_CENTER, NULL); g_object_set (menu, "halign", GTK_ALIGN_START, "hexpand", TRUE, NULL); } /*** **** ***/ int main (int argc, char ** argv) { int menu_count = 0; const gchar * file_name; gchar * base_name; GtkWidget * grid; if (argc != 2) { base_name = g_path_get_basename (argv[0]); g_warning ("Use: %s filename", base_name); g_free (base_name); return 0; } /* make sure we don't proxy to ourselves */ g_setenv ("UBUNTU_MENUPROXY", "0", TRUE); gtk_init (&argc, &argv); ido_init (); entry_to_menu_item = g_hash_table_new (g_direct_hash, g_direct_equal); file_name = argv[1]; grid = g_object_new (GTK_TYPE_GRID, "margin", 4, "column-spacing", 6, "row-spacing", 12, NULL); /* if it's an old-style indicator... */ if (g_str_has_suffix (file_name, G_MODULE_SUFFIX)) { IndicatorObject * io = load_module (file_name); GtkWidget * menu = gtk_menu_bar_new (); add_indicator_to_menu (GTK_MENU_SHELL(menu), io); base_name = g_path_get_basename (file_name); add_menu_to_grid (GTK_GRID(grid), menu_count++, base_name, menu); g_free (base_name); } else /* treat it as a GMenu indicator's keyfile */ { GError * error; GKeyFile * key_file; key_file = g_key_file_new (); error = NULL; g_key_file_load_from_file (key_file, file_name, G_KEY_FILE_NONE, &error); if (error != NULL) { g_warning ("loading '%s' failed: %s", file_name, error->message); g_error_free (error); } else { gchar ** groups; int i; groups = g_key_file_get_groups (key_file, NULL); for (i=0; groups && groups[i]; i++) { const gchar * const profile = groups[i]; IndicatorObject * io; if (!g_strcmp0 (profile, "Indicator Service")) continue; if ((io = load_profile (file_name, profile))) { GtkWidget * menu = gtk_menu_bar_new (); add_indicator_to_menu (GTK_MENU_SHELL(menu), io); add_menu_to_grid (GTK_GRID(grid), menu_count++, profile, menu); } } g_strfreev (groups); } g_key_file_free (key_file); } if (menu_count > 0) { GtkWidget * window = gtk_window_new (GTK_WINDOW_TOPLEVEL); base_name = g_path_get_basename (file_name); gtk_window_set_title (GTK_WINDOW(window), base_name); g_free (base_name); g_signal_connect (window, "destroy", G_CALLBACK(gtk_main_quit), NULL); gtk_container_add (GTK_CONTAINER(window), grid); gtk_widget_show_all (window); gtk_main (); } /* cleanup */ g_hash_table_destroy (entry_to_menu_item); return 0; } libayatana-indicator-0.9.4/.travis.yml0000644000000000000000000000165714566140211014613 0ustar # vim: set ts=2 sts=2 sw=2 expandtab : dist: focal language: shell os: linux arch: - amd64 # - ppc64le services: - docker addons: apt: packages: - python3-pip - python3-setuptools before_install: # let's use the MATE project's docker build script... - curl -Ls -o docker-build https://github.com/AyatanaIndicators/ayatana-dev-scripts/raw/main/travis/docker-build - chmod +x docker-build install: - pip3 install PyGithub - ./docker-build --name ${DISTRO} --config .build.yml --install script: - ./docker-build --name ${DISTRO} --verbose --config .build.yml --build scripts env: # temp disable of archlinux builds, see https://gitlab.archlinux.org/archlinux/archlinux-docker/-/issues/56 # - DISTRO="archlinux:latest" - DISTRO="debian:testing" - DISTRO="debian:stable" # - DISTRO="ubuntu:rolling" - DISTRO="ubuntu:focal" jobs: exclude: - env: DISTRO="archlinux:latest" arch: ppc64le