Philipp Hörist pushed to branch master at gajim / gajim
Commits:
7bd89174 by André Apitzsch at 2017-10-05T19:11:18+02:00
AppData: update information
- - - - -
d8ef967e by Philipp Hörist at 2017-10-07T17:38:11+02:00
Merge branch 'appdata' into 'master'
AppData: update information
See merge request !139
- - - - -
1 changed file:
- data/org.gajim.Gajim.appdata.xml.in
Changes:
=====================================
data/org.gajim.Gajim.appdata.xml.in
=====================================
--- a/data/org.gajim.Gajim.appdata.xml.in
+++ b/data/org.gajim.Gajim.appdata.xml.in
@@ -8,10 +8,9 @@
<project_license>GPL-3.0</project_license>
<name>Gajim</name>
<summary>A GTK+ Jabber client</summary>
-
<description>
- <p>Gajim is a chat client to be used with Jabber.org, Google Talk, Hangouts,
- Live Journal Talk, Nimbuzz, Ovi, Talkonaut, and thousands of other services
+ <p>Gajim is a chat client to be used with Jabber.org, Live Journal Talk,
+ Nimbuzz, Ovi, Talkonaut, and thousands of other services
run by companies and ISPs, and volunteers around the world.
</p>
<p>If you have a few accounts on different servers, if you want to be in
@@ -19,31 +18,29 @@
</p>
<p>Features:</p>
<ul>
- <li>Tabbed chat window and single window modes</li>
- <li>Group chat support (with Multi-User Chat protocol), invitation, chat to group chat transformation, minimize group chat to roster</li>
- <li>Emoticons, avatars, PEP (user activity, mood and tune)</li>
- <li>Audio / video conferences</li>
- <li>File transfer, room bookmarks</li>
- <li>Metacontacts support</li>
- <li>Trayicon, speller, extended chat history functionalities</li>
- <li>TLS, GPG and End-To-End encryption support (with SSL legacy support)</li>
- <li>Transport registration support</li>
- <li>Service discovery including nodes, user search</li>
- <li>Wikipedia, dictionary and search engine lookup</li>
- <li>Multiple accounts support</li>
- <li>XML console</li>
- <li>Link local (bonjour / zeroconf), BOSH</li>
- <li>Other features via plugins </li>
+ <li>Tabbed chat window and single window modes</li>
+ <li>Group chat support (with Multi-User Chat protocol), invitation, chat to group chat transformation</li>
+ <li>Emoticons, avatars, PEP (user activity, mood and tune)</li>
+ <li>Audio / video conferences</li>
+ <li>File transfer, room bookmarks</li>
+ <li>Metacontacts support</li>
+ <li>Trayicon, speller, extended chat history functionalities</li>
+ <li>TLS, GPG and End-To-End encryption support</li>
+ <li>Transport registration support</li>
+ <li>Service discovery including nodes, user search</li>
+ <li>Wikipedia, dictionary and search engine lookup</li>
+ <li>Multiple accounts support</li>
+ <li>XML console interface</li>
+ <li>Link local (bonjour / zeroconf), BOSH</li>
+ <li>Other features via plugins </li>
</ul>
</description>
-
<categories>
<category>GNOME</category>
<category>GTK</category>
<category>InstantMessaging</category>
<category>Network</category>
</categories>
-
<screenshots>
<screenshot type="default">
<image>https://gajim.org/imgs/gajim_roster.png</image>
@@ -62,20 +59,17 @@
<caption>Chat history</caption>
</screenshot>
<screenshot>
- <image>https://gajim.org/imgs/gajim_jingle.png</image>
- <caption>Jingle video conference</caption>
- </screenshot>
- <screenshot>
<image>https://gajim.org/imgs/gajim_plugins.png</image>
<caption>Plugin manager</caption>
</screenshot>
</screenshots>
<developer_name>Gajim Team</developer_name>
<update_contact>gajim-devel_AT_gajim.org</update_contact>
-
<url type="homepage">https://gajim.org/</url>
<url type="bugtracker">https://dev.gajim.org/gajim/gajim</url>
<url type="faq">https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq</url>
<url type="help">https://dev.gajim.org/gajim/gajim/wikis/help/home</url>
+ <url type="donation">https://gajim.org/dev.php#donate</url>
<url type="translate">https://dev.gajim.org/gajim/gajim/wikis/development/DevTranslate</url>
+ <translation type="gettext">gajim</translation>
</component>
View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/372c1f9941e5fcd8d99ffc3d46bf225db…
---
View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/372c1f9941e5fcd8d99ffc3d46bf225db…
You're receiving this email because of your account on dev.gajim.org.
Philipp Hörist pushed to branch master at gajim / gajim
Commits:
6f2fbde6 by Philipp Hörist at 2017-10-07T11:10:53+02:00
Highlight on mention of own real JID in Groupchat
Fixes #8752
- - - - -
2a2d4477 by Philipp Hörist at 2017-10-07T11:15:10+02:00
Fix broken highlight sound in Groupchat
tim is epoch, time.localtime() a struct_time
- - - - -
1 changed file:
- gajim/groupchat_control.py
Changes:
=====================================
gajim/groupchat_control.py
=====================================
--- a/gajim/groupchat_control.py
+++ b/gajim/groupchat_control.py
@@ -1290,7 +1290,7 @@ class GroupchatControl(ChatControlBase):
sound = 'received'
# Is it a history message? Don't want sound-floods when we join.
- if tim != time.localtime():
+ if tim != time.mktime(time.localtime()):
sound = None
return (highlight, sound)
@@ -1320,6 +1320,8 @@ class GroupchatControl(ChatControlBase):
"""
special_words = app.config.get('muc_highlight_words').split(';')
special_words.append(self.nick)
+ con = app.connections[self.account]
+ special_words.append(con.get_own_jid().getStripped())
# Strip empties: ''.split(';') == [''] and would highlight everything.
# Also lowercase everything for case insensitive compare.
special_words = [word.lower() for word in special_words if word]
View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4e1d296dcfff5836b32132dfb11721cef…
---
View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4e1d296dcfff5836b32132dfb11721cef…
You're receiving this email because of your account on dev.gajim.org.