Philipp Hörist pushed to branch master at gajim / gajim
Commits:
a3754216 by Daniel Brötzmann at 2019-06-24T20:12:08Z
GroupchatControl: Remove correcting state when minimizing
Minimizing a GroupChatControl should remove the self.correcting state to
avoid being in this state when restoring. Fixes #9580
- - - - -
1 changed file:
- gajim/groupchat_control.py
Changes:
=====================================
gajim/groupchat_control.py
=====================================
@@ -2197,6 +2197,14 @@ class GroupchatControl(ChatControlBase):
win.notebook.remove_page(ctrl_page)
control.unparent()
ctrl.parent_win = None
+
+ # Stop correcting message when we minimize
+ if self.correcting:
+ self.correcting = False
+ gtkgui_helpers.remove_css_class(
+ self.msg_textview, 'gajim-msg-correcting')
+ self.msg_textview.get_buffer().set_text('')
+
con = app.connections[self.account]
con.get_module('Chatstate').set_chatstate(self.contact, Chatstate.INACTIVE)
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a3754216528c7e68217d4f58aeacbb85f1…
--
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a3754216528c7e68217d4f58aeacbb85f1…
You're receiving this email because of your account on dev.gajim.org.
Philipp Hörist pushed to branch master at gajim / gajim
Commits:
ead6d4f2 by Philipp Hörist at 2019-06-22T08:46:10Z
Fix is_groupchat call
is_groupchat is now a property
Fixes #9742
- - - - -
1 changed file:
- gajim/gtk/start_chat.py
Changes:
=====================================
gajim/gtk/start_chat.py
=====================================
@@ -98,7 +98,7 @@ class StartChatDialog(Gtk.ApplicationWindow):
for jid in app.contacts.get_jid_list(account):
contact = app.contacts.get_contact_with_highest_priority(
account, jid)
- if contact.is_groupchat():
+ if contact.is_groupchat:
continue
row = ContactRow(account, contact, jid,
contact.get_shown_name(), show_account)
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ead6d4f2b0a0f8759ed38e74c6cbbcb471…
--
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ead6d4f2b0a0f8759ed38e74c6cbbcb471…
You're receiving this email because of your account on dev.gajim.org.
Philipp Hörist pushed to branch master at gajim / gajim
Commits:
35769b38 by Philipp Hörist at 2019-06-22T08:42:50Z
Dont make showing received marker a user action
- - - - -
1 changed file:
- gajim/conversation_textview.py
Changes:
=====================================
gajim/conversation_textview.py
=====================================
@@ -428,14 +428,12 @@ class ConversationTextview(GObject.GObject):
return
buffer_ = self.tv.get_buffer()
- buffer_.begin_user_action()
if app.config.get('positive_184_ack'):
begin_iter = buffer_.get_iter_at_mark(self.xep0184_marks[id_])
buffer_.insert_with_tags_by_name(begin_iter, ' ✓',
'xep0184-received')
- buffer_.end_user_action()
del self.xep0184_marks[id_]
def show_focus_out_line(self):
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/35769b38c238433bd7583388882e5d9d78…
--
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/35769b38c238433bd7583388882e5d9d78…
You're receiving this email because of your account on dev.gajim.org.
Philipp Hörist pushed to branch master at gajim / gajim
Commits:
3d45a6e0 by Philipp Hörist at 2019-06-21T22:56:09Z
MessageWindow: Allow only JIDs as argument for get_control()
- - - - -
1 changed file:
- gajim/message_window.py
Changes:
=====================================
gajim/message_window.py
=====================================
@@ -732,25 +732,14 @@ class MessageWindow:
def get_origin(self):
return self.window.get_window().get_origin()
- def get_control(self, key, acct):
+ def get_control(self, jid, acct):
"""
- Return the MessageControl for jid or n, where n is a notebook page index.
- When key is an int index acct may be None
+ Return the MessageControl for jid
"""
-
- if isinstance(key, str):
- jid = key
- try:
- return self._controls[acct][jid]
- except Exception:
- return None
- else:
- page_num = key
- notebook = self.notebook
- if page_num is None:
- page_num = notebook.get_current_page()
- nth_child = notebook.get_nth_page(page_num)
- return self._widget_to_control(nth_child)
+ try:
+ return self._controls[acct][jid]
+ except Exception:
+ return None
def has_control(self, jid, acct):
return acct in self._controls and jid in self._controls[acct]
@@ -801,7 +790,9 @@ class MessageWindow:
ind = ind - 1
if ind < 0:
ind = self.notebook.get_n_pages() - 1
- ctrl = self.get_control(ind, None)
+
+ nth_child = self.notebook.get_nth_page(ind)
+ ctrl = self._widget_to_control(nth_child)
if ctrl.get_nb_unread() > 0:
found = True
break # found
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3d45a6e0fc8c8fb805117dd8c347f4bd42…
--
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3d45a6e0fc8c8fb805117dd8c347f4bd42…
You're receiving this email because of your account on dev.gajim.org.