Commits

commits@gajim.org

17632 discussions

gajim: fix showing tooltips of emoticons. fixes #7453
by Gajim 30 Dec '13

30 Dec '13

changeset e39d28f90b32 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=e39d28f90b32 description: fix showing tooltips of emoticons. fixes #7453 diffstat: src/conversation_textview.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 26839042128c -r e39d28f90b32 src/conversation_textview.py --- a/src/conversation_textview.py Wed Oct 30 13:44:19 2013 +0100 +++ b/src/conversation_textview.py Wed Oct 30 14:02:21 2013 +0100 @@ -1134,7 +1134,8 @@ # it's an emoticon emot_ascii = possible_emot_ascii_caps anchor = buffer_.create_child_anchor(end_iter) - img = TextViewImage(anchor, special_text) + img = TextViewImage(anchor, + gobject.markup_escape_text(special_text)) animations = gajim.interface.emoticons_animations if not emot_ascii in animations: animations[emot_ascii] = GdkPixbuf.PixbufAnimation.new_from_file(

1 0

gajim: [Maranda] ignore directory category of type server, if an...
by Gajim 30 Dec '13

30 Dec '13

changeset f47ceee89acd in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=f47ceee89acd description: [Maranda] ignore directory category of type server, if an identity with server category is present. Fixes #7499 diffstat: src/disco.py | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diffs (24 lines): diff -r e39d28f90b32 -r f47ceee89acd src/disco.py --- a/src/disco.py Wed Oct 30 14:02:21 2013 +0100 +++ b/src/disco.py Wed Oct 30 16:38:01 2013 +0100 @@ -948,9 +948,17 @@ Set the window title based on agent info """ # Set the banner and window title - if 'name' in identities[0]: - name = identities[0]['name'] - self.window._set_window_banner_text(self._get_agent_address(), name) + if len(identities) > 1: + # Check if an identity with server category is present + for i, _identity in enumerate(identities): + if _identity['category'] == 'server' and 'name' in _identity: + name = _identity['name'] + break + elif 'name' in identities[0]: + name = identities[0]['name'] + + if name: + self.window._set_window_banner_text(self._get_agent_address(), name) # Add an icon to the banner. pix = self.cache.get_icon(identities, addr=self._get_agent_address())

1 0

gajim: sime cleanup in sound client list. Fixes #7497
by Gajim 30 Dec '13

30 Dec '13

changeset b6fbcf59fa6e in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=b6fbcf59fa6e description: sime cleanup in sound client list. Fixes #7497 diffstat: src/gui_interface.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (19 lines): diff -r f47ceee89acd -r b6fbcf59fa6e src/gui_interface.py --- a/src/gui_interface.py Wed Oct 30 16:38:01 2013 +0100 +++ b/src/gui_interface.py Wed Oct 30 17:50:47 2013 +0100 @@ -2941,11 +2941,13 @@ if gajim.config.get('soundplayer') == '': # only on first time Gajim starts - commands = ('aplay', 'play', 'esdplay', 'artsplay', 'ossplay') + commands = ('aplay', 'play', 'ossplay') for command in commands: if helpers.is_in_path(command): - if command == 'aplay': + if command in ('aplay', 'play'): command += ' -q' + elif command == 'ossplay': + command += ' -qq' gajim.config.set('soundplayer', command) break

1 0

gajim: re-add missing ... in menus. Fixes #7519
by Gajim 30 Dec '13

30 Dec '13

changeset 5cb728527b4d in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=5cb728527b4d description: re-add missing ... in menus. Fixes #7519 diffstat: data/gui/roster_window.ui | 2 +- data/gui/systray_context_menu.ui | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r b6fbcf59fa6e -r 5cb728527b4d data/gui/roster_window.ui --- a/data/gui/roster_window.ui Wed Oct 30 17:50:47 2013 +0100 +++ b/data/gui/roster_window.ui Wed Oct 30 21:33:31 2013 +0100 @@ -122,7 +122,7 @@ <property name="can_focus">False</property> <child> <object class="GtkImageMenuItem" id="new_chat_menuitem"> - <property name="label" translatable="yes">_Start Chat</property> + <property name="label" translatable="yes">_Start Chat...</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> diff -r b6fbcf59fa6e -r 5cb728527b4d data/gui/systray_context_menu.ui --- a/data/gui/systray_context_menu.ui Wed Oct 30 17:50:47 2013 +0100 +++ b/data/gui/systray_context_menu.ui Wed Oct 30 21:33:31 2013 +0100 @@ -15,7 +15,7 @@ </child> <child> <object class="GtkImageMenuItem" id="chat_with_menuitem"> - <property name="label" translatable="yes">_Start Chat</property> + <property name="label" translatable="yes">_Start Chat...</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image2</property>

