Commits February 2013

commits@gajim.org

3 participants
86 discussions

gajim: Add letters to dialpad in chat_control.ui. Fixes #7238
by Denis Fomin 14 Feb '13

14 Feb '13

changeset 02568b3d4553 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=02568b3d4553 description: Add letters to dialpad in chat_control.ui. Fixes #7238 diffstat: data/gui/chat_control.ui | 323 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 271 insertions(+), 52 deletions(-) diffs (truncated from 1061 to 300 lines): diff -r d7419a1c66f9 -r 02568b3d4553 data/gui/chat_control.ui --- a/data/gui/chat_control.ui Thu Feb 14 20:26:50 2013 +0400 +++ b/data/gui/chat_control.ui Fri Feb 15 00:29:16 2013 +0400 @@ -1,7 +1,18 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> -  +  + <object class="GtkAdjustment" id="adjustment1"> + <property name="upper">110</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + <property name="page_size">10</property> + </object> + <object class="GtkAdjustment" id="adjustment2"> + <property name="upper">110</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + <property name="page_size">10</property> + </object> <object class="GtkHBox" id="chat_control_hbox"> <property name="can_focus">True</property> <property name="spacing">1</property> @@ -9,26 +20,29 @@ <object class="GtkVBox" id="chat_control_vbox"> <property name="can_focus">True</property> <property name="border_width">3</property> - <property name="orientation">vertical</property> <property name="spacing">1</property> <child> <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <child> <object class="GtkAlignment" id="alignment"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="left_padding">3</property> <property name="right_padding">3</property> <child> <object class="GtkEventBox" id="banner_eventbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkHBox" id="hbox3004"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkImage" id="banner_status_image"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="ypad">5</property> <property name="stock">gtk-missing-image</property> </object> @@ -42,44 +56,54 @@ <child> <object class="GtkVBox" id="banner_vbox"> <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="border_width">5</property> - <property name="orientation">vertical</property> <child> <object class="GtkLabel" id="banner_name_label"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label"><span weight="heavy" size="large">Contact name</span></property> <property name="use_markup">True</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="banner_label"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label">label</property> <property name="use_markup">True</property> <property name="selectable">True</property> - <signal name="populate_popup" handler="on_banner_label_populate_popup"/> + <signal name="populate-popup" handler="on_banner_label_populate_popup" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">4</property> <child> <object class="GtkImage" id="mood_image"> + <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="stock">gtk-missing-image</property> <property name="icon-size">1</property> @@ -92,6 +116,7 @@ </child> <child> <object class="GtkImage" id="activity_image"> + <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="stock">gtk-missing-image</property> <property name="icon-size">1</property> @@ -104,6 +129,7 @@ </child> <child> <object class="GtkImage" id="tune_image"> + <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="stock">gtk-missing-image</property> <property name="icon-size">1</property> @@ -117,9 +143,11 @@ <child> <object class="GtkEventBox" id="location_eventbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="visible_window">False</property> <child> <object class="GtkImage" id="location_image"> + <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="stock">gtk-missing-image</property> <property name="icon-size">1</property> @@ -134,6 +162,7 @@ </child> <child> <object class="GtkImage" id="audio_banner_image"> + <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="stock">gtk-missing-image</property> <property name="icon-size">1</property> @@ -146,6 +175,7 @@ </child> <child> <object class="GtkImage" id="video_banner_image"> + <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="stock">gtk-missing-image</property> <property name="icon-size">1</property> @@ -160,6 +190,7 @@ <object class="GtkAlignment" id="alignment3"> <property name="width_request">11</property> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <placeholder/> </child> @@ -180,10 +211,12 @@ <child> <object class="GtkEventBox" id="avatar_eventbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="visible_window">False</property> <child> <object class="GtkImage" id="avatar_image"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="stock">gtk-missing-image</property> </object> </child> @@ -208,37 +241,41 @@ <child> <object class="GtkVBox" id="vbox106"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <child> <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> <property name="height_request">60</property> <property name="can_focus">True</property> <property name="border_width">3</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">in</property> <child> <placeholder/> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHBox" id="hbox"> <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> <child> <object class="GtkButton" id="authentication_button"> + <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">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="no_show_all">True</property> + <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> <object class="GtkImage" id="lock_image"> + <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="stock">gtk-dialog-authentication</property> <property name="icon-size">1</property> @@ -247,6 +284,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -263,36 +301,45 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkHBox" id="actions_hbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkButton" id="emoticons_button"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">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="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">Show a list of emoticons (Alt+M)</property> + <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> <object class="GtkImage" id="emoticons_button_image"> <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="stock">gtk-missing-image</property> <property name="icon-size">1</property> @@ -301,22 +348,26 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkButton" id="formattings_button"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">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="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">Show a list of formattings</property> + <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> <object class="GtkImage" id="image10">

