From 95b868ad0623e179205700f28ba9c462ea5943d8 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 15 May 2024 08:21:53 +0200
Subject: .desktop files: Stop in-place adding translations to .desktop files.
 Use non-changed .desktop.in files as input templates instead.

---
 .../autostart/ayatana-webmail-autostart.desktop    |  8 -----
 .../autostart/ayatana-webmail-autostart.desktop.in |  8 +++++
 .../usr/share/applications/ayatana-webmail.desktop | 35 ----------------------
 .../share/applications/ayatana-webmail.desktop.in  | 35 ++++++++++++++++++++++
 setup.py                                           | 15 ++++++----
 5 files changed, 52 insertions(+), 49 deletions(-)
 delete mode 100644 data/etc/xdg/autostart/ayatana-webmail-autostart.desktop
 create mode 100644 data/etc/xdg/autostart/ayatana-webmail-autostart.desktop.in
 delete mode 100644 data/usr/share/applications/ayatana-webmail.desktop
 create mode 100644 data/usr/share/applications/ayatana-webmail.desktop.in

diff --git a/data/etc/xdg/autostart/ayatana-webmail-autostart.desktop b/data/etc/xdg/autostart/ayatana-webmail-autostart.desktop
deleted file mode 100644
index 3538785..0000000
--- a/data/etc/xdg/autostart/ayatana-webmail-autostart.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Ayatana Webmail (service)
-Comment=Display notifications about new mail
-Icon=ayatanawebmail
-Exec=ayatana-webmail
-Type=Application
-Categories=Email;Network;
diff --git a/data/etc/xdg/autostart/ayatana-webmail-autostart.desktop.in b/data/etc/xdg/autostart/ayatana-webmail-autostart.desktop.in
new file mode 100644
index 0000000..3538785
--- /dev/null
+++ b/data/etc/xdg/autostart/ayatana-webmail-autostart.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Name=Ayatana Webmail (service)
+Comment=Display notifications about new mail
+Icon=ayatanawebmail
+Exec=ayatana-webmail
+Type=Application
+Categories=Email;Network;
diff --git a/data/usr/share/applications/ayatana-webmail.desktop b/data/usr/share/applications/ayatana-webmail.desktop
deleted file mode 100644
index aaf0073..0000000
--- a/data/usr/share/applications/ayatana-webmail.desktop
+++ /dev/null
@@ -1,35 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Ayatana Webmail
-Comment=Webmail notifications and actions for any desktop
-Icon=ayatanawebmail
-Exec=ayatana-webmail-url Home
-Type=Application
-Categories=Email;Network;
-Actions=Clear;Compose;Sent;Change;Inbox;
-X-GNOME-UsesNotifications=true
-NoDisplay=true
-
-[Desktop Action Clear]
-Name=Mark all as read
-Exec=ayatana-webmail-clear
-NotShowIn=Messaging Menu;
-
-[Desktop Action Compose]
-Name=Compose Mail
-Exec=ayatana-webmail-url Compose
-NotShowIn=Messaging Menu;
-
-[Desktop Action Sent]
-Name=Sent
-Exec=ayatana-webmail-url Sent
-NotShowIn=Messaging Menu;
-
-[Desktop Action Inbox]
-Name=Inbox
-Exec=ayatana-webmail-url Inbox
-NotShowIn=Messaging Menu;
-
-[Desktop Action Change]
-Name=Settings
-Exec=ayatana-webmail-settings
diff --git a/data/usr/share/applications/ayatana-webmail.desktop.in b/data/usr/share/applications/ayatana-webmail.desktop.in
new file mode 100644
index 0000000..aaf0073
--- /dev/null
+++ b/data/usr/share/applications/ayatana-webmail.desktop.in
@@ -0,0 +1,35 @@
+[Desktop Entry]
+Version=1.0
+Name=Ayatana Webmail
+Comment=Webmail notifications and actions for any desktop
+Icon=ayatanawebmail
+Exec=ayatana-webmail-url Home
+Type=Application
+Categories=Email;Network;
+Actions=Clear;Compose;Sent;Change;Inbox;
+X-GNOME-UsesNotifications=true
+NoDisplay=true
+
+[Desktop Action Clear]
+Name=Mark all as read
+Exec=ayatana-webmail-clear
+NotShowIn=Messaging Menu;
+
+[Desktop Action Compose]
+Name=Compose Mail
+Exec=ayatana-webmail-url Compose
+NotShowIn=Messaging Menu;
+
+[Desktop Action Sent]
+Name=Sent
+Exec=ayatana-webmail-url Sent
+NotShowIn=Messaging Menu;
+
+[Desktop Action Inbox]
+Name=Inbox
+Exec=ayatana-webmail-url Inbox
+NotShowIn=Messaging Menu;
+
+[Desktop Action Change]
+Name=Settings
+Exec=ayatana-webmail-settings
diff --git a/setup.py b/setup.py
index cd723a2..1d70591 100755
--- a/setup.py
+++ b/setup.py
@@ -7,10 +7,11 @@ from ayatanawebmail.appdata import *
 
 for sFile in ['data/etc/xdg/autostart/ayatana-webmail-autostart.desktop', 'data/usr/share/applications/ayatana-webmail.desktop']:
 
-    oFile = open(sFile, 'r+')
+    oInFile = open("{desktop_file}.in".format(desktop_file=sFile), 'r')
     oConfigParser = configparser.ConfigParser()
     oConfigParser.optionxform = str
-    oConfigParser.read_file(oFile)
+    oConfigParser.read_file(oInFile)
+    oInFile.close()
 
     for strRoot, lstDirnames, lstFilenames in os.walk('po'):
 
@@ -40,10 +41,10 @@ for sFile in ['data/etc/xdg/autostart/ayatana-webmail-autostart.desktop', 'data/
 
         oConfigParser[sSection] = dict(sorted(oConfigParser[sSection].items(), key=lambda lParams: lParams[0]))
 
-    oFile.seek(0)
-    oConfigParser.write(oFile, False)
-    oFile.truncate()
-    oFile.close()
+    oOutFile = open("{desktop_file}".format(desktop_file=sFile), 'w')
+    oConfigParser.write(oOutFile, False)
+    oOutFile.truncate()
+    oOutFile.close()
 
 m_lstDataFiles = []
 
@@ -69,6 +70,8 @@ for strRoot, lstDirnames, lstFilenames in os.walk('data'):
 
     for strFilename in lstFilenames:
 
+        if strFilename.endswith(".in"):
+            continue
         strPath = os.path.join(strRoot, strFilename)
         m_lstDataFiles.append((os.path.dirname(strPath).lstrip('data'), [strPath]))
 
-- 
cgit v1.2.3