1 0

gajim: fix logging sent single messages. Fixes #7207
by Gajim 30 Dec '13

30 Dec '13

changeset 898149ed9ed2 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=898149ed9ed2 description: fix logging sent single messages. Fixes #7207 diffstat: src/common/connection.py | 2 ++ src/common/connection_handlers_events.py | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diffs (24 lines): diff -r c8b9ae19a10b -r 898149ed9ed2 src/common/connection.py --- a/src/common/connection.py Mon Oct 28 11:23:54 2013 +0100 +++ b/src/common/connection.py Mon Oct 28 12:02:05 2013 +0100 @@ -2042,6 +2042,8 @@ return if isinstance(jid, list): for j in jid: + if session is None: + session = self.get_or_create_session(j, '') self.log_message(j, msg, forward_from, session, original_message, subject, type_, xhtml) else: diff -r c8b9ae19a10b -r 898149ed9ed2 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Oct 28 11:23:54 2013 +0100 +++ b/src/common/connection_handlers_events.py Mon Oct 28 12:02:05 2013 +0100 @@ -2468,7 +2468,7 @@ self.session = None self.forward_from = None self.form_node = None - self.original_message = '' + self.original_message = None self.delayed = None self.callback = None self.callback_args = []

1 0

gajim: use ✓ and ✖ instead of gtk-yes / gtk-no icons for XEP-184...
by Gajim 30 Dec '13

30 Dec '13

changeset bb5502732ee6 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=bb5502732ee6 description: use ✓ and ✖ instead of gtk-yes / gtk-no icons for XEP-184 marks. Fixes #7445, see #7476 diffstat: src/conversation_textview.py | 27 +++++++-------------------- 1 files changed, 7 insertions(+), 20 deletions(-) diffs (58 lines): diff -r 898149ed9ed2 -r bb5502732ee6 src/conversation_textview.py --- a/src/conversation_textview.py Mon Oct 28 12:02:05 2013 +0100 +++ b/src/conversation_textview.py Mon Oct 28 19:24:11 2013 +0100 @@ -175,8 +175,6 @@ FOCUS_OUT_LINE_PIXBUF = gtkgui_helpers.get_icon_pixmap( 'gajim-muc_separator') - XEP0184_WARNING_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-no') - XEP0184_RECEIVED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-yes') MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-spell-check') # smooth scroll constants @@ -315,6 +313,10 @@ self.displaymarking_tags = {} tag = buffer_.create_tag('xep0184-warning') + tag.set_property('foreground', 'red') + + tag = buffer_.create_tag('xep0184-received') + tag.set_property('foreground', 'green') # One mark at the begining then 2 marks between each lines size = gajim.config.get('max_conversation_lines') @@ -516,18 +518,7 @@ return False end_iter = buffer_.get_iter_at_mark(self.xep0184_marks[id_]) - buffer_.insert(end_iter, ' ') - anchor = buffer_.create_child_anchor(end_iter) - img = TextViewImage(anchor, '') - img.set_from_pixbuf(ConversationTextview.XEP0184_WARNING_PIXBUF) - img.show() - self.tv.add_child_at_anchor(img, anchor) - before_img_iter = buffer_.get_iter_at_mark(self.xep0184_marks[id_]) - before_img_iter.forward_char() - post_img_iter = before_img_iter.copy() - post_img_iter.forward_char() - buffer_.apply_tag_by_name('xep0184-warning', before_img_iter, - post_img_iter) + buffer_.insert_with_tags_by_name(end_iter, ' ✖', 'xep0184-warning') self.xep0184_shown[id_] = SHOWN return False @@ -554,12 +545,8 @@ if gajim.config.get('positive_184_ack'): begin_iter = buffer_.get_iter_at_mark(self.xep0184_marks[id_]) - buffer_.insert(begin_iter, ' ') - anchor = buffer_.create_child_anchor(begin_iter) - img = TextViewImage(anchor, '') - img.set_from_pixbuf(ConversationTextview.XEP0184_RECEIVED_PIXBUF) - img.show() - self.tv.add_child_at_anchor(img, anchor) + buffer_.insert_with_tags_by_name(begin_iter, ' ✓', + 'xep0184-received') self.xep0184_shown[id_] = ALREADY_RECEIVED