1 0

gajim: fix Gtk var name
by Denis Fomin 14 Feb '13

14 Feb '13

changeset d7419a1c66f9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d7419a1c66f9 description: fix Gtk var name diffstat: src/chat_control.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r b6f58ce8415c -r d7419a1c66f9 src/chat_control.py --- a/src/chat_control.py Tue Feb 12 19:31:35 2013 +0100 +++ b/src/chat_control.py Thu Feb 14 20:26:50 2013 +0400 @@ -1623,7 +1623,7 @@ self.handlers[id_] = widget self.dtmf_window = self.xml.get_object('dtmf_window') - self.dtmf_window.get_child().set_direction(gtk.TEXT_DIR_LTR) + self.dtmf_window.get_child().set_direction(Gtk.TextDirection.LTR) id_ = self.dtmf_window.connect('focus-out-event', self.on_dtmf_window_focus_out_event) self.handlers[id_] = self.dtmf_window

1 0

gajim: check that contacts are not in "not in roster" group when...
by Yann Leboulanger 13 Feb '13

13 Feb '13

changeset b6f58ce8415c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b6f58ce8415c description: check that contacts are not in "not in roster" group when we receive a RIE stanza. Fixes #7289 diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 5e9edfd00451 -r b6f58ce8415c src/dialogs.py --- a/src/dialogs.py Thu Jan 24 21:23:57 2013 +0100 +++ b/src/dialogs.py Tue Feb 12 19:31:35 2013 +0100 @@ -3480,7 +3480,7 @@ is_in_roster = True contact = gajim.contacts.get_contact_with_highest_priority( self.account, jid) - if not contact: + if not contact or _('Not in Roster') in contact.groups: is_in_roster = False name = self.exchange_list[jid][0] num_list = len(self.exchange_list[jid][1])

1 0

gajim: correctly close file when we cancel a transfer. Fixes #7281
by Yann Leboulanger 13 Feb '13

13 Feb '13

changeset 5e9edfd00451 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5e9edfd00451 description: correctly close file when we cancel a transfer. Fixes #7281 diffstat: src/common/protocol/bytestream.py | 7 +++++-- src/common/socks5.py | 7 +++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diffs (55 lines): diff -r 8563a4190e33 -r 5e9edfd00451 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Tue Jan 22 17:38:43 2013 +0100 +++ b/src/common/protocol/bytestream.py Thu Jan 24 21:23:57 2013 +0100 @@ -790,6 +790,7 @@ rep = nbxmpp.Protocol('iq', stanza.getFrom(), 'result', stanza.getTo(), {'id': stanza.getID()}) file_props.block_size = blocksize + file_props.direction = '<' file_props.seq = 0 file_props.received_len = 0 file_props.last_time = time.time() @@ -812,7 +813,6 @@ payload=[nbxmpp.Node(nbxmpp.NS_IBB + ' close', {'sid':file_props.sid})])) - def OpenStream(self, sid, to, fp, blocksize=4096): """ Start new stream. You should provide stream id 'sid', the endpoind jid @@ -990,7 +990,10 @@ break else: if stanza.getTag('data'): - if self.IBBMessageHandler(conn, stanza): + sid = stanza.getTagAttr('data', 'sid') + file_props = FilesProp.getFileProp(self.name, sid) + if file_props.connected and self.IBBMessageHandler(conn, + stanza): reply = stanza.buildReply('result') reply.delChild('data') conn.send(reply) diff -r 8563a4190e33 -r 5e9edfd00451 src/common/socks5.py --- a/src/common/socks5.py Tue Jan 22 17:38:43 2013 +0100 +++ b/src/common/socks5.py Thu Jan 24 21:23:57 2013 +0100 @@ -538,6 +538,7 @@ raise IOError(str(e)) def close_file(self): + # Close file we're sending from if self.file: if not self.file.closed: try: @@ -545,6 +546,12 @@ except Exception: pass self.file = None + # Close file we're receiving into + if self.file_props.fd: + try: + self.file_props.fd.close() + except Exception: + pass def get_fd(self): """

