From 6bc2b280c349851a05f28ca4b06fe5d51c59bea0 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 2 Dec 2017 19:18:59 +0100 Subject: Convert to Ayatana Indicators. --- autogen.sh | 8 +- configure.ac | 17 +- data/Makefile.am | 2 +- data/icons/Makefile.am | 8 +- ...atana-indicator-notification-close-deselect.svg | 79 ++++++++ ...ayatana-indicator-notification-close-select.svg | 61 ++++++ data/icons/ayatana-indicator-notification-read.svg | 133 ++++++++++++ .../ayatana-indicator-notification-unread.svg | 224 +++++++++++++++++++++ .../indicator-notification-close-deselect.svg | 79 -------- data/icons/indicator-notification-close-select.svg | 61 ------ data/icons/indicator-notification-read.svg | 133 ------------ data/icons/indicator-notification-unread.svg | 224 --------------------- ...chpad.indicator.notifications.gschema.xml.in.in | 25 --- ...atana.indicator.notifications.gschema.xml.in.in | 25 +++ po/POTFILES.in | 2 +- po/POTFILES.skip | 2 +- po/indicator-notifications.pot | 34 ---- src/Makefile.am | 2 +- src/indicator-notifications.c | 6 +- tools/indicator-install.sh | 5 - tools/indicator-restart.sh | 3 - tools/indicator-uninstall.sh | 3 - tools/localgen.sh | 5 - 23 files changed, 540 insertions(+), 601 deletions(-) create mode 100644 data/icons/ayatana-indicator-notification-close-deselect.svg create mode 100644 data/icons/ayatana-indicator-notification-close-select.svg create mode 100644 data/icons/ayatana-indicator-notification-read.svg create mode 100644 data/icons/ayatana-indicator-notification-unread.svg delete mode 100644 data/icons/indicator-notification-close-deselect.svg delete mode 100644 data/icons/indicator-notification-close-select.svg delete mode 100644 data/icons/indicator-notification-read.svg delete mode 100644 data/icons/indicator-notification-unread.svg delete mode 100644 data/net.launchpad.indicator.notifications.gschema.xml.in.in create mode 100644 data/org.ayatana.indicator.notifications.gschema.xml.in.in delete mode 100644 po/indicator-notifications.pot delete mode 100755 tools/indicator-install.sh delete mode 100755 tools/indicator-restart.sh delete mode 100755 tools/indicator-uninstall.sh delete mode 100755 tools/localgen.sh diff --git a/autogen.sh b/autogen.sh index 331674a..8004621 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,11 +1,11 @@ #!/bin/sh -PKG_NAME="indicator-notifications" +PKG_NAME="ayatana-indicator-notifications" -which gnome-autogen.sh || { - echo "You need gnome-common from GNOME Git" +which mate-autogen || { + echo "You need mate-common from https://git.mate-desktop.org" exit 1 } USE_GNOME2_MACROS=1 \ -. gnome-autogen.sh $@ +. mate-autogen $@ diff --git a/configure.ac b/configure.ac index 3ec1f55..fc2e4fa 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([indicator-notifications], [0.3.3], [jason.conti@gmail.com]) +AC_INIT([ayatana-indicator-notifications], [0.4.0], [jason.conti@gmail.com]) AM_INIT_AUTOMAKE([-Wall -Werror]) @@ -30,7 +30,7 @@ GLIB_GSETTINGS INDICATOR_REQUIRED_VERSION=0.3.19 GTK3_REQUIRED_VERSION=3.0 -INDICATOR3_PKG_NAME=indicator3-0.4 +INDICATOR3_PKG_NAME=ayatana-indicator3-0.4 PKG_CHECK_MODULES(INDICATOR, $INDICATOR3_PKG_NAME >= $INDICATOR_REQUIRED_VERSION gtk+-3.0 >= GTK3_REQUIRED_VERSION) @@ -40,18 +40,7 @@ AC_SUBST(INDICATOR_LIBS) # Library directories from pkg-config -with_localinstall="no" -AC_ARG_ENABLE([localinstall], - [AS_HELP_STRING([--enable-localinstall], - [set default library directories instead of asking pkg-config (default is no)])], - [with_localinstall="yes"], - [with_localinstall="no"]) - -if test "x$with_localinstall" = "xyes"; then - INDICATORDIR="${libdir}/indicators/2/" -else - INDICATORDIR=`$PKG_CONFIG --variable=indicatordir $INDICATOR3_PKG_NAME` -fi +INDICATORDIR=`$PKG_CONFIG --variable=indicatordir $INDICATOR3_PKG_NAME` INDICATORICONSDIR="${datadir}/pixmaps/" AC_SUBST(INDICATORDIR) diff --git a/data/Makefile.am b/data/Makefile.am index 7299c5b..1960ad7 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = icons -gsettings_file = net.launchpad.indicator.notifications.gschema.xml +gsettings_file = org.ayatana.indicator.notifications.gschema.xml gsettings_SCHEMAS = $(gsettings_file) @INTLTOOL_XML_NOMERGE_RULE@ diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index 2543305..13251ac 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -1,9 +1,9 @@ iconsdir = $(INDICATORICONSDIR) icons_DATA = \ - indicator-notification-close-select.svg \ - indicator-notification-close-deselect.svg \ - indicator-notification-read.svg \ - indicator-notification-unread.svg + ayatana-indicator-notification-close-select.svg \ + ayatana-indicator-notification-close-deselect.svg \ + ayatana-indicator-notification-read.svg \ + ayatana-indicator-notification-unread.svg EXTRA_DIST = $(icons_DATA) diff --git a/data/icons/ayatana-indicator-notification-close-deselect.svg b/data/icons/ayatana-indicator-notification-close-deselect.svg new file mode 100644 index 0000000..3e92220 --- /dev/null +++ b/data/icons/ayatana-indicator-notification-close-deselect.svg @@ -0,0 +1,79 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/data/icons/ayatana-indicator-notification-close-select.svg b/data/icons/ayatana-indicator-notification-close-select.svg new file mode 100644 index 0000000..21f5026 --- /dev/null +++ b/data/icons/ayatana-indicator-notification-close-select.svg @@ -0,0 +1,61 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/data/icons/ayatana-indicator-notification-read.svg b/data/icons/ayatana-indicator-notification-read.svg new file mode 100644 index 0000000..97e1f1e --- /dev/null +++ b/data/icons/ayatana-indicator-notification-read.svg @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/data/icons/ayatana-indicator-notification-unread.svg b/data/icons/ayatana-indicator-notification-unread.svg new file mode 100644 index 0000000..beb2292 --- /dev/null +++ b/data/icons/ayatana-indicator-notification-unread.svg @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/data/icons/indicator-notification-close-deselect.svg b/data/icons/indicator-notification-close-deselect.svg deleted file mode 100644 index 3e92220..0000000 --- a/data/icons/indicator-notification-close-deselect.svg +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/data/icons/indicator-notification-close-select.svg b/data/icons/indicator-notification-close-select.svg deleted file mode 100644 index 21f5026..0000000 --- a/data/icons/indicator-notification-close-select.svg +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/data/icons/indicator-notification-read.svg b/data/icons/indicator-notification-read.svg deleted file mode 100644 index 97e1f1e..0000000 --- a/data/icons/indicator-notification-read.svg +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/data/icons/indicator-notification-unread.svg b/data/icons/indicator-notification-unread.svg deleted file mode 100644 index beb2292..0000000 --- a/data/icons/indicator-notification-unread.svg +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/data/net.launchpad.indicator.notifications.gschema.xml.in.in b/data/net.launchpad.indicator.notifications.gschema.xml.in.in deleted file mode 100644 index a4c6dde..0000000 --- a/data/net.launchpad.indicator.notifications.gschema.xml.in.in +++ /dev/null @@ -1,25 +0,0 @@ - - - - [] - <_summary>Discard notifications by application name - <_description>If an application name is in the blacklist, all notifications matching the application name will be discarded. - - - false - <_summary>Clear notifications on middle click - <_description>Normally when middle clicking the notification icon, the unread status will be toggled if the queue is not empty. With this option enabled, the notification queue will be cleared instead. - - - false - <_summary>Hide the indicator - <_description>If true, the indicator is hidden. - - - - 5 - <_summary>Maximum number of visible items - <_description>The indicator will only display at most the number of notifications indicated by this value. - - - diff --git a/data/org.ayatana.indicator.notifications.gschema.xml.in.in b/data/org.ayatana.indicator.notifications.gschema.xml.in.in new file mode 100644 index 0000000..a4c6dde --- /dev/null +++ b/data/org.ayatana.indicator.notifications.gschema.xml.in.in @@ -0,0 +1,25 @@ + + + + [] + <_summary>Discard notifications by application name + <_description>If an application name is in the blacklist, all notifications matching the application name will be discarded. + + + false + <_summary>Clear notifications on middle click + <_description>Normally when middle clicking the notification icon, the unread status will be toggled if the queue is not empty. With this option enabled, the notification queue will be cleared instead. + + + false + <_summary>Hide the indicator + <_description>If true, the indicator is hidden. + + + + 5 + <_summary>Maximum number of visible items + <_description>The indicator will only display at most the number of notifications indicated by this value. + + + diff --git a/po/POTFILES.in b/po/POTFILES.in index 733d6d5..0a6999a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,4 +1,4 @@ -data/net.launchpad.indicator.notifications.gschema.xml.in.in +data/org.ayatana.indicator.notifications.gschema.xml.in.in src/dbus-spy.c src/indicator-notifications.c src/notification.c diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 62744c2..81805f2 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -1 +1 @@ -data/net.launchpad.indicator.notifications.gschema.xml.in +data/org.ayatana.indicator.notifications.gschema.xml.in diff --git a/po/indicator-notifications.pot b/po/indicator-notifications.pot deleted file mode 100644 index bb3fbea..0000000 --- a/po/indicator-notifications.pot +++ /dev/null @@ -1,34 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-26 15:13-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" - -#: ../src/indicator-notifications.c:160 -msgid "Notifications" -msgstr "" - -#: ../src/indicator-notifications.c:451 -#, c-format -msgid "Clear (%d Notification)" -msgid_plural "Clear (%d Notifications)" -msgstr[0] "" -msgstr[1] "" - -#: ../src/notification-menuitem.c:96 -msgid "from" -msgstr "" diff --git a/src/Makefile.am b/src/Makefile.am index 9425475..632119e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,7 +13,7 @@ libnotifications_la_SOURCES = \ libnotifications_la_CFLAGS = \ $(INDICATOR_CFLAGS) \ -Wall \ - -DG_LOG_DOMAIN=\"Indicator-Notifications\" + -DG_LOG_DOMAIN=\"Ayatana-Indicator-Notifications\" libnotifications_la_LIBADD = \ $(INDICATOR_LIBS) libnotifications_la_LDFLAGS = \ diff --git a/src/indicator-notifications.c b/src/indicator-notifications.c index 41164c9..34cb3b5 100644 --- a/src/indicator-notifications.c +++ b/src/indicator-notifications.c @@ -32,9 +32,9 @@ with this program. If not, see . #include /* Indicator Stuff */ -#include -#include -#include +#include +#include +#include #include "dbus-spy.h" #include "notification-menuitem.h" diff --git a/tools/indicator-install.sh b/tools/indicator-install.sh deleted file mode 100755 index 1a6ccc3..0000000 --- a/tools/indicator-install.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -PREFIX_NAME="$HOME/Projects/indicators/notifications/build" - -cp -v "$PREFIX_NAME/indicators/2/libnotifications.so" "$(pkg-config --variable=indicatordir indicator3-0.4)" diff --git a/tools/indicator-restart.sh b/tools/indicator-restart.sh deleted file mode 100755 index b49abee..0000000 --- a/tools/indicator-restart.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -killall gnome-panel diff --git a/tools/indicator-uninstall.sh b/tools/indicator-uninstall.sh deleted file mode 100755 index 4ef81e1..0000000 --- a/tools/indicator-uninstall.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -rm -v "$(pkg-config --variable=indicatordir indicator3-0.4)/libnotifications.so" diff --git a/tools/localgen.sh b/tools/localgen.sh deleted file mode 100755 index 8e28d38..0000000 --- a/tools/localgen.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -PREFIX_NAME="$HOME/Projects/indicators/notifications/build" - -./autogen.sh --prefix="$PREFIX_NAME" --libdir="$PREFIX_NAME" --enable-localinstall -- cgit v1.2.3