aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Tari <robert@tari.in>2022-02-27 02:07:05 +0100
committerRobert Tari <robert@tari.in>2022-02-27 02:21:25 +0100
commit79081b2dafcfe2f48c2035e526000b4ba8f54f8a (patch)
tree4816c867d234ee43c8e003bdd5fea503bad9e2ef
parent7ac869d232c7bc4ae058db8aa1c82a5a97051416 (diff)
downloadayatana-webmail-79081b2dafcfe2f48c2035e526000b4ba8f54f8a.tar.gz
ayatana-webmail-79081b2dafcfe2f48c2035e526000b4ba8f54f8a.tar.bz2
ayatana-webmail-79081b2dafcfe2f48c2035e526000b4ba8f54f8a.zip
Hardcode server list
-rwxr-xr-xayatanawebmail/dialog.py5
-rwxr-xr-xdata/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml5
2 files changed, 2 insertions, 8 deletions
diff --git a/ayatanawebmail/dialog.py b/ayatanawebmail/dialog.py
index 88ee177..3df1adf 100755
--- a/ayatanawebmail/dialog.py
+++ b/ayatanawebmail/dialog.py
@@ -14,6 +14,7 @@ from ayatanawebmail.appdata import APPVERSION, APPURL, APPDESCRIPTION, APPAUTHOR
import webbrowser
MESSAGEACTION = {'OPEN': 1, 'MARK': 2, 'ASK': 3}
+SERVERS = [_('Custom') + '\timap.example.com\t993\thttps://mail.example.com\thttps://mail.example.com/compose\thttps://mail.example.com/sent\thttps://mail.example.com/inbox\t/$MSG_UID', 'Google\timap.gmail.com\t993\thttps://mail.google.com/mail/\thttps://mail.google.com/mail/#compose\thttps://mail.google.com/mail/#sent\thttps://mail.google.com/mail/#inbox\t/$MSG_THREAD', 'RoundCube\tmail.example.com\t993\thttps://mail.example.com/?_task=mail&amp;_mbox=INBOX\thttps://mail.example.com/?_task=mail&amp;_action=compose\thttps://mail.example.com/?_task=mail&amp;_mbox=Sent\thttps://mail.example.com/?_task=mail&amp;_mbox=INBOX\t&amp;_uid=$MSG_UID']
def utf7dec(lstInput):
@@ -224,15 +225,13 @@ class PreferencesDialog(Gtk.Dialog):
self.nMessageAction = g_oSettings.get_enum('message-action')
self.lServers = []
- for sServer in g_oSettings.get_strv('servers'):
+ for sServer in SERVERS:
lValues = sServer.split('\t')
lValues.append('\t'.join(lValues[1:]))
dServer = dict(zip(['name', 'host', 'port', 'home', 'compose', 'sent', 'inbox', 'message', 'raw'], lValues))
self.lServers.append(dServer)
- self.lServers[0]['name'] = _('Custom')
-
def pageAccounts(self):
self.sb = Gtk.SpinButton.new_with_range(1, 1, 1)
diff --git a/data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml b/data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml
index 4cc5dd9..e78a8b2 100755
--- a/data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml
+++ b/data/usr/share/glib-2.0/schemas/org.ayatana.webmail.gschema.xml
@@ -46,10 +46,5 @@
<summary>Message action</summary>
<description>Action to perform when a message is activated.</description>
</key>
- <key type="as" name="servers">
- <default>['Custom\timap.example.com\t993\thttps://mail.example.com\thttps://mail.example.com/compose\thttps://mail.example.com/sent\thttps://mail.example.com/inbox\t/$MSG_UID', 'Google\timap.gmail.com\t993\thttps://mail.google.com/mail/\thttps://mail.google.com/mail/#compose\thttps://mail.google.com/mail/#sent\thttps://mail.google.com/mail/#inbox\t/$MSG_THREAD', 'RoundCube\tmail.example.com\t993\thttps://mail.example.com/?_task=mail&amp;_mbox=INBOX\thttps://mail.example.com/?_task=mail&amp;_action=compose\thttps://mail.example.com/?_task=mail&amp;_mbox=Sent\thttps://mail.example.com/?_task=mail&amp;_mbox=INBOX\t&amp;_uid=$MSG_UID']</default>
- <summary>Webmail server templates</summary>
- <description>Stores the list of predefined settings for certain webmail servers.</description>
- </key>
</schema>
</schemalist>