1 0

gajim: handle caps correctly for pm. Fixes #7466
by Gajim 30 Dec '13

30 Dec '13

changeset 3879dd76941e in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=3879dd76941e description: handle caps correctly for pm. Fixes #7466 diffstat: src/chat_control.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (16 lines): diff -r bb5502732ee6 -r 3879dd76941e src/chat_control.py --- a/src/chat_control.py Mon Oct 28 19:24:11 2013 +0100 +++ b/src/chat_control.py Tue Oct 29 17:26:25 2013 +0100 @@ -2858,7 +2858,11 @@ self.parent_win.redraw_tab(self, self.contact.chatstate) def _nec_caps_received(self, obj): - if obj.conn.name != self.account or obj.jid != self.contact.jid: + if obj.conn.name != self.account: + return + if self.TYPE_ID == 'chat' and obj.jid != self.contact.jid: + return + if self.TYPE_ID == 'pm' and obj.fjid != self.contact.jid: return self.update_ui()

1 0

gajim: allow to connect to network ip but not loopback. Fixes #7403
by Gajim 30 Dec '13

30 Dec '13

changeset dae8ab39771b in /home/hg/repos/gajim author: Jefry Lagrange <jefry.reyes(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=dae8ab39771b description: allow to connect to network ip but not loopback. Fixes #7403 diffstat: src/common/socks5.py | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diffs (18 lines): diff -r 3879dd76941e -r dae8ab39771b src/common/socks5.py --- a/src/common/socks5.py Tue Oct 29 17:26:25 2013 +0100 +++ b/src/common/socks5.py Tue Oct 29 21:26:49 2013 +0000 @@ -116,13 +116,11 @@ self.on_failure[sid] = on_failure file_props = FilesProp.getFileProp(account, sid) file_props.failure_cb = on_failure - con = gajim.connections[account] streamhosts_to_test = [] # Remove local IPs to not connect to ourself for streamhost in file_props.streamhosts: if streamhost['host'] == '127.0.0.1' or \ - streamhost['host'] == '::1' or \ - streamhost['host'] == con.peerhost[0]: + streamhost['host'] == '::1' continue streamhosts_to_test.append(streamhost) if not streamhosts_to_test:

1 0

gajim: fix typo
by Gajim 30 Dec '13

30 Dec '13

changeset 9d5357535665 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=9d5357535665 description: fix typo diffstat: src/common/socks5.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r dae8ab39771b -r 9d5357535665 src/common/socks5.py --- a/src/common/socks5.py Tue Oct 29 21:26:49 2013 +0000 +++ b/src/common/socks5.py Wed Oct 30 11:58:18 2013 +0100 @@ -120,7 +120,7 @@ # Remove local IPs to not connect to ourself for streamhost in file_props.streamhosts: if streamhost['host'] == '127.0.0.1' or \ - streamhost['host'] == '::1' + streamhost['host'] == '::1': continue streamhosts_to_test.append(streamhost) if not streamhosts_to_test:

1 0

gajim: fix enabling / disabling accounts while creating a new on...
by Gajim 30 Dec '13

30 Dec '13

changeset cd988cd1c310 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=cd988cd1c310 description: fix enabling / disabling accounts while creating a new one. Fixes #7477 diffstat: src/roster_window.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (14 lines): diff -r 9d5357535665 -r cd988cd1c310 src/roster_window.py --- a/src/roster_window.py Wed Oct 30 11:58:18 2013 +0100 +++ b/src/roster_window.py Wed Oct 30 12:40:31 2013 +0100 @@ -1432,7 +1432,10 @@ def _after_fill(self): self.starting = False + accounts_list = gajim.contacts.get_accounts() for account in gajim.connections: + if account not in accounts_list: + continue jids = gajim.contacts.get_jid_list(account) for jid in jids:

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits