Merge branch 'pr/do-not-overwrite-message-indicator-icons'

Attributes GH PR #19: https://github.com/AyatanaIndicators/ayatana-webmail/pull/19

4 files changed, 2 insertions, 29 deletions

diff --git a/ayatanawebmail/application.py b/ayatanawebmail/application.py
index 72e4043..8bb76ea 100755
--- a/ayatanawebmail/application.py
+++ b/ayatanawebmail/application.py
@@ -187,8 +187,8 @@ class MessagingMenu(object):
                 gi.require_version('AppIndicator3', '0.1')
                 self.oAppIndicator = importlib.import_module('gi.repository.AppIndicator3')
 
-        self.oIndicator = self.oAppIndicator.Indicator.new(APPNAME, 'indicator-messages', self.oAppIndicator.IndicatorCategory.APPLICATION_STATUS)
-        self.oIndicator.set_attention_icon('indicator-messages-new')
+        self.oIndicator = self.oAppIndicator.Indicator.new(APPNAME, 'ayatanawebmail-messages', self.oAppIndicator.IndicatorCategory.APPLICATION_STATUS)
+        self.oIndicator.set_attention_icon('ayatanawebmail-messages-new')
         self.oIndicator.set_status(self.oAppIndicator.IndicatorStatus.ACTIVE)
         self.oMenu = Gtk.Menu()
         self.oMenu.append(Gtk.SeparatorMenuItem())
diff --git a/data/usr/share/ayatanawebmail/indicator-messages-new.svg b/data/usr/share/icons/hicolor/scalable/status/ayatanawebmail-messages-new.svg
index a4e411e..a4e411e 100755
--- a/data/usr/share/ayatanawebmail/indicator-messages-new.svg
+++ b/data/usr/share/icons/hicolor/scalable/status/ayatanawebmail-messages-new.svg
diff --git a/data/usr/share/ayatanawebmail/indicator-messages.svg b/data/usr/share/icons/hicolor/scalable/status/ayatanawebmail-messages.svg
index af6d8e0..af6d8e0 100755
--- a/data/usr/share/ayatanawebmail/indicator-messages.svg
+++ b/data/usr/share/icons/hicolor/scalable/status/ayatanawebmail-messages.svg
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100755
index aa69ce5..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-set -e
-
-case "$1" in
-
-    configure)
-
-        cp -n /usr/share/ayatanawebmail/indicator-messages-new.svg /usr/share/icons/hicolor/scalable/status/indicator-messages-new.svg
-        cp -n /usr/share/ayatanawebmail/indicator-messages.svg /usr/share/icons/hicolor/scalable/status/indicator-messages.svg
-
-        update-icon-caches /usr/share/icons/hicolor
-        glib-compile-schemas /usr/share/glib-2.0/schemas
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0