copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'remove-gajim-remote-desktop' into 'master' 

Remove gajim-remote.desktop and fix gajim.desktop

See merge request gajim/gajim!169
This commit is contained in:
Yann Leboulanger 2017-12-15 08:29:37 +01:00
parent 4009625e02 1959b486e6
commit d858ff5171
3 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/gajim-remote.desktop.in
View File

@ -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

2
data/org.gajim.Gajim.desktop.in
View File

@ -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! # 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; Keywords=chat;messaging;im;xmpp;bonjour;voip;
Version=1.0 Version=1.0
Exec=gajim Exec=gajim %u
# Translators: Do NOT translate or transliterate this text (this is an icon file name)! # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
Icon=org.gajim.Gajim Icon=org.gajim.Gajim
StartupNotify=true StartupNotify=true

2
setup.py
View File

@ -29,7 +29,6 @@ def update_trans():
template = os.path.join('po', 'gajim.pot') 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( 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'))] 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.desktop.in"))
files.append(os.path.join("data", "org.gajim.Gajim.appdata.xml.in")) files.append(os.path.join("data", "org.gajim.Gajim.appdata.xml.in"))
cmd = 'xgettext --from-code=utf-8 -o %s %s' % ( cmd = 'xgettext --from-code=utf-8 -o %s %s' % (
@ -116,7 +115,6 @@ def build_intl(build_cmd):
base = build_dir base = build_dir
merge_files = (('data/org.gajim.Gajim.desktop', 'share/applications', '--desktop'), 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')) ('data/org.gajim.Gajim.appdata.xml', 'share/metainfo', '--xml'))
for filename, target, option in merge_files: for filename, target, option in merge_files: