Commits January 2016

commits@gajim.org

1 participants
71 discussions

gajim: fix some sessions errors. Fixes #8221, #7772, #7723
by Gajim 18 Jan '16

18 Jan '16

changeset 5032f1231f0a in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=5032f1231f0a description: fix some sessions errors. Fixes #8221, #7772, #7723 diffstat: src/message_control.py | 2 +- src/session.py | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diffs (47 lines): diff -r 4bf87c76deac -r 5032f1231f0a src/message_control.py --- a/src/message_control.py Sat Jan 16 16:05:43 2016 +0100 +++ b/src/message_control.py Sun Jan 17 20:54:20 2016 +0100 @@ -200,7 +200,7 @@ if session: session.control = self - if oldsession: + if session and oldsession: oldsession.control = None crypto_changed = bool(session and isinstance(session, diff -r 4bf87c76deac -r 5032f1231f0a src/session.py --- a/src/session.py Sat Jan 16 16:05:43 2016 +0100 +++ b/src/session.py Sun Jan 17 20:54:20 2016 +0100 @@ -67,10 +67,17 @@ return contact = gajim.contacts.get_contact(self.conn.name, obj.jid, obj.resource) + if not contact: + contact = gajim.contacts.get_gc_contact(self.conn.name, obj.jid, + obj.resource) if self.resource != obj.resource: self.resource = obj.resource if self.control: - self.control.contact = contact + if isinstance(contact, contacts.GC_Contact): + self.control.gc_contact = contact + self.control.contact = contact.as_contact() + else: + self.control.contact = contact if self.control.resource: self.control.change_resource(self.resource) @@ -162,7 +169,11 @@ if ctrl: self.control = ctrl self.control.set_session(self) - self.control.contact = contact + if isinstance(contact, contacts.GC_Contact): + self.control.gc_contact = contact + self.control.contact = contact.as_contact() + else: + self.control.contact = contact if not pm: self.roster_message2(obj)

1 0

gajim: fix some sessions errors. Fixes #8221, #7772, #7723
by Gajim 17 Jan '16

17 Jan '16

changeset a43f0fa77a26 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=a43f0fa77a26 description: fix some sessions errors. Fixes #8221, #7772, #7723 diffstat: src/message_control.py | 2 +- src/session.py | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diffs (47 lines): diff -r e2151334153b -r a43f0fa77a26 src/message_control.py --- a/src/message_control.py Mon Dec 28 14:21:41 2015 +0100 +++ b/src/message_control.py Sun Jan 17 20:54:20 2016 +0100 @@ -200,7 +200,7 @@ if session: session.control = self - if oldsession: + if session and oldsession: oldsession.control = None crypto_changed = bool(session and isinstance(session, diff -r e2151334153b -r a43f0fa77a26 src/session.py --- a/src/session.py Mon Dec 28 14:21:41 2015 +0100 +++ b/src/session.py Sun Jan 17 20:54:20 2016 +0100 @@ -67,10 +67,17 @@ return contact = gajim.contacts.get_contact(self.conn.name, obj.jid, obj.resource) + if not contact: + contact = gajim.contacts.get_gc_contact(self.conn.name, obj.jid, + obj.resource) if self.resource != obj.resource: self.resource = obj.resource if self.control: - self.control.contact = contact + if isinstance(contact, contacts.GC_Contact): + self.control.gc_contact = contact + self.control.contact = contact.as_contact() + else: + self.control.contact = contact if self.control.resource: self.control.change_resource(self.resource) @@ -162,7 +169,11 @@ if ctrl: self.control = ctrl self.control.set_session(self) - self.control.contact = contact + if isinstance(contact, contacts.GC_Contact): + self.control.gc_contact = contact + self.control.contact = contact.as_contact() + else: + self.control.contact = contact if not pm: self.roster_message2(obj)

1 0

gajim: [Allan Nordhøy] improve some strings
by Gajim 16 Jan '16

16 Jan '16

