Commits

commits@gajim.org

17632 discussions

gajim: Fix syntax error
by Gajim 17 Oct '16

17 Oct '16

changeset 74824f0bd5d4 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=74824f0bd5d4 description: Fix syntax error diffstat: src/common/connection_handlers_events.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 6c0ecfa7a1bd -r 74824f0bd5d4 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Oct 16 16:57:34 2016 +0200 +++ b/src/common/connection_handlers_events.py Mon Oct 17 02:44:58 2016 +0200 @@ -208,7 +208,7 @@ tzo = '0:0' try: tzoh, tzom = tzo.split(':') - except Exception, e: + except Exception as e: # wrong tzo return utc_time = qp.getTag('utc').getData()

1 0

gajim: Fix alignment in Account Window
by Gajim 16 Oct '16

16 Oct '16

changeset 6c0ecfa7a1bd in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=6c0ecfa7a1bd description: Fix alignment in Account Window diffstat: data/gui/accounts_window.ui | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diffs (154 lines): diff -r 50f60d56cbd7 -r 6c0ecfa7a1bd data/gui/accounts_window.ui --- a/data/gui/accounts_window.ui Sun Oct 16 22:40:41 2016 +0200 +++ b/data/gui/accounts_window.ui Sun Oct 16 16:57:34 2016 +0200 @@ -55,11 +55,13 @@ <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="position">175</property> + <property name="position_set">True</property> <child> <object class="GtkBox" id="vbox2"> <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="margin_right">5</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> @@ -142,7 +144,7 @@ </object> <packing> <property name="resize">False</property> - <property name="shrink">True</property> + <property name="shrink">False</property> </packing> </child> <child> @@ -150,6 +152,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="margin_left">5</property> <property name="show_tabs">False</property> <property name="show_border">False</property> <child> @@ -199,9 +202,9 @@ <object class="GtkLabel" id="jid_label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Jabber ID:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -212,9 +215,9 @@ <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Password:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -225,9 +228,9 @@ <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Resour_ce:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -238,9 +241,9 @@ <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Priori_ty:</property> <property name="use_underline">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -429,10 +432,10 @@ <object class="GtkLabel" id="label28"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Client Cert File:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">cert_entry1</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -1263,6 +1266,9 @@ <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">11</property> + <property name="row_spacing">5</property> + <property name="column_spacing">5</property> <child> <object class="GtkBox" id="vbox12"> <property name="visible">True</property> @@ -1273,9 +1279,9 @@ <object class="GtkLabel" id="label17"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes"><b>OpenPGP</b></property> <property name="use_markup">True</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -1364,9 +1370,9 @@ <object class="GtkLabel" id="label16"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes"><b>Personal Information</b></property> <property name="use_markup">True</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -1379,6 +1385,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">First Name:</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -1390,6 +1397,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Last Name:</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -1401,6 +1409,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Jabber ID:</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -1412,6 +1421,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">E-Mail:</property> + <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property>

1 0

gajim: prevent traceback when a wrong timezone arrive.
by Gajim 16 Oct '16

16 Oct '16

changeset 50f60d56cbd7 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=50f60d56cbd7 description: prevent traceback when a wrong timezone arrive. diffstat: src/common/connection_handlers_events.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (16 lines): diff -r 15e03da41371 -r 50f60d56cbd7 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Oct 16 10:37:08 2016 +0200 +++ b/src/common/connection_handlers_events.py Sun Oct 16 22:40:41 2016 +0200 @@ -206,7 +206,11 @@ tzo = qp.getTag('tzo').getData() if tzo.lower() == 'z': tzo = '0:0' - tzoh, tzom = tzo.split(':') + try: + tzoh, tzom = tzo.split(':') + except Exception, e: + # wrong tzo + return utc_time = qp.getTag('utc').getData() ZERO = datetime.timedelta(0) class UTC(datetime.tzinfo):

1 0

gajim: prevent traceback when a wrong timezone arrive.
by Gajim 16 Oct '16

16 Oct '16

