Commits August 2017

commits@gajim.org

1 participants
94 discussions

[Git][gajim/gajim][master] fix error when someone changes nick ina room
by Yann Leboulanger 17 Aug '17

17 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: a47bb9f0 by Yann Leboulanger at 2017-08-17T21:40:00+02:00 fix error when someone changes nick ina room - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -1722,10 +1722,10 @@ class GroupchatControl(ChatControlBase): s = _('%(nick)s is now known as %(new_nick)s') % { 'nick': nick, 'new_nick': obj.new_nick} tv = self.conv_textview - if obj.nick in tv.last_received_message_marks: - tv.last_received_message_marks[obj.new_nick] = \ - tv.last_received_message_marks[obj.nick] - del tv.last_received_message_marks[obj.nick] + if obj.nick in tv.last_received_message_id: + tv.last_received_message_id[obj.new_nick] = \ + tv.last_received_message_id[obj.nick] + del tv.last_received_message_id[obj.nick] if obj.nick in self.last_received_txt: self.last_received_txt[obj.new_nick] = \ self.last_received_txt[obj.nick] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a47bb9f03c224cb8ea038ba58c75f9f066… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a47bb9f03c224cb8ea038ba58c75f9f066… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] add missing config options to save pm position and size
by Yann Leboulanger 17 Aug '17

17 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: cfbf45cd by Yann Leboulanger at 2017-08-17T15:03:40+02:00 add missing config options to save pm position and size - - - - - 2 changed files: - gajim/common/config.py - gajim/message_window.py Changes: ===================================== gajim/common/config.py ===================================== --- a/gajim/common/config.py +++ b/gajim/common/config.py @@ -153,6 +153,10 @@ class Config: 'gc-msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide 'gc-msgwin-width': [opt_int, 600], 'gc-msgwin-height': [opt_int, 440], + 'pm-msgwin-x-position': [opt_int, -1], # Default is to let the window manager decide + 'pm-msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide + 'pm-msgwin-width': [opt_int, 480], + 'pm-msgwin-height': [opt_int, 440], 'single-msg-x-position': [opt_int, 0], 'single-msg-y-position': [opt_int, 0], 'single-msg-width': [opt_int, 400], ===================================== gajim/message_window.py ===================================== --- a/gajim/message_window.py +++ b/gajim/message_window.py @@ -1019,8 +1019,6 @@ class MessageWindowMgr(GObject.GObject): size = (gajim.config.get_per('accounts', acct, 'msgwin-width'), gajim.config.get_per('accounts', acct, 'msgwin-height')) elif self.mode in (self.ONE_MSG_WINDOW_NEVER, self.ONE_MSG_WINDOW_PERTYPE): - if type_ == message_control.TYPE_PM: - type_ = message_control.TYPE_CHAT opt_width = type_ + '-msgwin-width' opt_height = type_ + '-msgwin-height' size = (gajim.config.get(opt_width), gajim.config.get(opt_height)) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cfbf45cdf7fddf3f73075efa59f2a091d1… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cfbf45cdf7fddf3f73075efa59f2a091d1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Forget all unused streamhosts when we use one of our proposed streamhosts
by Yann Leboulanger 16 Aug '17

16 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 09bcbc0c by Yann Leboulanger at 2017-08-16T23:05:43+02:00 Forget all unused streamhosts when we use one of our proposed streamhosts - - - - - 2bb5ad7b by Yann Leboulanger at 2017-08-16T23:06:05+02:00 fix DnD of files on roster - - - - - 4 changed files: - gajim/common/helpers.py - gajim/common/jingle_ftstates.py - gajim/common/socks5.py - gajim/filetransfers_window.py Changes: ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -555,7 +555,7 @@ def build_command(executable, parameter): return command def get_file_path_from_dnd_dropped_uri(uri): - path = urllib.parse.unquote(uri.decode('utf-8')) # escape special chars + path = urllib.parse.unquote(uri) # escape special chars path = path.strip('\r\n\x00') # remove \r\n and NULL # get the path to file if re.match('^file:///[a-zA-Z]:/', path): # windows ===================================== gajim/common/jingle_ftstates.py ===================================== --- a/gajim/common/jingle_ftstates.py +++ b/gajim/common/jingle_ftstates.py @@ -159,8 +159,7 @@ class StateTransfering(JingleFileTransferStates): mode = 'server' streamhost_used = self.jft.nominated_cand['peer-cand'] gajim.socks5queue.remove_client(self.jft.file_props.transport_sid) -# our_cand = self.jft.nominated_cand['our-cand'] -# gajim.socks5queue.remove_receiver(our_cand['idx']) + gajim.socks5queue.remove_other_servers(streamhost_used['host']) if streamhost_used['type'] == 'proxy': self.jft.file_props.is_a_proxy = True if self.jft.file_props.type_ == 's' and self.jft.weinitiate: ===================================== gajim/common/socks5.py ===================================== --- a/gajim/common/socks5.py +++ b/gajim/common/socks5.py @@ -398,12 +398,11 @@ class SocksQueue: sender = self.senders[key] if do_disconnect: sender.disconnect() - else: - self.idlequeue.unplug_idle(sender.fd) - self.idlequeue.remove_timeout(sender.fd) - del(self.senders[key]) - if self.connected > 0: - self.connected -= 1 + self.idlequeue.unplug_idle(sender.fd) + self.idlequeue.remove_timeout(sender.fd) + del(self.senders[key]) + if self.connected > 0: + self.connected -= 1 def remove_receiver(self, idx, do_disconnect=True, remove_all=False): """ @@ -448,6 +447,11 @@ class SocksQueue: def remove_client(self, transport_sid, do_disconnect=True): self.remove_by_mode(transport_sid, 'client') + def remove_other_servers(self, host_to_keep): + for (key, sock) in self.senders.copy().items(): + if sock.host != host_to_keep and sock.mode == 'server': + self.remove_sender_by_key(key) + class Socks5(object): def __init__(self, idlequeue, host, port, initiator, target, sid): if host is not None: ===================================== gajim/filetransfers_window.py ===================================== --- a/gajim/filetransfers_window.py +++ b/gajim/filetransfers_window.py @@ -212,8 +212,8 @@ class FileTransfersWindow: sectext += recipient if file_props.type_ == 'r': sectext += '\n\t' + _('Saved in: %s') % file_path - dialog = dialogs.HigDialog(None, Gtk.MessageType.INFO, Gtk.ButtonsType.NONE, - _('File transfer completed'), sectext) + dialog = dialogs.HigDialog(gajim.interface.roster.window, Gtk.MessageType.INFO, + Gtk.ButtonsType.NONE, _('File transfer completed'), sectext) if file_props.type_ == 'r': button = Gtk.Button.new_with_mnemonic(_('Open _Containing Folder')) button.connect('clicked', on_open, file_props) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/99b27b448474f91f42687a8302feb261e… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/99b27b448474f91f42687a8302feb261e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] correctly compute file hash when file is received
by Yann Leboulanger 16 Aug '17

