Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Encode filenames before sending
by Philipp Hörist 05 Apr '18

05 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 711f3cbb by Philipp Hörist at 2018-04-05T19:38:17+02:00 Encode filenames before sending Fixes #9039 - - - - - 1 changed file: - gajim/common/httpupload.py Changes: ===================================== gajim/common/httpupload.py ===================================== --- a/gajim/common/httpupload.py +++ b/gajim/common/httpupload.py @@ -19,7 +19,7 @@ import threading import ssl import urllib from urllib.request import Request, urlopen -from urllib.parse import urlparse +from urllib.parse import urlparse, quote import io import mimetypes import logging @@ -187,7 +187,7 @@ class ConnectionHTTPUpload: id_ = app.get_an_id() iq.setID(id_) request = iq.setTag(name="request", namespace=NS_HTTPUPLOAD) - request.addChild('filename', payload=os.path.basename(file.path)) + request.addChild('filename', payload=quote(os.path.basename(file.path))) request.addChild('size', payload=file.size) request.addChild('content-type', payload=file.mime) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/711f3cbbb0f58f91f3b4e8b8bb90d8396f… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/711f3cbbb0f58f91f3b4e8b8bb90d8396f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Some status codes should only be in our presence
by Philipp Hörist 04 Apr '18

04 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 898ac966 by Philipp Hörist at 2018-04-04T22:16:46+02:00 Some status codes should only be in our presence Some Servers broadcast these status codes in every presence which is wrong accoring to the XEP - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -1749,7 +1749,7 @@ class GroupchatControl(ChatControlBase): # status_code # http://www.xmpp.org/extensions/xep-0045.html#registrar-statuscodes-\ # init - if obj.status_code: + if obj.status_code and obj.nick == self.nick: if '110' in obj.status_code: # We just join the room if self.room_jid in app.automatic_rooms[self.account] and \ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/898ac9664796ef8fe16b1caeefa261cdc7… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/898ac9664796ef8fe16b1caeefa261cdc7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add missing return statement
by Philipp Hörist 04 Apr '18

04 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1b8d76bf by Philipp Hörist at 2018-04-04T22:10:34+02:00 Add missing return statement - - - - - 1 changed file: - gajim/common/multimedia_helpers.py Changes: ===================================== gajim/common/multimedia_helpers.py ===================================== --- a/gajim/common/multimedia_helpers.py +++ b/gajim/common/multimedia_helpers.py @@ -38,6 +38,7 @@ class DeviceManager(object): element = Gst.ElementFactory.make(name, '%spresencetest' % name) if element is None: log.warning('could not create %spresencetest', name) + return if hasattr(element.props, 'device'): element.set_state(Gst.State.READY) devices = element.get_properties('device') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1b8d76bf9e2584adb89d6ad213ef942e34… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1b8d76bf9e2584adb89d6ad213ef942e34… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] when adding bookmark, check server validity on focus out only. Fixes #7879
by Yann Leboulanger 04 Apr '18

04 Apr '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 2ea9fc69 by Yann Leboulanger at 2018-04-04T15:16:41+02:00 when adding bookmark, check server validity on focus out only. Fixes #7879 - - - - - 1 changed file: - gajim/config.py Changes: ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -1966,7 +1966,8 @@ class ManageBookmarksWindow: self.nick_entry = self.xml.get_object('nick_entry') self.nick_entry.connect('changed', self.on_nick_entry_changed) self.server_entry = self.xml.get_object('server_entry') - self.server_entry.connect('changed', self.on_server_entry_changed) + self.server_entry.connect('focus-out-event', + self.on_server_entry_focus_out) self.room_entry = self.xml.get_object('room_entry') self.room_entry_changed_id = self.room_entry.connect('changed', self.on_room_entry_changed) @@ -2172,7 +2173,7 @@ class ManageBookmarksWindow: return True model[iter_][6] = nick - def on_server_entry_changed(self, widget): + def on_server_entry_focus_out(self, widget, event): if self.ignore_events: return (model, iter_) = self.selection.get_selected() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2ea9fc693252319e48a35883502ba0cd66… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2ea9fc693252319e48a35883502ba0cd66… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Use XMPP logo in add contact dialog for XMPP protocol. Fixes #9049
by Yann Leboulanger 04 Apr '18