changeset 738aa5082b6a 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=738aa5082b6a description: prevent traceback when a wrong timezone arrive. diffstat: src/common/connection_handlers_events.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (16 lines): diff -r 1bfc811a5e43 -r 738aa5082b6a src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Oct 16 10:38:09 2016 +0200 +++ b/src/common/connection_handlers_events.py Sun Oct 16 22:40:41 2016 +0200 @@ -208,7 +208,11 @@ tzo = qp.getTag('tzo').getData() if tzo.lower() == 'z': tzo = '0:0' - tzoh, tzom = tzo.split(':') + try: + tzoh, tzom = tzo.split(':') + except Exception, e: + # wrong tzo + return utc_time = qp.getTag('utc').getData() ZERO = datetime.timedelta(0) class UTC(datetime.tzinfo):

1 0

gajim: Correctly restore disabled status for emoticons in pref w...
by Gajim 16 Oct '16

16 Oct '16

changeset 15e03da41371 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=15e03da41371 description: Correctly restore disabled status for emoticons in pref window diffstat: src/config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 86264c5ceecd -r 15e03da41371 src/config.py --- a/src/config.py Thu Oct 13 02:07:34 2016 +0200 +++ b/src/config.py Sun Oct 16 10:37:08 2016 +0200 @@ -171,7 +171,7 @@ if gajim.config.get('emoticons_theme') == l[i]: emoticons_combobox.set_active(i) if not gajim.config.get('emoticons_theme'): - emoticons_combobox.set_active(len(l)-1) + emoticons_combobox.set_active(0) # Set default for single window type choices = common.config.opt_one_window_types

1 0

gajim: Correctly restore disabled status for emoticons in pref w...
by Gajim 16 Oct '16

16 Oct '16

changeset 1bfc811a5e43 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=1bfc811a5e43 description: Correctly restore disabled status for emoticons in pref window diffstat: src/config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 81c36bd94098 -r 1bfc811a5e43 src/config.py --- a/src/config.py Sat Oct 08 17:40:39 2016 +0200 +++ b/src/config.py Sun Oct 16 10:38:09 2016 +0200 @@ -167,7 +167,7 @@ if gajim.config.get('emoticons_theme') == l[i]: emoticons_combobox.set_active(i) if not gajim.config.get('emoticons_theme'): - emoticons_combobox.set_active(len(l)-1) + emoticons_combobox.set_active(0) # Set default for single window type choices = common.config.opt_one_window_types

1 0

gajim: Fix textview height in subsription request dialog
by Gajim 13 Oct '16

13 Oct '16

changeset e12519bd0b38 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=e12519bd0b38 description: Fix textview height in subsription request dialog diffstat: data/gui/subscription_request_window.ui | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (28 lines): diff -r bf992be0151d -r e12519bd0b38 data/gui/subscription_request_window.ui --- a/data/gui/subscription_request_window.ui Thu Oct 13 00:18:33 2016 +0200 +++ b/data/gui/subscription_request_window.ui Thu Oct 13 00:31:42 2016 +0200 @@ -17,6 +17,7 @@ <property name="can_focus">False</property> <property name="border_width">12</property> <property name="title" translatable="yes">Subscription Request</property> + <property name="resizable">False</property> <property name="type_hint">dialog</property> <signal name="destroy" handler="on_subscription_request_window_destroy" swapped="no"/> <child> @@ -38,6 +39,7 @@ </child> <child> <object class="GtkScrolledWindow" id="scrolledwindow8"> + <property name="height_request">100</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="border_width">5</property> @@ -54,7 +56,7 @@ </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing>

1 0

gajim: Add additional_data to ChatEvent
by Gajim 13 Oct '16

13 Oct '16

changeset dd9be0a66aef in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=dd9be0a66aef description: Add additional_data to ChatEvent diffstat: src/common/events.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (20 lines): diff -r e12519bd0b38 -r dd9be0a66aef src/common/events.py --- a/src/common/events.py Thu Oct 13 00:31:42 2016 +0200 +++ b/src/common/events.py Thu Oct 13 00:40:02 2016 +0200 @@ -67,7 +67,7 @@ def __init__ (self, message, subject, kind, time, encrypted, resource, msg_log_id, correct_id=None, xhtml=None, session=None, form_node=None, displaymarking=None, sent_forwarded=False, time_=None, show_in_roster=False, - show_in_systray=True): + show_in_systray=True, additional_data=None): Event.__init__(self, time_, show_in_roster=show_in_roster, show_in_systray=show_in_systray) self.message = message @@ -83,6 +83,7 @@ self.form_node = form_node self.displaymarking = displaymarking self.sent_forwarded = sent_forwarded + self.additional_data = additional_data class NormalEvent(ChatEvent): type_ = 'normal'

