Commits

commits@gajim.org

17632 discussions

gajim: fix position of tooltip when tooltip is too high for the ...
by Gajim 30 Oct '13

30 Oct '13

changeset b36585e88a82 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=b36585e88a82 description: fix position of tooltip when tooltip is too high for the screen. Fixes #7490 diffstat: src/tooltips.py | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diffs (42 lines): diff -r 60060f8d7a75 -r b36585e88a82 src/tooltips.py --- a/src/tooltips.py Wed Oct 30 13:13:00 2013 +0100 +++ b/src/tooltips.py Wed Oct 30 13:44:19 2013 +0100 @@ -115,6 +115,24 @@ def on_size_request(self, widget, requisition): half_width = requisition.width / 2 + 1 + if self.preferred_position[1] + requisition.height > \ + self.screen.get_height(): + # flip tooltip up + self.preferred_position[1] -= requisition.height + \ + self.widget_height + 8 + if self.preferred_position[1] < 0: + self.preferred_position[1] = self.screen.get_height() - \ + requisition.height - 2 + + if self.preferred_position[0] + requisition.width + 7 < \ + self.screen.get_width(): + self.preferred_position[0] = self.preferred_position[0] + 7 + else: + self.preferred_position[0] = self.preferred_position[0] - \ + requisition.width - 7 + self.win.move(self.preferred_position[0], + self.preferred_position[1]) + return if self.preferred_position[0] < half_width: self.preferred_position[0] = 0 elif self.preferred_position[0] + requisition.width > \ @@ -123,13 +141,6 @@ requisition.width elif not self.check_last_time: self.preferred_position[0] -= half_width - if self.preferred_position[1] + requisition.height > \ - self.screen.get_height(): - # flip tooltip up - self.preferred_position[1] -= requisition.height + \ - self.widget_height + 8 - if self.preferred_position[1] < 0: - self.preferred_position[1] = 0 self.win.move(self.preferred_position[0], self.preferred_position[1]) def expose(self, widget, event):

1 0

gajim: fix adding a new preset status message. Fixes #7488
by Gajim 30 Oct '13

30 Oct '13

changeset 60060f8d7a75 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=60060f8d7a75 description: fix adding a new preset status message. Fixes #7488 diffstat: src/config.py | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diffs (28 lines): diff -r 18388b6d1744 -r 60060f8d7a75 src/config.py --- a/src/config.py Wed Oct 30 12:40:31 2013 +0100 +++ b/src/config.py Wed Oct 30 13:13:00 2013 +0100 @@ -1092,8 +1092,12 @@ # store mood / activity for subname in ('activity', 'subactivity', 'activity_text', 'mood', 'mood_text'): - gajim.config.set_per('statusmsg', val, subname, - model[iter_][i].decode('utf-8')) + val2 = model[iter_][i] + if val2: + val2 = model[iter_][i].decode('utf-8') + else: + val2 = '' + gajim.config.set_per('statusmsg', val, subname, val2) i += 1 iter_ = model.iter_next(iter_) @@ -1223,7 +1227,8 @@ def on_new_msg_button_clicked(self, widget, data = None): model = self.msg_tree.get_model() iter_ = model.append() - model.set(iter_, 0, _('status message title'), 1, _('status message text')) + model.set(iter_, 0, _('status message title'), 1, + _('status message text')) self.msg_tree.set_cursor(model.get_path(iter_)) def on_delete_msg_button_clicked(self, widget, data = None):

1 0

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

30 Oct '13

changeset 18388b6d1744 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=18388b6d1744 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 dbe2cc616e23 -r 18388b6d1744 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 @@ -1418,7 +1418,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

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

30 Oct '13