1 0

gajim: don't try to escape JID when we get a subscription reques...
by Yann Leboulanger 13 Feb '13

13 Feb '13

changeset 8563a4190e33 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8563a4190e33 description: don't try to escape JID when we get a subscription request from it, it's already escaped. Fixes #7277 diffstat: src/dialogs.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (28 lines): diff -r 698206e32855 -r 8563a4190e33 src/dialogs.py --- a/src/dialogs.py Sun Jan 20 19:55:35 2013 +0100 +++ b/src/dialogs.py Tue Jan 22 17:38:43 2013 +0100 @@ -952,6 +952,7 @@ liststore = Gtk.ListStore(str) self.protocol_jid_combobox.set_model(liststore) if jid: + self.jid_escaped = True type_ = gajim.get_transport_name_from_jid(jid) if not type_: type_ = 'jabber' @@ -986,6 +987,7 @@ self.nickname_entry.set_text(user_nick) self.nickname_entry.grab_focus() else: + self.jid_escaped = False self.uid_entry.grab_focus() group_names = [] for acct in accounts: @@ -1062,7 +1064,7 @@ model = self.protocol_combobox.get_model() row = self.protocol_combobox.get_active_iter() type_ = model[row][2] - if type_ != 'jabber': + if type_ != 'jabber' and not self.jid_escaped: model = self.protocol_jid_combobox.get_model() row = self.protocol_jid_combobox.get_active() transport = model[row][0]

1 0

gajim: fix typo
by Yann Leboulanger 13 Feb '13

13 Feb '13

changeset 698206e32855 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=698206e32855 description: fix typo diffstat: src/roster_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 5fd35987e439 -r 698206e32855 src/roster_window.py --- a/src/roster_window.py Mon Jan 14 20:13:45 2013 +0100 +++ b/src/roster_window.py Sun Jan 20 19:55:35 2013 +0100 @@ -2705,7 +2705,7 @@ def _nec_decrypted_message_received(self, obj): if not obj.msgtxt: # empty message text return True - if obj.mtype not in ('norml', 'chat'): + if obj.mtype not in ('normal', 'chat'): return if obj.session.control: typ = ''

1 0

gajim: [Daniel Aleksandersen] Use encrypted Google search. Fixes...
by Yann Leboulanger 13 Feb '13

13 Feb '13

changeset 5fd35987e439 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5fd35987e439 description: [Daniel Aleksandersen] Use encrypted Google search. Fixes #7289 diffstat: src/common/config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r ca06c30a8d94 -r 5fd35987e439 src/common/config.py --- a/src/common/config.py Thu Jan 10 17:21:05 2013 +0100 +++ b/src/common/config.py Mon Jan 14 20:13:45 2013 +0100 @@ -186,7 +186,7 @@ 'last_roster_visible': [opt_bool, True], 'key_up_lines': [opt_int, 25, _('How many lines to store for Ctrl+KeyUP.')], 'version': [ opt_str, defs.version ], # which version created the config - 'search_engine': [opt_str, 'http://www.google.com/search?&q=%s&sourceid=gajim'], + 'search_engine': [opt_str, 'https://www.google.com/search?&q=%s&sourceid=gajim'], 'dictionary_url': [opt_str, 'WIKTIONARY', _("Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary.")], 'always_english_wikipedia': [opt_bool, False], 'always_english_wiktionary': [opt_bool, True],

1 0

gajim: remove <ping> child in ping reply. Fixes #7286
by Yann Leboulanger 13 Feb '13

13 Feb '13

changeset ca06c30a8d94 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ca06c30a8d94 description: remove <ping> child in ping reply. Fixes #7286 diffstat: src/common/connection_handlers.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 4133c6ef3ab3 -r ca06c30a8d94 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Fri Jan 04 09:46:13 2013 +0100 +++ b/src/common/connection_handlers.py Thu Jan 10 17:21:05 2013 +0100 @@ -1832,6 +1832,9 @@ if not self.connection or self.connected < 2: return iq_obj = obj.stanza.buildReply('result') + q = iq_obj.getTag('ping') + if q: + iq_obj.delChild(q) self.connection.send(iq_obj) def _PrivacySetCB(self, con, iq_obj):