16 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 99b27b44 by Yann Leboulanger at 2017-08-16T22:03:17+02:00 correctly compute file hash when file is received - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -996,7 +996,8 @@ class Interface: file_props=file_props)) else: ft.set_status(file_props, 'stop') - if file_props.stalled or file_props.paused: + if not file_props.completed and (file_props.stalled or \ + file_props.paused): return if file_props.type_ == 'r': # we receive a file View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/99b27b448474f91f42687a8302feb261ed… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/99b27b448474f91f42687a8302feb261ed… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] XMLConsole: Use glade file for building widgets
by Philipp Hörist 16 Aug '17

16 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1211a1bc by Philipp Hörist at 2017-08-16T19:05:13+02:00 XMLConsole: Use glade file for building widgets - - - - - 3 changed files: - data/gui/xml_console_window.ui - data/style/gajim.css - gajim/dialogs.py Changes: ===================================== data/gui/xml_console_window.ui ===================================== --- a/data/gui/xml_console_window.ui +++ b/data/gui/xml_console_window.ui @@ -1,368 +1,155 @@ <?xml version="1.0" encoding="UTF-8"?>  <interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkImage" id="image1"> + <requires lib="gtk+" version="3.20"/> + <object class="GtkBox" id="box"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-apply</property> - </object> - <object class="GtkWindow" id="xml_console_window"> - <property name="can_focus">False</property> - <property name="border_width">12</property> - <property name="default_width">550</property> - <property name="default_height">450</property> - <signal name="destroy" handler="on_xml_console_window_destroy" swapped="no"/> - <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> + <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="vbox"> + <object class="GtkPaned" id="paned"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> + <property name="vexpand">True</property> <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label342"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Jabber Traffic</property> - <property name="use_markup">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> <child> - <object class="GtkScrolledWindow" id="scrolledwindow43"> - <property name="height_request">100</property> + <object class="GtkScrolledWindow" id="scrolled"> + <property name="height_request">400</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="shadow_type">in</property> <child> - <object class="GtkTextView" id="stanzas_log_textview"> + <object class="GtkTextView" id="textview"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="editable">False</property> - <property name="wrap_mode">char</property> + <property name="cursor_visible">False</property> </object> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="resize">True</property> + <property name="shrink">False</property> </packing> </child> <child> - <object class="GtkBox" id="hbox2988"> + <object class="GtkScrolledWindow" id="scrolled_input"> + <property name="height_request">150</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkCheckButton" id="enable_checkbutton"> - <property name="label" translatable="yes" comments="XML Console enable checkbutton">_Enable</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_enable_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="shadow_type">in</property> <child> - <object class="GtkButton" id="clear_button"> - <property name="label">gtk-clear</property> + <object class="GtkTextView" id="input"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_clear_button_clicked" swapped="no"/> </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> + <property name="resize">False</property> + <property name="shrink">False</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkActionBar" id="actionbar"> + <property name="name">actionbar</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + </object> + <object class="GtkHeaderBar" id="headerbar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="title">XML Console</property> + <property name="has_subtitle">False</property> + <property name="show_close_button">True</property> + <child> + <object class="GtkSwitch"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="valign">center</property> + <property name="active">True</property> + <signal name="notify::active" handler="on_enable" swapped="no"/> + </object> + </child> + </object> + <object class="GtkPopover" id="popover"> + <property name="can_focus">False</property> + <property name="valign">start</property> + <child> + <object class="GtkListBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="selection_mode">none</property> + <signal name="row-activated" handler="on_row_activated" swapped="no"/> <child> - <object class="GtkExpander" id="expander1"> + <object class="GtkListBoxRow"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="spacing">6</property> <child> - <object class="GtkBox" id="input_vbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkBox" id="hbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkCheckButton" id="in_stanza_checkbutton"> - <property name="label" translatable="yes">Hide IN stanzas</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="xalign">0.5</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_in_stanza_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="out_stanza_checkbutton"> - <property name="label" translatable="yes">Hide OUT stanzas</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="xalign">0.5</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_out_stanza_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="presence_stanza_checkbutton"> - <property name="label" translatable="yes">Hide Presence stanzas</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="xalign">0.5</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_presence_stanza_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="iq_stanza_checkbutton"> - <property name="label" translatable="yes">Hide IQ stanzas</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="xalign">0.5</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_iq_stanza_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="message_stanza_checkbutton"> - <property name="label" translatable="yes">Hide Message stanzas</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="xalign">0.5</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_message_stanza_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="hbox2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label2"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Filter</property> - <property name="use_markup">True</property> - <property name="xalign">0</property> + <property name="label" translatable="yes">Message</property> </object> </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> </child> <child> - <object class="GtkExpander" id="expander"> + <object class="GtkListBoxRow"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="spacing">6</property> - <signal name="activate" handler="on_expander_activate" swapped="no"/> <child> - <object class="GtkBox" id="input_vbox"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow42"> - <property name="height_request">150</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTextView" id="input_textview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="wrap_mode">char</property> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButtonBox" id="hbuttonbox31"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="iq_button"> - <property name="label" translatable="yes" comments="Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))">_IQ</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Info/Query</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_iq_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="presence_button"> - <property name="label" translatable="yes">_Presence</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_presence_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="message_button"> - <property name="label" translatable="yes">_Message</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_message_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="send_button"> - <property name="label" translatable="yes">_Send</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="image">image1</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_send_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> + <property name="label" translatable="yes">Presence</property> </object> </child> - <child type="label"> - <object class="GtkLabel" id="label343"> + </object> + </child> + <child> + <object class="GtkListBoxRow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <child> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">XML Input</property> - <property name="use_markup">True</property> - <property name="xalign">0</property> + <property name="label" translatable="yes">Iq</property> </object> </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> </child> </object> </child> + <style> + <class name="PopoverButtonListbox"/> + </style> + </object> + <object class="GtkMenuButton" id="menubutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Presets</property> + <property name="popover">popover</property> + <child> + <placeholder/> + </child> </object> </interface> ===================================== data/style/gajim.css ===================================== --- a/data/style/gajim.css +++ b/data/style/gajim.css @@ -37,6 +37,7 @@ popover#EmoticonPopover flowboxchild { padding-top: 5px; padding-bottom: 5px; } #OptionsDialog list > row.activatable:active { box-shadow: none; } /* Generic Popover Menu with Buttons */ -.PopoverButtonListbox { margin-top: 10px; margin-bottom: 10px; } -.PopoverButtonListbox > row { padding: 10px 20px 10px 20px; } -.PopoverButtonListbox row.activatable:active { box-shadow: none; background-color: @theme_selected_bg_color } +.PopoverButtonListbox { padding-left: 0px; padding-right: 0px; } +.PopoverButtonListbox > list { margin-top: 10px; margin-bottom: 10px; } +.PopoverButtonListbox > list > row { padding: 10px 20px 10px 20px; } +.PopoverButtonListbox > list > row.activatable:active { box-shadow: none; background-color: @theme_selected_bg_color } ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -3352,19 +3352,6 @@ class XMLConsoleWindow(Gtk.Window): def __init__(self, account): Gtk.Window.__init__(self) self.account = account - self.set_default_size(600, 600) - self.connect("destroy", self.on_destroy) - - headerbar = Gtk.HeaderBar() - headerbar.set_title(_('XML Console')) - headerbar.set_show_close_button(True) - self.set_titlebar(headerbar) - - switch = Gtk.Switch() - switch.set_active(True) - switch.connect("notify::active", self.on_enable) - headerbar.pack_start(switch) - self.enabled = True self.presence = True self.message = True @@ -3373,31 +3360,18 @@ class XMLConsoleWindow(Gtk.Window): self.incoming = True self.outgoing = True - self.textview = Gtk.TextView() - self.textview.set_size_request(-1, 400) - self.textview.set_editable(False) - self.textview.set_cursor_visible(False) - self.textview.set_hexpand(True) - - self.scrolled = Gtk.ScrolledWindow() - self.scrolled.add(self.textview) - - self.input = Gtk.TextView() - self.input.show() - self.input.set_vexpand(True) + glade_objects = ['textview', 'input', 'scrolled_input', 'headerbar', + 'scrolled', 'actionbar', 'paned', 'box', 'menubutton'] + self.builder = gtkgui_helpers.get_gtk_builder('xml_console_window.ui') + for obj in glade_objects: + setattr(self, obj, self.builder.get_object(obj)) - self.scrolled_input = Gtk.ScrolledWindow() - self.scrolled_input.set_size_request(-1, 150) - self.scrolled_input.add(self.input) + self.set_titlebar(self.headerbar) + self.set_default_size(600, 600) + self.add(self.box) - self.paned = Gtk.VPaned() - self.paned.set_vexpand(True) - self.paned.pack1(self.scrolled, True, False) - self.paned.pack2(self.scrolled_input, False, False) self.paned.set_position(self.paned.get_property('max-position')) - self.actionbar = Gtk.ActionBar() - button = gtkgui_helpers.get_image_button( 'edit-clear-all-symbolic', 'Clear') button.connect('clicked', self.on_clear) @@ -3417,45 +3391,17 @@ class XMLConsoleWindow(Gtk.Window): button.connect('clicked', self.on_send) self.actionbar.pack_end(button) - listbox = Gtk.ListBox() - context = listbox.get_style_context() - context.add_class('PopoverButtonListbox') - - label = Gtk.Label(label='Message') - listbox.add(label) - - label = Gtk.Label(label='Presence') - listbox.add(label) - - label = Gtk.Label(label='Iq') - listbox.add(label) - listbox.show_all() - listbox.set_selection_mode(Gtk.SelectionMode.NONE) - listbox.connect('row-activated', self.on_row_activated) - - popover = Gtk.Popover() - popover.add(listbox) - - self.menubutton = Gtk.MenuButton() - self.menubutton.set_direction(Gtk.ArrowType.UP) - self.menubutton.set_popover(popover) - self.menubutton.set_tooltip_text(_('Presets')) - self.menubutton.set_no_show_all(True) - self.actionbar.pack_start(self.menubutton) - box = Gtk.Box.new(Gtk.Orientation.VERTICAL, 0) - box.add(self.paned) - box.add(self.actionbar) - - self.add(box) - - self.connect('key_press_event', self.on_key_press_event) - self.create_tags() self.show_all() self.scrolled_input.hide() + self.menubutton.hide() + + self.connect("destroy", self.on_destroy) + self.connect('key_press_event', self.on_key_press_event) + self.builder.connect_signals(self) gajim.ged.register_event_handler('stanza-received', ged.GUI1, self._nec_stanza_received) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1211a1bc59a94863fa737ae2a86700f4b8… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1211a1bc59a94863fa737ae2a86700f4b8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] use correct SID in Jingle FT to compute hostname of SOCKS5 connection. Fixes #8703
by Yann Leboulanger 16 Aug '17