changeset 4bf87c76deac in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=4bf87c76deac description: [Allan Nordhøy] improve some strings diffstat: data/gui/add_new_contact_window.ui | 2 +- data/gui/chat_to_muc_window.ui | 2 +- data/gui/manage_bookmarks_window.ui | 2 +- data/gui/plugins_window.ui | 1 - data/gui/preferences_window.ui | 4 ++-- src/common/config.py | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diffs (80 lines): diff -r c7a4d0865794 -r 4bf87c76deac data/gui/add_new_contact_window.ui --- a/data/gui/add_new_contact_window.ui Sat Jan 16 15:31:00 2016 +0100 +++ b/data/gui/add_new_contact_window.ui Sat Jan 16 16:05:43 2016 +0100 @@ -322,7 +322,7 @@ <property name="xalign">0</property> <property name="label" translatable="yes">You have to register with this transport to be able to add a contact from this -protocol. Click on register button to +protocol. Click on Register button to proceed.</property> <property name="wrap">True</property> </object> diff -r c7a4d0865794 -r 4bf87c76deac data/gui/chat_to_muc_window.ui --- a/data/gui/chat_to_muc_window.ui Sat Jan 16 15:31:00 2016 +0100 +++ b/data/gui/chat_to_muc_window.ui Sat Jan 16 16:05:43 2016 +0100 @@ -26,7 +26,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">You are going to begin a Multi-User Chat. + <property name="label" translatable="yes">You are now entering a groupchat. Select the contacts you want to invite</property> <property name="justify">center</property> </object> diff -r c7a4d0865794 -r 4bf87c76deac data/gui/manage_bookmarks_window.ui --- a/data/gui/manage_bookmarks_window.ui Sat Jan 16 15:31:00 2016 +0100 +++ b/data/gui/manage_bookmarks_window.ui Sat Jan 16 16:05:43 2016 +0100 @@ -49,7 +49,7 @@ </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> diff -r c7a4d0865794 -r 4bf87c76deac data/gui/plugins_window.ui --- a/data/gui/plugins_window.ui Sat Jan 16 15:31:00 2016 +0100 +++ b/data/gui/plugins_window.ui Sat Jan 16 16:05:43 2016 +0100 @@ -223,7 +223,6 @@ </child> <child> <object class="GtkLinkButton" id="plugin_homepage_linkbutton"> - <property name="label">homepage url</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> diff -r c7a4d0865794 -r 4bf87c76deac data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Sat Jan 16 15:31:00 2016 +0100 +++ b/data/gui/preferences_window.ui Sat Jan 16 16:05:43 2016 +0100 @@ -244,7 +244,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will display status messages of contacts under the contact name, in roster window and in group chats</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> @@ -1630,7 +1630,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, Gajim will use protocol-specific status icons. (e.g. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will use protocol-specific status icons. (e.g. A contact from ICQ will have the equivalent ICQ icon for status online, away, busy, etc...)</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> diff -r c7a4d0865794 -r 4bf87c76deac src/common/config.py --- a/src/common/config.py Sat Jan 16 15:31:00 2016 +0100 +++ b/src/common/config.py Sat Jan 16 16:05:43 2016 +0100 @@ -107,7 +107,7 @@ 'notif_fterror_color': [ opt_color, '#B22222', _('File transfer error notification color.') ], # firebrick 'notif_ftcomplete_color': [ opt_color, '#9ACD32', _('File transfer complete or stopped notification color.') ], # yellowgreen 'notif_invite_color': [ opt_color, '#D2B48C', _('Groupchat invitation notification color') ], # tan1 - 'notif_status_color': [ opt_color, '#D8BFD8', _('Status changed notification background color') ], # thistle2 + 'notif_status_color': [ opt_color, '#D8BFD8', _('Background color of status changed notification') ], # thistle2 'notif_other_color': [ opt_color, '#FFFFFF', _('Other dialogs color.') ], # white 'inmsgfont': [ opt_str, '', _('Incoming nickname font.'), True ], 'outmsgfont': [ opt_str, '', _('Outgoing nickname font.'), True ],

1 0

gajim: fix A GTK error
by Gajim 16 Jan '16

16 Jan '16

changeset c7a4d0865794 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=c7a4d0865794 description: fix A GTK error diffstat: src/roster_window.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (15 lines): diff -r 616a1e36b5c8 -r c7a4d0865794 src/roster_window.py --- a/src/roster_window.py Sat Jan 16 14:18:16 2016 +0100 +++ b/src/roster_window.py Sat Jan 16 15:31:00 2016 +0100 @@ -4322,9 +4322,9 @@ GLib.idle_add(self.draw_contact, jid, account) elif type_ == 'group': group = model[titer][C_JID] - self._adjust_group_expand_collapse_state(group, account) + GLib.idle_add(self._adjust_group_expand_collapse_state, group, account) elif type_ == 'account': - self._adjust_account_expand_collapse_state(account) + GLib.idle_add(self._adjust_account_expand_collapse_state, account) # Selection can change when the model is filtered # Only write to the model when filtering is finished!

1 0

gajim: [Bahtiar `kalkin-` Gadimov]
by Gajim 16 Jan '16

16 Jan '16