1 0

gajim: fix showing dialpad correctly in LTR languages. Fixes #7285
by Yann Leboulanger 13 Feb '13

13 Feb '13

changeset 4133c6ef3ab3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4133c6ef3ab3 description: fix showing dialpad correctly in LTR languages. Fixes #7285 diffstat: src/chat_control.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 0b88edc63455 -r 4133c6ef3ab3 src/chat_control.py --- a/src/chat_control.py Wed Dec 26 18:41:31 2012 -0400 +++ b/src/chat_control.py Fri Jan 04 09:46:13 2013 +0100 @@ -1623,6 +1623,7 @@ self.handlers[id_] = widget self.dtmf_window = self.xml.get_object('dtmf_window') + self.dtmf_window.get_child().set_direction(gtk.TEXT_DIR_LTR) id_ = self.dtmf_window.connect('focus-out-event', self.on_dtmf_window_focus_out_event) self.handlers[id_] = self.dtmf_window

1 0

gajim: Cancel an IBB transfer
by Jefry Lagrange 13 Feb '13

13 Feb '13

changeset 0b88edc63455 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0b88edc63455 description: Cancel an IBB transfer diffstat: src/common/protocol/bytestream.py | 19 ++++++++++++++++++- src/filetransfers_window.py | 6 +++++- 2 files changed, 23 insertions(+), 2 deletions(-) diffs (67 lines): diff -r 57e066cee4a2 -r 0b88edc63455 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Wed Feb 13 10:16:52 2013 +0400 +++ b/src/common/protocol/bytestream.py Wed Dec 26 18:41:31 2012 -0400 @@ -803,6 +803,16 @@ file_props.fp = open(file_props.file_name, 'w') conn.send(rep) + def CloseIBBStream(self, file_props): + file_props.connected = False + file_props.fp.close() + file_props.stopped = True + self.connection.send(nbxmpp.Protocol('iq', + file_props.direction[1:], 'set', + payload=[nbxmpp.Node(nbxmpp.NS_IBB + ' close', + {'sid':file_props.sid})])) + + def OpenStream(self, sid, to, fp, blocksize=4096): """ Start new stream. You should provide stream id 'sid', the endpoind jid @@ -849,6 +859,9 @@ if file_props.direction[0] == '>': if file_props.paused: continue + if not file_props.connected: + #TODO: Reply with out of order error + continue chunk = file_props.fp.read(file_props.block_size) if chunk: datanode = nbxmpp.Node(nbxmpp.NS_IBB + ' data', {'sid': sid, @@ -940,6 +953,9 @@ reply.delChild('close') conn.send(reply) file_props.fp.close() + file_props.completed = file_props.received_len >= file_props.size + if not file_props.completed: + file_props.error = -1 gajim.socks5queue.complete_transfer_cb(self.name, file_props) else: conn.send(nbxmpp.Error(stanza, nbxmpp.ERR_ITEM_NOT_FOUND)) @@ -954,8 +970,9 @@ syn_id = stanza.getID() log.debug('IBBAllIqHandler called syn_id->%s' % syn_id) for file_props in FilesProp.getAllFileProp(): - if not file_props.direction: + if not file_props.direction or not file_props.connected: # It's socks5 bytestream + # Or we closed the IBB stream continue if file_props.syn_id == syn_id: if stanza.getType() == 'error': diff -r 57e066cee4a2 -r 0b88edc63455 src/filetransfers_window.py --- a/src/filetransfers_window.py Wed Feb 13 10:16:52 2013 +0400 +++ b/src/filetransfers_window.py Wed Dec 26 18:41:31 2012 -0400 @@ -944,7 +944,11 @@ account = file_props.tt_account if account not in gajim.connections: return - gajim.connections[account].disconnect_transfer(file_props) + con = gajim.connections[account] + # Check if we are in a IBB transfer + if file_props.direction: + con.CloseIBBStream(file_props) + con.disconnect_transfer(file_props) self.set_status(file_props, 'stop') def show_tooltip(self, widget):

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2013