16 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 21e144d8 by Yann Leboulanger at 2017-08-16T15:27:35+02:00 use correct SID in Jingle FT to compute hostname of SOCKS5 connection. Fixes #8703 - - - - - 8 changed files: - gajim/common/connection_handlers_events.py - gajim/common/jingle.py - gajim/common/jingle_ft.py - gajim/common/jingle_ftstates.py - gajim/common/jingle_session.py - gajim/common/protocol/bytestream.py - gajim/common/socks5.py - gajim/filetransfers_window.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -2328,6 +2328,7 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): si = self.stanza.getTag('si') self.file_props = FilesProp.getNewFileProp(self.conn.name, si.getAttr('id')) + self.file_props.transport_sid = self.file_props.sid profile = si.getAttr('profile') if profile != nbxmpp.NS_FILE: self.conn.send_file_rejection(self.file_props, code='400', ===================================== gajim/common/jingle.py ===================================== --- a/gajim/common/jingle.py +++ b/gajim/common/jingle.py @@ -171,6 +171,7 @@ class ConnectionJingle(object): file_props=file_props, use_security=use_security, senders=senders) + file_props.transport_sid = transport.sid file_props.algo = self.__hash_support(contact) jingle.add_content('file' + helpers.get_random_string_16(), c) jingle.start_session() ===================================== gajim/common/jingle_ft.py ===================================== --- a/gajim/common/jingle_ft.py +++ b/gajim/common/jingle_ft.py @@ -237,8 +237,9 @@ class JingleFileTransfer(JingleContent): if self.use_security: fingerprint = 'client' if self.transport.type_ == TransportType.SOCKS5: + sid = self.file_props.transport_sid gajim.socks5queue.connect_to_hosts(self.session.connection.name, - self.file_props.sid, + sid, self.on_connect, self._on_connect_error, fingerprint=fingerprint, @@ -286,7 +287,7 @@ class JingleFileTransfer(JingleContent): self.__state_changed(State.TRANSFERING) raise nbxmpp.NodeProcessed else: - args = {'cand_error' : True} + args = {'candError' : True} self.__state_changed(State.CAND_RECEIVED, args) return if cand_used: ===================================== gajim/common/jingle_ftstates.py ===================================== --- a/gajim/common/jingle_ftstates.py +++ b/gajim/common/jingle_ftstates.py @@ -53,10 +53,8 @@ class StateInitialized(JingleFileTransferStates): fingerprint = 'client' # Connect to the candidate host, on success call on_connect method gajim.socks5queue.connect_to_hosts(self.jft.session.connection.name, - self.jft.file_props.sid, - self.jft.on_connect, - self.jft._on_connect_error, - fingerprint=fingerprint) + self.jft.file_props.transport_sid, self.jft.on_connect, + self.jft._on_connect_error, fingerprint=fingerprint) class StateCandSent(JingleFileTransferStates): @@ -156,11 +154,11 @@ class StateTransfering(JingleFileTransferStates): if self.jft.is_our_candidate_used(): mode = 'client' streamhost_used = self.jft.nominated_cand['our-cand'] - gajim.socks5queue.remove_server(self.jft.file_props.sid) + gajim.socks5queue.remove_server(self.jft.file_props.transport_sid) else: mode = 'server' streamhost_used = self.jft.nominated_cand['peer-cand'] - gajim.socks5queue.remove_client(self.jft.file_props.sid) + gajim.socks5queue.remove_client(self.jft.file_props.transport_sid) # our_cand = self.jft.nominated_cand['our-cand'] # gajim.socks5queue.remove_receiver(our_cand['idx']) if streamhost_used['type'] == 'proxy': @@ -187,7 +185,7 @@ class StateTransfering(JingleFileTransferStates): else: raise TypeError self.jft.file_props.streamhost_used = True - streamhost_used['sid'] = self.jft.file_props.sid + streamhost_used['sid'] = self.jft.file_props.transport_sid self.jft.file_props.streamhosts = [] self.jft.file_props.streamhosts.append(streamhost_used) self.jft.file_props.proxyhosts = [] @@ -203,9 +201,8 @@ class StateTransfering(JingleFileTransferStates): file_props=self.jft.file_props) else: sockobj = Socks5ReceiverClient(gajim.idlequeue, streamhost_used, - sid=self.jft.file_props.sid, - file_props=self.jft.file_props, - fingerprint=None) + transport_sid=self.jft.file_props.transport_sid, + file_props=self.jft.file_props, fingerprint=None) sockobj.proxy = True sockobj.streamhost = streamhost_used gajim.socks5queue.add_sockobj(self.jft.session.connection.name, @@ -214,8 +211,8 @@ class StateTransfering(JingleFileTransferStates): # If we offered the nominated candidate used, we activate # the proxy if not self.jft.is_our_candidate_used(): - gajim.socks5queue.on_success[self.jft.file_props.sid] = \ - self.jft.transport._on_proxy_auth_ok + gajim.socks5queue.on_success[self.jft.file_props.transport_sid]\ + = self.jft.transport._on_proxy_auth_ok # TODO: add on failure else: jid = gajim.get_jid_without_resource(self.jft.session.ourjid) ===================================== gajim/common/jingle_session.py ===================================== --- a/gajim/common/jingle_session.py +++ b/gajim/common/jingle_session.py @@ -415,7 +415,6 @@ class JingleSession: self.contents[(creator, name)].state = State.TRANSPORT_REPLACE self.__ack(stanza, jingle, error, action) self.__session_accept() - self.contents[(creator, name)].start_IBB_transfer() else: stanza, jingle = self.__make_jingle('transport-reject') content = jingle.setTag('content', attrs={'creator': creator, ===================================== gajim/common/protocol/bytestream.py ===================================== --- a/gajim/common/protocol/bytestream.py +++ b/gajim/common/protocol/bytestream.py @@ -678,7 +678,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): return frm = self._ft_get_from(iq_obj) id_ = real_id[3:] - file_props = FilesProp.getFilePropBySid(id_) + file_props = FilesProp.getFilePropByTransportSid(self.name, id_) if file_props.streamhost_used: for host in file_props.proxyhosts: if host['initiator'] == frm and 'idx' in host: ===================================== gajim/common/socks5.py ===================================== --- a/gajim/common/socks5.py +++ b/gajim/common/socks5.py @@ -102,21 +102,21 @@ class SocksQueue: if file_props.streamhost_used == True: for proxy in file_props.proxyhosts: if proxy['host'] == streamhost['host']: - self.on_success[file_props.sid](proxy) + self.on_success[file_props.transport_sid](proxy) return 1 return 0 for host in file_props.streamhosts: if streamhost['state'] == 1: return 0 streamhost['state'] = 1 - self.on_success[file_props.sid](streamhost) + self.on_success[file_props.transport_sid](streamhost) return 1 - def connect_to_hosts(self, account, sid, on_success=None, on_failure=None, - fingerprint=None, receiving=True): - self.on_success[sid] = on_success - self.on_failure[sid] = on_failure - file_props = FilesProp.getFileProp(account, sid) + def connect_to_hosts(self, account, transport_sid, on_success=None, + on_failure=None, fingerprint=None, receiving=True): + self.on_success[transport_sid] = on_success + self.on_failure[transport_sid] = on_failure + file_props = FilesProp.getFilePropByTransportSid(account, transport_sid) file_props.failure_cb = on_failure streamhosts_to_test = [] # Remove local IPs to not connect to ourself @@ -125,7 +125,7 @@ class SocksQueue: continue streamhosts_to_test.append(streamhost) if not streamhosts_to_test: - on_failure(file_props.sid) + on_failure(file_props.transport_sid) # add streamhosts to the queue for streamhost in streamhosts_to_test: if 'type' in streamhost and streamhost['type'] == 'proxy': @@ -141,7 +141,7 @@ class SocksQueue: streamhost['jid']) file_props.type_ = 'r' socks5obj = Socks5ReceiverClient(self.idlequeue, streamhost, - sid, file_props, fingerprint=fp) + transport_sid, file_props, fingerprint=fp) self.add_sockobj(account, socks5obj) else: if 'candidate_id' in streamhost: @@ -223,7 +223,7 @@ class SocksQueue: host['state'] = 0 # FIXME: make the sender reconnect also client = Socks5ReceiverClient(self.idlequeue, host, - host['sid'], file_props) + client.sid, file_props) self.add_sockobj(client.account, client) host['idx'] = client.queue_idx # we still have chances to connect @@ -256,7 +256,7 @@ class SocksQueue: self.readers = {} # failure_cb exists - this means that it has never been called if file_props.failure_cb: - file_props.failure_cb(file_props.sid) + file_props.failure_cb(file_props.transport_sid) file_props.failure_cb = None def add_sockobj(self, account, sockobj): @@ -284,7 +284,7 @@ class SocksQueue: ''' Adds the sockobj to the current list of sockobjects ''' - keys = (file_props.sid, file_props.name, hash_) + keys = (file_props.transport_sid, file_props.name, hash_) sockobjects[keys] = sockobj def result_sha(self, sha_str, idx): @@ -320,13 +320,7 @@ class SocksQueue: def send_file(self, file_props, account, mode): for key in self.senders.keys(): - if self.senders == {}: - # Python acts very weird with this. When there is no keys - # in the dictionary It says that it has a key. - # Maybe it is my machine. Without this there is a KeyError - # traceback. - return - if file_props.name in key and file_props.sid in key \ + if file_props.name in key and file_props.transport_sid in key \ and self.senders[key].mode == mode: log.info('socks5: sending file') sender = self.senders[key] @@ -364,8 +358,8 @@ class SocksQueue: sh['initiator'] = None sh['target'] = None sockobj = Socks5ReceiverServer(idlequeue=self.idlequeue, - streamhost=sh,sid=None, file_props=listener.file_props, - fingerprint=None) + streamhost=sh,transport_sid=None, + file_props=listener.file_props, fingerprint=None) self._add(sockobj, self.readers, listener.file_props, sock_hash) sockobj.set_sock(sock[0]) @@ -440,19 +434,19 @@ class SocksQueue: self.listener = None self.connected -= 1 - def remove_by_mode(self, sid, mode, do_disconnect=True): + def remove_by_mode(self, transport_sid, mode, do_disconnect=True): for (key, sock) in self.senders.copy().items(): - if key[0] == sid and sock.mode == mode: + if key[0] == transport_sid and sock.mode == mode: self.remove_sender_by_key(key) for (key, sock) in self.readers.copy().items(): - if key[0] == sid and sock.mode == mode: + if key[0] == transport_sid and sock.mode == mode: self.remove_receiver_by_key(key) - def remove_server(self, sid, do_disconnect=True): - self.remove_by_mode(sid, 'server') + def remove_server(self, transport_sid, do_disconnect=True): + self.remove_by_mode(transport_sid, 'server') - def remove_client(self, sid, do_disconnect=True): - self.remove_by_mode(sid, 'client') + def remove_client(self, transport_sid, do_disconnect=True): + self.remove_by_mode(transport_sid, 'client') class Socks5(object): def __init__(self, idlequeue, host, port, initiator, target, sid): @@ -838,15 +832,10 @@ class Socks5(object): """ Parse the initial message and create a list of auth mechanisms """ - auth_mechanisms = [] - try: - num_auth = struct.unpack('!xB', buff[:2])[0] - for i in range(num_auth): - mechanism, = struct.unpack('!B', buff[1 + i]) - auth_mechanisms.append(mechanism) - except Exception: + if buff[0] != 5: return None - return auth_mechanisms + num_auth = buff[1] + return list(buff[2:2+num_auth]) def _get_auth_response(self): """ @@ -882,7 +871,7 @@ class Socks5(object): host, = '.'.join(str(s) for s in host_arr) host_len = len(host) elif host_type == 0x03: - host_len, = struct.unpack('!B', buff[4]) + host_len = buff[4] host, = struct.unpack('!%ds' % host_len, buff[5:5 + host_len]) portlen = len(buff[host_len + 5:]) if portlen == 1: @@ -1031,6 +1020,7 @@ class Socks5Receiver(IdleObject): self.connect_timeout = 0 self.connected = False self.pauses = 0 + self.sid = sid self.file_props = file_props self.file_props.disconnect_cb = self.disconnect self.file_props.error = 0 @@ -1349,7 +1339,7 @@ class Socks5SenderClient(Socks5Client, Socks5Sender): port=None, fingerprint = None, connected=True, file_props=None, initiator=None, target=None): Socks5Client.__init__(self, idlequeue, host, port, initiator, target, - file_props.sid) + file_props.transport_sid) Socks5Sender.__init__(self,idlequeue, sock_hash, parent,_sock, host, port, fingerprint , connected, file_props) @@ -1359,30 +1349,30 @@ class Socks5SenderServer(Socks5Server, Socks5Sender): def __init__(self, idlequeue, sock_hash, parent,_sock, host=None, port=None, fingerprint = None, connected=True, file_props=None): Socks5Server.__init__(self, idlequeue, host, port, None, None, - file_props.sid) + file_props.transport_sid) Socks5Sender.__init__(self,idlequeue, sock_hash, parent, _sock, host, port, fingerprint , connected, file_props) class Socks5ReceiverClient(Socks5Client, Socks5Receiver): - def __init__(self, idlequeue, streamhost, sid, file_props=None, + def __init__(self, idlequeue, streamhost, transport_sid, file_props=None, fingerprint=None): Socks5Client.__init__(self, idlequeue, streamhost['host'], int(streamhost['port']), streamhost['initiator'], - streamhost['target'], sid) - Socks5Receiver.__init__(self, idlequeue, streamhost, sid, file_props, - fingerprint) + streamhost['target'], transport_sid) + Socks5Receiver.__init__(self, idlequeue, streamhost, transport_sid, + file_props, fingerprint) class Socks5ReceiverServer(Socks5Server, Socks5Receiver): - def __init__(self, idlequeue, streamhost, sid, file_props=None, + def __init__(self, idlequeue, streamhost, transport_sid, file_props=None, fingerprint=None): Socks5Server.__init__(self, idlequeue, streamhost['host'], int(streamhost['port']), streamhost['initiator'], - streamhost['target'], sid) - Socks5Receiver.__init__(self, idlequeue, streamhost, sid, file_props, - fingerprint) + streamhost['target'], transport_sid) + Socks5Receiver.__init__(self, idlequeue, streamhost, transport_sid, + file_props, fingerprint) class Socks5Listener(IdleObject): ===================================== gajim/filetransfers_window.py ===================================== --- a/gajim/filetransfers_window.py +++ b/gajim/filetransfers_window.py @@ -365,6 +365,7 @@ class FileTransfersWindow: self.add_transfer(account, contact, file_props) else: log.info("contact does not support jingle file transfer") + file_props.transport_sid = file_props.sid gajim.connections[account].send_file_request(file_props) self.add_transfer(account, contact, file_props) return True @@ -661,7 +662,7 @@ class FileTransfersWindow: if transfered_size == full_size: # If we are receiver and this is a jingle session if file_props.type_ == 'r' and \ - file_props.session_type == 'jingle' and file_props.hash_: + file_props.session_type == 'jingle' and file_props.hash_: # Show that we are computing the hash self.set_status(file_props, 'computing') else: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/21e144d89d8299c786f42d9424e03e04d3… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/21e144d89d8299c786f42d9424e03e04d3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] XMLConsole: Fix size allocate warning
by Philipp Hörist 15 Aug '17