changeset 616a1e36b5c8 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=616a1e36b5c8 description: [Bahtiar `kalkin-` Gadimov] Shorten name of a gc entry in "Join GC" submenu Some XMPP clients save the subject of a group chat as the bookmark name. The subject can be very long thus the MenuItems can get also very long. This simple patch shortens the name to a carefully chosen value. Fixes #8218 diffstat: src/roster_window.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (14 lines): diff -r bf2bc1530719 -r 616a1e36b5c8 src/roster_window.py --- a/src/roster_window.py Tue Jan 05 21:09:40 2016 +0100 +++ b/src/roster_window.py Sat Jan 16 14:18:16 2016 +0100 @@ -6158,6 +6158,10 @@ # No name was given for this bookmark. # Use the first part of JID instead... name = bookmark['jid'].split("@")[0] + + # Shorten long names + name = (name[:42] + '..') if len(name) > 42 else name + # Do not use underline. item = Gtk.MenuItem.new_with_label(name) item.set_use_underline(False)

1 0

gajim-plugins: Fix flattr link
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset 46b803f94081 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=46b803f94081 description: Fix flattr link diffstat: omemo/README.md | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r ab687b810e27 -r 46b803f94081 omemo/README.md --- a/omemo/README.md Sun Dec 27 17:58:35 2015 +0100 +++ b/omemo/README.md Wed Dec 30 13:20:46 2015 +0100 @@ -49,7 +49,7 @@ My Bitcoin Address is: `1CnNM3Mree9hU8eRjCXrfCWV mX6oBnEfV1` -[![Support Me via Flattr](http://api.flattr.com/button/flattr-badge-large.png)](https://flatt… +[![Support Me via Flattr](http://api.flattr.com/button/flattr-badge-large.png)](https://flatt… ## I found a bug Please report it to the [issue

1 0

gajim-plugins: Add CHANGELOG
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset ab687b810e27 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=ab687b810e27 description: Add CHANGELOG diffstat: omemo/CHANGELOG | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (8 lines): diff -r a761d5282b57 -r ab687b810e27 omemo/CHANGELOG --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/omemo/CHANGELOG Sun Dec 27 17:58:35 2015 +0100 @@ -0,0 +1,4 @@ +# 2015-12-27 +- Fix crash, if jid is not in list (Thanks Mic92) +- Fix clear_device_list, if account is not connected (Thanks Mic92) +- Provide python-axolotl installation instructions in README and manifest.ini

1 0

gajim-plugins: Use gajim 0.16.5
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset 35406b57d8d8 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=35406b57d8d8 description: Use gajim 0.16.5 diffstat: omemo/README.md | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (19 lines): diff -r bbd08ec5106a -r 35406b57d8d8 omemo/README.md --- a/omemo/README.md Wed Dec 30 22:10:58 2015 +0100 +++ b/omemo/README.md Mon Jan 04 14:23:49 2016 +0100 @@ -18,12 +18,12 @@ ### Dependencies #### Gajim -You need Gajim version 0.16.4. If your package manager does not provide an up to date -version you can install it from the official Mercurial repository. +You need Gajim version 0.16.5. If your package manager does not provide an up to date +version you can install it from the official Mercurial repository. *DO NOT USE* gajim 0.16.4 it contains a vulnerability, which is fixed in 0.16.5. ```shell hg clone https://hg.gajim.org/gajim cd gajim -hg update gajim-0.16.4 --clean +hg update gajim-0.16.5 --clean ``` #### Python libraries

1 0

gajim-plugins: Update README.md
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset bbd08ec5106a in /home/hg/repos/gajim-plugins author: mad-de <cev_madde(a)msn.com> branches: details:gajim-plugins?cmd=changeset;node=bbd08ec5106a description: Update README.md clone without using github account diffstat: omemo/README.md | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 46b803f94081 -r bbd08ec5106a omemo/README.md --- a/omemo/README.md Wed Dec 30 13:20:46 2015 +0100 +++ b/omemo/README.md Wed Dec 30 22:10:58 2015 +0100 @@ -13,7 +13,7 @@ ```shell mkdir ~/.local/share/gajim/plugins -p cd ~/.local/share/gajim/plugins -git clone git@github.com:kalkin/gajim-omemo.git +git clone https://github.com/kalkin/gajim-omemo ``` ### Dependencies

1 0

gajim-plugins: Fix type nxmpp -> nbxmpp
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset 9c09a43a9b7f in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=9c09a43a9b7f description: Fix type nxmpp -> nbxmpp diffstat: omemo/README.md | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 35406b57d8d8 -r 9c09a43a9b7f omemo/README.md --- a/omemo/README.md Mon Jan 04 14:23:49 2016 +0100 +++ b/omemo/README.md Mon Jan 04 15:19:23 2016 +0100 @@ -29,7 +29,7 @@ #### Python libraries You *have* to install `python-axolotl` via `pip`. Depending on your setup you might want to use `pip2` as Gajim is using python2.7. If you are using the official repository, -do not forget to install the `nxmpp` dependency via pip or you package manager. +do not forget to install the `nbxmpp` dependency via pip or you package manager. ## Running Enable *OMEMO Multi-End Message and Object Encryption* in the Plugin-Manager.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2016