Yann Leboulanger pushed to branch master at gajim / gajim
Commits:
d8bba454 by Emmanuel Gil Peyrot at 2017-12-15T02:34:45+01:00
Fix Gajim’s .desktop file to pass the URI to the program.
- - - - -
1959b486 by Emmanuel Gil Peyrot at 2017-12-15T02:34:45+01:00
Remove gajim-remote.desktop, its URI handling is now done in Gajim itself.
- - - - -
d858ff51 by Yann Leboulanger at 2017-12-15T08:29:37+01:00
Merge branch 'remove-gajim-remote-desktop' into 'master'
Remove gajim-remote.desktop and fix gajim.desktop
See merge request gajim/gajim!169
- - - - -
3 changed files:
- − data/gajim-remote.desktop.in
- data/org.gajim.Gajim.desktop.in
- setup.py
Changes:
=====================================
data/gajim-remote.desktop.in deleted
=====================================
--- a/data/gajim-remote.desktop.in
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Categories=Network;InstantMessaging;RemoteAccess;ConsoleOnly;
-Name=Open URI using Gajim
-# Translators: Search terms to find this application. Do NOT translate or
localize the semicolons! The list MUST also end with a semicolon!
-Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip;
-Version=1.0
-Exec=gajim-remote handle_uri %u
-TryExec=gajim-remote
-StartupNotify=false
-Terminal=false
-Type=Application
-NoDisplay=true
=====================================
data/org.gajim.Gajim.desktop.in
=====================================
--- a/data/org.gajim.Gajim.desktop.in
+++ b/data/org.gajim.Gajim.desktop.in
@@ -6,7 +6,7 @@ Comment=A GTK+ Jabber client
# Translators: Search terms to find this application. Do NOT translate or
localize the semicolons! The list MUST also end with a semicolon!
Keywords=chat;messaging;im;xmpp;bonjour;voip;
Version=1.0
-Exec=gajim
+Exec=gajim %u
# Translators: Do NOT translate or transliterate this text (this is an icon
file name)!
Icon=org.gajim.Gajim
StartupNotify=true
=====================================
setup.py
=====================================
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,6 @@ def update_trans():
template = os.path.join('po', 'gajim.pot')
files = [os.path.join(root, f) for root, d, files in os.walk('gajim') for
f in files if os.path.isfile(
os.path.join(root, f)) and (f.endswith('.py') or f.endswith('.ui'))]
- files.append(os.path.join("data", "gajim-remote.desktop.in"))
files.append(os.path.join("data", "org.gajim.Gajim.desktop.in"))
files.append(os.path.join("data", "org.gajim.Gajim.appdata.xml.in"))
cmd = 'xgettext --from-code=utf-8 -o %s %s' % (
@@ -116,7 +115,6 @@ def build_intl(build_cmd):
base = build_dir
merge_files = (('data/org.gajim.Gajim.desktop', 'share/applications',
'--desktop'),
- ('data/gajim-remote.desktop', 'share/applications',
'--desktop'),
('data/org.gajim.Gajim.appdata.xml', 'share/metainfo',
'--xml'))
for filename, target, option in merge_files:
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/4009625e02c08e1adfb66557648a2cbf7fa34e49...d858ff5171724af4bae68e725d6b293b63e8ec0e
---
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/4009625e02c08e1adfb66557648a2cbf7fa34e49...d858ff5171724af4bae68e725d6b293b63e8ec0e
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