15 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4f4a58e5 by Philipp Hörist at 2017-08-15T19:45:42+02:00 XMLConsole: Fix size allocate warning It seems to be important to let all widgets realize and then hide the ones we dont want to show, instead of not showing them in the first place. - - - - - 1 changed file: - gajim/dialogs.py Changes: ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -3389,7 +3389,6 @@ class XMLConsoleWindow(Gtk.Window): self.scrolled_input = Gtk.ScrolledWindow() self.scrolled_input.set_size_request(-1, 150) self.scrolled_input.add(self.input) - self.scrolled_input.set_no_show_all(True) self.paned = Gtk.VPaned() self.paned.set_vexpand(True) @@ -3456,6 +3455,8 @@ class XMLConsoleWindow(Gtk.Window): self.create_tags() self.show_all() + self.scrolled_input.hide() + gajim.ged.register_event_handler('stanza-received', ged.GUI1, self._nec_stanza_received) gajim.ged.register_event_handler('stanza-sent', ged.GUI1, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4f4a58e51a53ce7986d527af146649ec80… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4f4a58e51a53ce7986d527af146649ec80… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add method for creating image buttons
by Philipp Hörist 15 Aug '17

15 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4ad5fd9c by Philipp Hörist at 2017-08-15T19:23:23+02:00 Add method for creating image buttons - - - - - 2 changed files: - gajim/dialogs.py - gajim/gtkgui_helpers.py Changes: ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -3399,41 +3399,23 @@ class XMLConsoleWindow(Gtk.Window): self.actionbar = Gtk.ActionBar() - icon = gtkgui_helpers.get_icon_pixmap('edit-clear-all-symbolic') - image = Gtk.Image() - image.set_from_pixbuf(icon) - button = Gtk.Button() - button.set_tooltip_text(_('Clear')) + button = gtkgui_helpers.get_image_button( + 'edit-clear-all-symbolic', 'Clear') button.connect('clicked', self.on_clear) - button.set_image(image) self.actionbar.pack_start(button) - icon = gtkgui_helpers.get_icon_pixmap('applications-system-symbolic') - image = Gtk.Image() - image.set_from_pixbuf(icon) - button = Gtk.Button() - button.set_tooltip_text(_('Filter')) + button = gtkgui_helpers.get_image_button( + 'applications-system-symbolic', 'Filter') button.connect('clicked', self.on_filter_options) - button.set_image(image) self.actionbar.pack_start(button) - icon = gtkgui_helpers.get_icon_pixmap('document-edit-symbolic') - image = Gtk.Image() - image.set_from_pixbuf(icon) - button = Gtk.ToggleButton() - button.set_tooltip_text(_('XML Input')) - button.set_active(False) + button = gtkgui_helpers.get_image_button( + 'document-edit-symbolic', 'XML Input', toggle=True) button.connect('toggled', self.on_input) - button.set_image(image) self.actionbar.pack_start(button) - icon = gtkgui_helpers.get_icon_pixmap('emblem-ok-symbolic') - image = Gtk.Image() - image.set_from_pixbuf(icon) - button = Gtk.Button() - button.set_tooltip_text(_('Send')) + button = gtkgui_helpers.get_image_button('emblem-ok-symbolic', 'Send') button.connect('clicked', self.on_send) - button.set_image(image) self.actionbar.pack_end(button) listbox = Gtk.ListBox() ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -106,6 +106,18 @@ def add_image_to_button(button, icon_name): img.set_from_file(path_img) button.set_image(img) +def get_image_button(icon_name, tooltip, toggle=False): + icon = get_icon_pixmap(icon_name) + image = Gtk.Image() + image.set_from_pixbuf(icon) + if toggle: + button = Gtk.ToggleButton() + else: + button = Gtk.Button() + button.set_tooltip_text(_(tooltip)) + button.set_image(image) + return button + GUI_DIR = os.path.join(gajim.DATA_DIR, 'gui') def get_gtk_builder(file_name, widget=None): file_path = os.path.join(GUI_DIR, file_name) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4ad5fd9cdc2382f7a1c420cb65520967d7… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4ad5fd9cdc2382f7a1c420cb65520967d7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Revert "use netifaces to get local IPs if available. Fixes #8666"
by Yann Leboulanger 14 Aug '17

14 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: d9948452 by Yann Leboulanger at 2017-08-14T18:36:40+02:00 Revert "use netifaces to get local IPs if available. Fixes #8666" This reverts commit b9c363e9cdf578b8421d2e2a4a12dee8701ff271. - - - - - 9ce6299e by Yann Leboulanger at 2017-08-14T18:37:11+02:00 use netifaces to get local IPs if available. Fixes #8666 - - - - - 3 changed files: - README - gajim/common/jingle_transport.py - gajim/common/socks5.py Changes: ===================================== README ===================================== --- a/README +++ b/README @@ -38,7 +38,6 @@ <li>gir1.2-gupnpigd-1.0 for better NAT traversing</li> <li>gir1.2-networkmanager-1.0 for network lose detection</li> <li>python3-idna and python3-precis-i18n for correctly parsing JIDs</li> -<li>python3-netifaces to get local IPs to send files</li> </ul> Some distributions also split too much python standard library. I know SUSE does. In such distros you also need python-xml the xml lib that *comes* with python and not pyxml or whatever. ===================================== gajim/common/jingle_transport.py ===================================== --- a/gajim/common/jingle_transport.py +++ b/gajim/common/jingle_transport.py @@ -181,7 +181,7 @@ class JingleTransportSocks5(JingleTransport): def _add_local_ips_as_candidates(self): if not gajim.config.get_per('accounts', self.connection.name, - 'ft_send_local_ips'): + 'ft_send_local_ips'): return if not self.connection: return @@ -224,6 +224,49 @@ class JingleTransportSocks5(JingleTransport): except socket.gaierror: pass # ignore address-related errors for getaddrinfo + try: + from netifaces import interfaces, ifaddresses, AF_INET, AF_INET6 + for ifaceName in interfaces(): + addresses = ifaddresses(ifaceName) + if AF_INET in addresses: + for address in addresses[AF_INET]: + addr = address['addr'] + if addr in hosts or addr.startswith('127.'): + continue + candidate = { + 'host': addr, + 'candidate_id': self.connection.connection.getAnID(), + 'port': port, + 'type': 'direct', + 'jid': self.ourjid, + 'priority': priority, + 'initiator': self.file_props.sender, + 'target': self.file_props.receiver + } + hosts.add(addr) + local_ip_cand.append(candidate) + if AF_INET6 in addresses: + for address in addresses[AF_INET6]: + addr = address['addr'] + if addr in hosts or addr.startswith('::1') or \ + addr.count(':') != 7: + continue + candidate = { + 'host': addr, + 'candidate_id': self.connection.connection.getAnID(), + 'port': port, + 'type': 'direct', + 'jid': self.ourjid, + 'priority': priority, + 'initiator': self.file_props.sender, + 'target': self.file_props.receiver + } + hosts.add(addr) + local_ip_cand.append(candidate) + + except ImportError: + pass + self._add_candidates(local_ip_cand) def _add_additional_candidates(self): ===================================== gajim/common/socks5.py ===================================== --- a/gajim/common/socks5.py +++ b/gajim/common/socks5.py @@ -205,8 +205,6 @@ class SocksQueue: connection failure cb. If there are some which are still not connected try to establish connection to one of them """ - print(client) - print(streamhost) self.idlequeue.remove_timeout(client.fd) self.idlequeue.unplug_idle(client.fd) file_props = client.file_props @@ -225,7 +223,7 @@ class SocksQueue: host['state'] = 0 # FIXME: make the sender reconnect also client = Socks5ReceiverClient(self.idlequeue, host, - client.sid, file_props) + host['sid'], file_props) self.add_sockobj(client.account, client) host['idx'] = client.queue_idx # we still have chances to connect @@ -1033,7 +1031,6 @@ class Socks5Receiver(IdleObject): self.connect_timeout = 0 self.connected = False self.pauses = 0 - self.sid = sid self.file_props = file_props self.file_props.disconnect_cb = self.disconnect self.file_props.error = 0 View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b9c363e9cdf578b8421d2e2a4a12dee87… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b9c363e9cdf578b8421d2e2a4a12dee87… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] use netifaces to get local IPs if available. Fixes #8666
by Yann Leboulanger 14 Aug '17

14 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: b9c363e9 by Yann Leboulanger at 2017-08-14T16:43:44+02:00 use netifaces to get local IPs if available. Fixes #8666 - - - - - 2 changed files: - README - gajim/common/socks5.py Changes: ===================================== README ===================================== --- a/README +++ b/README @@ -38,6 +38,7 @@ <li>gir1.2-gupnpigd-1.0 for better NAT traversing</li> <li>gir1.2-networkmanager-1.0 for network lose detection</li> <li>python3-idna and python3-precis-i18n for correctly parsing JIDs</li> +<li>python3-netifaces to get local IPs to send files</li> </ul> Some distributions also split too much python standard library. I know SUSE does. In such distros you also need python-xml the xml lib that *comes* with python and not pyxml or whatever. ===================================== gajim/common/socks5.py ===================================== --- a/gajim/common/socks5.py +++ b/gajim/common/socks5.py @@ -205,6 +205,8 @@ class SocksQueue: connection failure cb. If there are some which are still not connected try to establish connection to one of them """ + print(client) + print(streamhost) self.idlequeue.remove_timeout(client.fd) self.idlequeue.unplug_idle(client.fd) file_props = client.file_props @@ -223,7 +225,7 @@ class SocksQueue: host['state'] = 0 # FIXME: make the sender reconnect also client = Socks5ReceiverClient(self.idlequeue, host, - host['sid'], file_props) + client.sid, file_props) self.add_sockobj(client.account, client) host['idx'] = client.queue_idx # we still have chances to connect @@ -1031,6 +1033,7 @@ class Socks5Receiver(IdleObject): self.connect_timeout = 0 self.connected = False self.pauses = 0 + self.sid = sid self.file_props = file_props self.file_props.disconnect_cb = self.disconnect self.file_props.error = 0 View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b9c363e9cdf578b8421d2e2a4a12dee870… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b9c363e9cdf578b8421d2e2a4a12dee870… You're receiving this email because of your account on dev.gajim.org.

1 0

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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2017