04 Apr '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 8e144e46 by Yann Leboulanger at 2018-04-04T14:42:10+02:00 Use XMPP logo in add contact dialog for XMPP protocol. Fixes #9049 - - - - - 17ae4e4c by Yann Leboulanger at 2018-04-04T14:46:46+02:00 Hide protocol combobox when adding contacts if only XMPP is available - - - - - 2 changed files: - + gajim/data/icons/hicolor/scalable/status/xmpp.svg - gajim/dialogs.py Changes: ===================================== gajim/data/icons/hicolor/scalable/status/xmpp.svg ===================================== --- /dev/null +++ b/gajim/data/icons/hicolor/scalable/status/xmpp.svg @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'> +<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="181.44px" viewBox="0 0 176.486 181.437" width="176.49px" version="1.1" y="0px" x="0px" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 176.486 181.437"> +<linearGradient id="SVGID_1_" y2=".00048828" gradientUnits="userSpaceOnUse" x2="-1807.2" gradientTransform="translate(1916)" y1="125.86" x1="-1807.2"> + <stop stop-color="#1b3967" offset=".011"/> + <stop stop-color="#13b5ea" offset=".467"/> + <stop stop-color="#002b5c" offset=".9945"/> +</linearGradient> +<path d="m136.29 14.189c0.077 1.313-1.786 0.968-1.786 2.293 0 38.551-44.72 96.831-89.847 108.19v1.182c59.957-5.51 126.73-66.8 128.24-125.85l-36.6 14.189z" fill="url(#SVGID_1_)"/> +<path d="m120.23 17.96c0.077 1.313 0.121 2.633 0.121 3.958 0 38.551-30.7 90.497-75.827 101.86v1.637c59.065-3.823 105.81-63.023 105.81-109.2 0-2.375-0.125-4.729-0.371-7.056l-29.73 8.796z" fill="#E96D1F"/> +<linearGradient id="SVGID_2_" y2="1.279e-13" gradientUnits="userSpaceOnUse" x2="-1073.2" gradientTransform="matrix(-1 0 0 1 -1008.2 0)" y1="126.85" x1="-1073.2"> + <stop stop-color="#1b3967" offset=".011"/> + <stop stop-color="#13b5ea" offset=".467"/> + <stop stop-color="#002b5c" offset=".9945"/> +</linearGradient> +<path d="m150.34 8.76l-7.833 2.625c0.041 0.963 0.191 2.203 0.191 3.173 0 41.219-37.272 98.205-87.274 107.12-3.243 1.089-7.538 2.077-10.93 2.932v1.639c68.344-8.66 111.18-71.719 105.84-117.49z" fill="#D9541E"/> +<path d="m36.599 14.189c-0.077 1.313 1.787 0.968 1.787 2.293 0 38.551 46.558 97.366 91.688 108.73v1.639c-59.953-5.52-128.56-67.8-130.07-126.85l36.599 14.189z" fill="url(#SVGID_2_)"/> +<path d="m54.731 18.932c-0.076 1.313-0.12 2.63-0.12 3.957 0 38.551 30.699 90.497 75.827 101.86v1.639c-59.044-2.79-105.81-63.024-105.81-109.2 0-2.375 0.128-4.729 0.371-7.056l29.73 8.798z" fill="#A0CE67"/> +<path d="m24.713 9.583l7.617 2.722c-0.041 0.962-0.066 2.254-0.066 3.225 0 41.219 37.271 98.204 87.272 107.12 3.245 1.088 7.538 2.077 10.932 2.931v1.638c-65.254-5.56-111.1-71.866-105.76-117.64z" fill="#439639"/> + <path d="m14.576 166.71l-13.388-14.65h11.643l9.127 10.268 9.129-10.268h11.643l-13.387 14.646 14.401 14.728h-12.09l-9.697-10.67-9.693 10.67h-12.092l14.404-14.73z"/> + <path d="m47.096 152.06h13.836l10.183 18.905 10.183-18.905h13.832v29.374h-8.762v-21.096h-0.08l-11.807 21.096h-6.733l-11.807-21.096h-0.082v21.096h-8.764v-29.37z"/> + <path d="m101.25 152.06h24.546c8.559 0 10.628 4.302 10.628 10.063v2.516c0 4.381-1.908 9.41-8.275 9.41h-17.894v7.385h-9.005v-29.38zm9 14.69h13.997c2.109 0 2.924-1.377 2.924-3.123v-1.135c0-1.99-0.976-3.127-3.694-3.127h-13.227v7.38z"/> + <path d="m141.31 152.06h24.546c8.561 0 10.63 4.302 10.63 10.063v2.516c0 4.381-1.907 9.41-8.275 9.41h-17.893v7.385h-9.008v-29.38zm9.01 14.69h13.996c2.11 0 2.922-1.377 2.922-3.123v-1.135c0-1.99-0.974-3.127-3.693-3.127h-13.225v7.38z"/> +</svg> ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -937,8 +937,7 @@ class AddNewContactWindow: uf_type = {'jabber': 'XMPP', 'aim': 'AIM', 'gadu-gadu': 'Gadu Gadu', 'icq': 'ICQ', 'msn': 'MSN', 'yahoo': 'Yahoo'} # Jabber as first - online_icon = gtkgui_helpers.get_iconset_name_for('online') - liststore.append(['XMPP', online_icon, 'jabber']) + liststore.append(['XMPP', 'xmpp', 'jabber']) for type_ in self.agents: if type_ == 'jabber': continue @@ -1018,6 +1017,9 @@ class AddNewContactWindow: self.account_combobox.set_model(liststore) self.account_combobox.set_active(0) + if len(self.agents) == 1: + self.protocol_hbox.hide() + if self.account: message_buffer = self.message_textview.get_buffer() msg = helpers.from_one_line(helpers.get_subscription_request_msg( View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/dc58586a7ad51ad8447c1a9ada257a2a5… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/dc58586a7ad51ad8447c1a9ada257a2a5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] mark string as translatable. Fixes #9050
by Yann Leboulanger 04 Apr '18