changeset e7910c91b1ab in /home/hg/repos/gajim author: Jefry Lagrange <jefry.reyes(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=e7910c91b1ab 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 d6b1f702927d -r e7910c91b1ab 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 Oct '13

30 Oct '13

changeset dbe2cc616e23 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=dbe2cc616e23 description: fix typo diffstat: src/common/socks5.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r e7910c91b1ab -r dbe2cc616e23 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 typo
by Gajim 30 Oct '13

30 Oct '13

changeset 0861ddcb7fab in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=0861ddcb7fab description: fix typo diffstat: src/common/socks5.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 82ca8c4a9a72 -r 0861ddcb7fab 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: allow to connect to network ip but not loopback. Fixes #7403
by Gajim 29 Oct '13

29 Oct '13

changeset 82ca8c4a9a72 in /home/hg/repos/gajim author: Jefry Lagrange <jefry.reyes(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=82ca8c4a9a72 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 7667dcdbbdd1 -r 82ca8c4a9a72 src/common/socks5.py --- a/src/common/socks5.py Mon Sep 16 16:48:07 2013 +0200 +++ 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: handle caps correctly for pm. Fixes #7466
by Gajim 29 Oct '13

29 Oct '13

changeset d6b1f702927d 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=d6b1f702927d 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 b8c77933e74e -r d6b1f702927d 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 @@ -2813,7 +2813,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: use ✓ and ✖ instead of gtk-yes / gtk-no icons for XEP-184...
by Gajim 28 Oct '13

28 Oct '13

changeset b8c77933e74e 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=b8c77933e74e 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 bdce0232c899 -r b8c77933e74e 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 @@ -171,8 +171,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 @@ -310,6 +308,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') @@ -509,18 +511,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 @@ -547,12 +538,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: fix receiving single messages
by Gajim 28 Oct '13

28 Oct '13

changeset d8f3e9e535f3 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=d8f3e9e535f3 description: fix receiving single messages diffstat: src/roster_window.py | 11 +++++++++-- src/session.py | 3 ++- 2 files changed, 11 insertions(+), 3 deletions(-) diffs (41 lines): diff -r adb841d029ae -r d8f3e9e535f3 src/roster_window.py --- a/src/roster_window.py Sat Oct 26 00:05:09 2013 +0400 +++ b/src/roster_window.py Mon Oct 28 11:23:54 2013 +0100 @@ -2700,7 +2700,14 @@ return True if obj.mtype not in ('normal', 'chat'): return - if obj.session.control: + if obj.mtype == 'normal' and obj.popup: + # it's single message to be autopopuped + dialogs.SingleMessageWindow(obj.conn.name, obj.jid, + action='receive', from_whom=obj.jid, subject=obj.subject, + message=obj.msgtxt, resource=obj.resource, session=obj.session, + form_node=obj.form_node) + return + if obj.session.control and obj.mtype == 'chat': typ = '' if obj.mtype == 'error': typ = 'error' @@ -2717,7 +2724,7 @@ if not pw or (pw.get_active_control() and obj.session.control \ == pw.get_active_control() and pw.is_active() and end): gajim.logger.set_read_messages([obj.msg_id]) - elif obj.popup: + elif obj.popup and obj.mtype == 'chat': contact = gajim.contacts.get_contact(obj.conn.name, obj.jid) obj.session.control = gajim.interface.new_chat(contact, obj.conn.name, session=obj.session) diff -r adb841d029ae -r d8f3e9e535f3 src/session.py --- a/src/session.py Sat Oct 26 00:05:09 2013 +0400 +++ b/src/session.py Mon Oct 28 11:23:54 2013 +0100 @@ -237,7 +237,8 @@ obj.show_in_systray = notify.get_show_in_systray(event_type, self.conn.name, contact) - if not self.control: + if (not self.control and obj.mtype != 'normal') or \ + (obj.mtype != 'normal' and not obj.popup): event = gajim.events.create_event(type_, (obj.msgtxt, obj.subject, obj.mtype, obj.timestamp, obj.encrypted, obj.resource, obj.msg_id, obj.xhtml, self, obj.form_node, obj.displaymarking,

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