1 0

gajim: Workaround for strftime bug on Windows
by Gajim 13 Oct '16

13 Oct '16

changeset f5b10ff9e6ee in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=f5b10ff9e6ee description: Workaround for strftime bug on Windows see: http://bugs.python.org/issue8304 diffstat: src/conversation_textview.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diffs (17 lines): diff -r dd9be0a66aef -r f5b10ff9e6ee src/conversation_textview.py --- a/src/conversation_textview.py Thu Oct 13 00:40:02 2016 +0200 +++ b/src/conversation_textview.py Thu Oct 13 01:43:26 2016 +0200 @@ -1410,7 +1410,12 @@ '%(nb_days)i days ago', diff_day, {'nb_days': diff_day}, {'nb_days': diff_day}) if day_str: - format_ += i18n.direction_mark + day_str + direction_mark + ' ' + # strftime Windows bug has problems with Unicode + # see: http://bugs.python.org/issue8304 + if os.name != 'nt': + format_ += i18n.direction_mark + day_str + direction_mark + ' ' + else: + format_ += day_str + ' ' timestamp_str = gajim.config.get('time_stamp') timestamp_str = helpers.from_one_line(timestamp_str) format_ += timestamp_str

1 0

gajim: Dont leak presence with ChatStates
by Gajim 13 Oct '16

13 Oct '16

changeset 86264c5ceecd in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=86264c5ceecd description: Dont leak presence with ChatStates diffstat: src/chat_control.py | 28 ++++++++++++++++++---------- 1 files changed, 18 insertions(+), 10 deletions(-) diffs (59 lines): diff -r f5b10ff9e6ee -r 86264c5ceecd src/chat_control.py --- a/src/chat_control.py Thu Oct 13 01:43:26 2016 +0200 +++ b/src/chat_control.py Thu Oct 13 02:07:34 2016 +0200 @@ -2367,24 +2367,26 @@ contact = self.contact jid = contact.jid current_state = contact.our_chatstate - if current_state is False: # jid doesn't support chatstates - return False # stop looping + if current_state is False: # jid doesn't support chatstates + return False # stop looping message_buffer = self.msg_textview.get_buffer() - if self.kbd_activity_in_last_5_secs and message_buffer.get_char_count(): + if (self.kbd_activity_in_last_5_secs and + message_buffer.get_char_count()): # Only composing if the keyboard activity was in text entry - self.send_chatstate('composing') - elif self.mouse_over_in_last_5_secs and current_state == 'inactive' and\ - jid == self.parent_win.get_active_jid(): - self.send_chatstate('active') + self.send_chatstate('composing', self.contact) + elif (self.mouse_over_in_last_5_secs and + current_state == 'inactive' and + jid == self.parent_win.get_active_jid()): + self.send_chatstate('active', self.contact) else: if current_state == 'composing': - self.send_chatstate('paused') # pause composing + self.send_chatstate('paused', self.contact) # pause composing # assume no activity and let the motion-notify or 'insert-text' make them # True refresh 30 seconds vars too or else it's 30 - 5 = 25 seconds! self.reset_kbd_mouse_timeout_vars() - return True # loop forever + return True # loop forever def check_for_possible_inactive_chatstate(self, arg): """ @@ -2662,12 +2664,18 @@ # and raises RuntimeException with appropriate message # more on that http://xmpp.org/extensions/xep-0085.html#statechart - # do not send nothing if we have chat state notifications disabled + # do not send if we have chat state notifications disabled # that means we won't reply to the <active/> from other peer # so we do not broadcast jep85 capabalities chatstate_setting = gajim.config.get('outgoing_chat_state_notifications') if chatstate_setting == 'disabled': return + + # Dont leak presence to contacts + # which are not allowed to see our status + if contact and contact.sub in ('to', 'none'): + return + elif chatstate_setting == 'composing_only' and state != 'active' and\ state != 'composing': return

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