04 Apr '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: dc58586a by Yann Leboulanger at 2018-04-04T14:23:12+02:00 mark string as translatable. Fixes #9050 - - - - - 1 changed file: - gajim/data/gui/contact_context_menu.ui Changes: ===================================== gajim/data/gui/contact_context_menu.ui ===================================== --- a/gajim/data/gui/contact_context_menu.ui +++ b/gajim/data/gui/contact_context_menu.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkAccelGroup" id="accelgroup1"/> @@ -218,7 +218,7 @@ <child> <object class="GtkMenuItem" id="information_menuitem"> <property name="can_focus">False</property> - <property name="label">_Information</property> + <property name="label" translatable="yes">_Information</property> <property name="use_underline">True</property> </object> </child> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dc58586a7ad51ad8447c1a9ada257a2a57… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dc58586a7ad51ad8447c1a9ada257a2a57… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Catch decrypted-message-received event in ChatControl
by Philipp Hörist 03 Apr '18

03 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4caa4971 by Philipp Hörist at 2018-04-04T01:13:02+02:00 Catch decrypted-message-received event in ChatControl It makes more sense to catch the event with ChatControl than with the RosterWindow. RosterWindow is only used now if no ChatControl is open. - - - - - 3 changed files: - gajim/chat_control.py - gajim/roster_window.py - gajim/session.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -242,6 +242,9 @@ class ChatControl(ChatControlBase): app.ged.register_event_handler( 'mam-decrypted-message-received', ged.GUI1, self._nec_mam_decrypted_message_received) + app.ged.register_event_handler( + 'decrypted-message-received', + ged.GUI1, self._nec_decrypted_message_received) # PluginSystem: adding GUI extension point for this ChatControl # instance object @@ -822,6 +825,36 @@ class ChatControl(ChatControlBase): encrypted=obj.encrypted, correct_id=obj.correct_id, msg_stanza_id=obj.message_id, additional_data=obj.additional_data) + def _nec_decrypted_message_received(self, obj): + if not obj.msgtxt: + return True + if obj.conn.name != self.account: + return + if obj.mtype != 'chat': + return + if obj.session.control != self: + return + + typ = '' + xep0184_id = None + if obj.mtype == 'error': + typ = 'error' + if obj.forwarded and obj.sent: + typ = 'out' + if obj.jid != app.get_jid_from_account(obj.conn.name): + xep0184_id = obj.id_ + self.print_conversation(obj.msgtxt, typ, + tim=obj.timestamp, encrypted=obj.encrypted, subject=obj.subject, + xhtml=obj.xhtml, displaymarking=obj.displaymarking, + msg_log_id=obj.msg_log_id, msg_stanza_id=obj.id_, correct_id=obj.correct_id, + xep0184_id=xep0184_id, additional_data=obj.additional_data) + if obj.msg_log_id: + pw = self.parent_win + end = self.conv_textview.autoscroll + if not pw or (pw.get_active_control() and self \ + == pw.get_active_control() and pw.is_active() and end): + app.logger.set_read_messages([obj.msg_log_id]) + def _message_sent(self, obj): if obj.conn.name != self.account: return @@ -1164,6 +1197,9 @@ class ChatControl(ChatControlBase): app.ged.remove_event_handler( 'mam-decrypted-message-received', ged.GUI1, self._nec_mam_decrypted_message_received) + app.ged.remove_event_handler( + 'decrypted-message-received', + ged.GUI1, self._nec_decrypted_message_received) self.unsubscribe_events() ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -2695,8 +2695,6 @@ class RosterWindow: self.draw_account(obj.conn.name) def _nec_decrypted_message_received(self, obj): - if not obj.msgtxt: # empty message text - return True if obj.mtype not in ('normal', 'chat'): return if obj.mtype == 'normal' and obj.popup: @@ -2706,28 +2704,8 @@ class RosterWindow: message=obj.msgtxt, resource=obj.resource, session=obj.session, form_node=obj.form_node) return - if obj.session.control and obj.mtype == 'chat': - typ = '' - xep0184_id = None - if obj.mtype == 'error': - typ = 'error' - if obj.forwarded and obj.sent: - typ = 'out' - if obj.jid != app.get_jid_from_account(obj.conn.name): - xep0184_id = obj.id_ - - obj.session.control.print_conversation(obj.msgtxt, typ, - tim=obj.timestamp, encrypted=obj.encrypted, subject=obj.subject, - xhtml=obj.xhtml, displaymarking=obj.displaymarking, - msg_log_id=obj.msg_log_id, msg_stanza_id=obj.id_, correct_id=obj.correct_id, - xep0184_id=xep0184_id, additional_data=obj.additional_data) - if obj.msg_log_id: - pw = obj.session.control.parent_win - end = obj.session.control.conv_textview.autoscroll - if not pw or (pw.get_active_control() and obj.session.control \ - == pw.get_active_control() and pw.is_active() and end): - app.logger.set_read_messages([obj.msg_log_id]) - elif obj.popup and obj.mtype == 'chat': + + if obj.popup and obj.mtype == 'chat' and not obj.session.control: contact = app.contacts.get_contact(obj.conn.name, obj.jid) obj.session.control = app.interface.new_chat(contact, obj.conn.name, session=obj.session) ===================================== gajim/session.py ===================================== --- a/gajim/session.py +++ b/gajim/session.py @@ -40,7 +40,7 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession): def __init__(self, conn, jid, thread_id, type_='chat'): stanza_session.EncryptedStanzaSession.__init__(self, conn, jid, thread_id, type_='chat') - app.ged.register_event_handler('decrypted-message-received', ged.GUI1, + app.ged.register_event_handler('decrypted-message-received', ged.PREGUI, self._nec_decrypted_message_received) self.control = None View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4caa4971b24668b10207a376a1fcf97dd8… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4caa4971b24668b10207a376a1fcf97dd8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove event handler on ChatControl Shutdown
by Philipp Hörist 03 Apr '18

