Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim
Commits:
9e4d3c75 by Philipp Hörist at 2017-08-10T23:38:08+02:00
Make method static
Or we would need to pass `self` as an argument
- - - - -
1 changed file:
- src/common/connection_handlers_events.py
Changes:
=====================================
src/common/connection_handlers_events.py
=====================================
--- a/src/common/connection_handlers_events.py
+++ b/src/common/connection_handlers_events.py
@@ -2537,6 +2537,7 @@ class NotificationEvent(nec.NetworkIncomingEvent):
self.do_popup = False
+ @staticmethod
def get_path_to_generic_or_avatar(generic, jid=None, suffix=None):
"""
Choose between avatar image and default image
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9e4d3c75156f2a88052d20b366ac525202…
---
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9e4d3c75156f2a88052d20b366ac525202…
You're receiving this email because of your account on dev.gajim.org.
Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim
Commits:
2ce5012b by Yann Leboulanger at 2017-08-10T22:05:31+02:00
don't show audio error when it's not an audio error. Fixes #8614
- - - - -
7c84d52c by Yann Leboulanger at 2017-08-10T22:05:31+02:00
don't close the socket we're using to tranfer file. Fixes #8657
- - - - -
2 changed files:
- src/common/socks5.py
- src/gui_interface.py
Changes:
=====================================
src/common/socks5.py
=====================================
--- a/src/common/socks5.py
+++ b/src/common/socks5.py
@@ -597,7 +597,8 @@ class Socks5(object):
pass
self.file = None
# Close file we're receiving into
- if self.file_props.fd:
+ if self.file_props.fd and self.state >= 7:
+ # file opened and it's the Sock we're using to transfer
try:
self.file_props.fd.close()
except Exception:
=====================================
src/gui_interface.py
=====================================
--- a/src/gui_interface.py
+++ b/src/gui_interface.py
@@ -1330,7 +1330,7 @@ class Interface:
account = obj.conn.name
ctrl = (self.msg_win_mgr.get_control(obj.fjid, account)
or self.msg_win_mgr.get_control(obj.jid, account))
- if ctrl:
+ if ctrl and obj.sid == ctrl.audio_sid:
ctrl.set_audio_state('error', reason=obj.reason)
def handle_event_roster_item_exchange(self, obj):
View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c19bad88b557cc4ad1e8ef1dfa656252f…
---
View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c19bad88b557cc4ad1e8ef1dfa656252f…
You're receiving this email because of your account on dev.gajim.org.
Philipp Hörist pushed to branch master at gajim / gajim
Commits:
a25a38ed by Philipp Hörist at 2017-08-10T11:04:21+02:00
Correctly destroy all windows on quit()
Not all Dialogs have a window instance, some inherit Gtk.Window
- - - - -
5a7a6766 by Philipp Hörist at 2017-08-10T11:07:57+02:00
Fix rare bug in scroll_to_end()
- - - - -
2 changed files:
- gajim/gtkgui_helpers.py
- gajim/roster_window.py
Changes:
=====================================
gajim/gtkgui_helpers.py
=====================================
--- a/gajim/gtkgui_helpers.py
+++ b/gajim/gtkgui_helpers.py
@@ -334,6 +334,10 @@ def scroll_to_end(widget):
bool: The return value is False so it can be used with GLib.idle_add.
"""
adj_v = widget.get_vadjustment()
+ if adj_v is None:
+ # This can happen when the Widget is already destroyed when called
+ # from GLib.idle_add
+ return False
max_scroll_pos = adj_v.get_upper() - adj_v.get_page_size()
adj_v.set_value(max_scroll_pos)
=====================================
gajim/roster_window.py
=====================================
--- a/gajim/roster_window.py
+++ b/gajim/roster_window.py
@@ -2395,7 +2395,10 @@ class RosterWindow:
if isinstance(w, dict):
self.close_all_from_dict(w)
else:
- w.window.destroy()
+ try:
+ w.window.destroy()
+ except AttributeError:
+ w.destroy()
def close_all(self, account, force=False):
"""
View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/174e88024dcee6ea7a225c9fb62ce824c…
---
View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/174e88024dcee6ea7a225c9fb62ce824c…
You're receiving this email because of your account on dev.gajim.org.