03 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8a4264c9 by Philipp Hörist at 2018-04-04T00:00:08+02:00 Remove event handler on ChatControl Shutdown - - - - - 1 changed file: - gajim/chat_control.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -1161,6 +1161,9 @@ class ChatControl(ChatControlBase): self._nec_caps_received) app.ged.remove_event_handler('message-sent', ged.OUT_POSTCORE, self._message_sent) + app.ged.remove_event_handler( + 'mam-decrypted-message-received', + ged.GUI1, self._nec_mam_decrypted_message_received) self.unsubscribe_events() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8a4264c94e4990d4fddabbce290004d143… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8a4264c94e4990d4fddabbce290004d143… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Catch invalid IQ stanzas and log them
by Philipp Hörist 03 Apr '18

03 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: f29d57e5 by Philipp Hörist at 2018-04-03T19:54:09+02:00 Catch invalid IQ stanzas and log them Fixes #9044 - - - - - 1 changed file: - gajim/common/protocol/bytestream.py Changes: ===================================== gajim/common/protocol/bytestream.py ===================================== --- a/gajim/common/protocol/bytestream.py +++ b/gajim/common/protocol/bytestream.py @@ -673,7 +673,10 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): # if we want to respect xep-0065 we have to check for proxy # activation result in any result iq real_id = iq_obj.getAttr('id') - if not real_id.startswith('au_'): + if real_id is None: + log.warning('Invalid IQ without id attribute:\n%s', iq_obj) + raise nbxmpp.NodeProcessed + if real_id is None or not real_id.startswith('au_'): return frm = self._ft_get_from(iq_obj) id_ = real_id[3:] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f29d57e50be7feb077d838d491a07be0eb… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f29d57e50be7feb077d838d491a07be0eb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont call show_all() on AboutDialog
by Philipp Hörist 02 Apr '18

02 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 199f1c74 by Philipp Hörist at 2018-04-02T21:37:08+02:00 Dont call show_all() on AboutDialog Fixes #9038 - - - - - 1 changed file: - gajim/dialogs.py Changes: ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -1321,12 +1321,7 @@ class AboutDialog(Gtk.AboutDialog): self.connect( 'response', lambda dialog, *args: Gtk.AboutDialog.do_close(dialog)) - self.show_all() - - # GTK Bug, We have to manually hide the License Button - # Bug exists only on Windows - if os.name == 'nt': - self.get_action_area().get_children()[1].hide() + self.show() class Dialog(Gtk.Dialog): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/199f1c74ff929667da9595b5c6dfdb08cb… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/199f1c74ff929667da9595b5c6dfdb08cb… You're receiving this email because of your account on dev.gajim.org.

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