Commits August 2013

commits@gajim.org

3 participants
325 discussions

gajim: better way to set outgoing video in chat window
by Yann Leboulanger 01 Aug '13

01 Aug '13

changeset 9e6cfe05c032 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=9e6cfe05c032 description: better way to set outgoing video in chat window diffstat: src/chat_control.py | 6 +++++- src/dialogs.py | 17 ++++++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diffs (45 lines): diff -r d10080b40a4d -r 9e6cfe05c032 src/chat_control.py --- a/src/chat_control.py Wed Jul 31 18:22:55 2013 +0200 +++ b/src/chat_control.py Wed Jul 31 19:15:42 2013 +0200 @@ -2230,9 +2230,13 @@ if gajim.config.get('video_see_self'): fixed = self.xml.get_object('outgoing_fixed') fixed.set_no_show_all(False) + video_hbox.show_all() + out_xid = self.xml.get_object('outgoing_drawingarea').\ + window.xid + else: + out_xid = None video_hbox.show_all() in_xid = self.xml.get_object('incoming_drawingarea').window.xid - out_xid = self.xml.get_object('outgoing_drawingarea').window.xid sid = gajim.connections[self.account].start_video( self.contact.get_full_jid(), in_xid, out_xid) else: diff -r d10080b40a4d -r 9e6cfe05c032 src/dialogs.py --- a/src/dialogs.py Wed Jul 31 18:22:55 2013 +0200 +++ b/src/dialogs.py Wed Jul 31 19:15:42 2013 +0200 @@ -5319,11 +5319,18 @@ if gajim.config.get('video_see_self'): out_xid = ctrl.xml.get_object('outgoing_drawingarea').\ window.xid - b = content.pipeline.get_by_name('bin2') - c = b.get_by_name('autovideosink0') - d = c.get_by_name('autovideosink0-actual-sink-xvimage') - d.set_xwindow_id(out_xid) - content.out_xid = out_xid + b = content.src_bin + found = False + for e in b.elements(): + if e.get_name().startswith('autovideosink'): + found = True + break + if found: + found = False + for f in e.elements(): + if f.get_name().startswith('autovideosink'): + f.set_xwindow_id(out_xid) + content.out_xid = out_xid content.in_xid = in_xid ctrl.set_video_state('connecting', self.sid) # Now, accept the content/sessions.

1 0

gajim: fix more bidi things
by Yann Leboulanger 01 Aug '13

01 Aug '13

changeset 00342dab35c6 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=00342dab35c6 description: fix more bidi things diffstat: src/conversation_textview.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 43bfc5f1f92d -r 00342dab35c6 src/conversation_textview.py --- a/src/conversation_textview.py Thu Aug 01 19:05:00 2013 +0200 +++ b/src/conversation_textview.py Thu Aug 01 22:53:48 2013 +0200 @@ -1432,7 +1432,8 @@ before_str = helpers.from_one_line(before_str) after_str = gajim.config.get('after_nickname') after_str = helpers.from_one_line(after_str) - format_ = direction_mark + before_str + name + after_str + ' ' + format_ = direction_mark + before_str + name + direction_mark + \ + after_str + ' ' buffer_.insert_with_tags_by_name(end_iter, format_, *name_tags) def print_subject(self, subject, iter_=None):

1 0

gajim: always present room JID LTR. Fixes #7402
by Yann Leboulanger 01 Aug '13

01 Aug '13

changeset 43bfc5f1f92d in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=43bfc5f1f92d description: always present room JID LTR. Fixes #7402 diffstat: src/common/i18n.py | 2 +- src/groupchat_control.py | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diffs (47 lines): diff -r cf7a9b63343d -r 43bfc5f1f92d src/common/i18n.py --- a/src/common/i18n.py Wed Jul 31 19:15:42 2013 +0200 +++ b/src/common/i18n.py Thu Aug 01 19:05:00 2013 +0200 @@ -28,7 +28,7 @@ import unicodedata # May be changed after GTK is imported -direction_mark = u'\u200F' +direction_mark = u'\u200E' def paragraph_direction_mark(text): """ diff -r cf7a9b63343d -r 43bfc5f1f92d src/groupchat_control.py --- a/src/groupchat_control.py Wed Jul 31 19:15:42 2013 +0200 +++ b/src/groupchat_control.py Thu Aug 01 19:05:00 2013 +0200 @@ -236,7 +236,8 @@ _('Sending private message failed'), #in second %s code replaces with nickname _('You are no longer in group chat "%(room)s" or ' - '"%(nick)s" has left.') % {'room': room, 'nick': nick}) + '"%(nick)s" has left.') % {'room': u'\u200E' + room, + 'nick': nick}) return ChatControl.send_message(self, message, xhtml=xhtml, @@ -780,7 +781,7 @@ name = self.get_continued_conversation_name() else: name = self.room_jid - text = '<span %s>%s</span>' % (font_attrs, name) + text = '<span %s>%s</span>' % (font_attrs, u'\u200E' + name) self.name_label.set_markup(text) if self.subject: @@ -2189,9 +2190,9 @@ reason, jid) # Ask for a reason - dialogs.DoubleInputDialog(_('Destroying %s') % self.room_jid, - _('You are going to definitively destroy this room.\n' - 'You may specify a reason below:'), + dialogs.DoubleInputDialog(_('Destroying %s') % u'\u200E' + \ + self.room_jid, _('You are going to definitively destroy this \ + room.\nYou may specify a reason below:'), _('You may also enter an alternate venue:'), ok_handler=on_ok) def _on_bookmark_room_menuitem_activate(self, widget):

1 0

gajim: fix encoding issue
by Yann Leboulanger 01 Aug '13

01 Aug '13

changeset 79d286009241 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=79d286009241 description: fix encoding issue diffstat: src/common/socks5.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (16 lines): diff -r ea1feb1fee6c -r 79d286009241 src/common/socks5.py --- a/src/common/socks5.py Thu Aug 01 11:41:37 2013 +0200 +++ b/src/common/socks5.py Thu Aug 01 15:54:07 2013 +0200 @@ -815,8 +815,10 @@ Connect request by domain name, sid sha, instead of domain name (jep 0096) """ - buff = struct.pack('!BBBBB%dsBB' % len(msg), - 0x05, command, 0x00, 0x03, len(msg), msg.encode('utf-8'), 0, 0) + if isinstance(msg, str): + msg = msg.encode('utf-8') + buff = struct.pack('!BBBBB%dsBB' % len(msg), 0x05, command, 0x00, 0x03, + len(msg), msg, 0, 0) return buff def _parse_request_buff(self, buff):

1 0

gajim: Dnd is back
by Yann Leboulanger 01 Aug '13

01 Aug '13

changeset ea1feb1fee6c in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=ea1feb1fee6c description: Dnd is back diffstat: src/common/helpers.py | 2 +- src/roster_window.py | 31 +++++++++++++++++-------------- 2 files changed, 18 insertions(+), 15 deletions(-) diffs (84 lines): diff -r 22207cfaa0c4 -r ea1feb1fee6c src/common/helpers.py --- a/src/common/helpers.py Wed Jul 31 16:40:33 2013 +0200 +++ b/src/common/helpers.py Thu Aug 01 11:41:37 2013 +0200 @@ -410,7 +410,7 @@ return command def get_file_path_from_dnd_dropped_uri(uri): - path = urllib.unquote(uri) # 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 diff -r 22207cfaa0c4 -r ea1feb1fee6c src/roster_window.py --- a/src/roster_window.py Wed Jul 31 16:40:33 2013 +0200 +++ b/src/roster_window.py Thu Aug 01 11:41:37 2013 +0200 @@ -4453,7 +4453,7 @@ data = '' if path.get_depth() >= 2: data = model[path][C_JID] - selection.set(selection.target, 8, data) + selection.set_text(data, -1) def drag_begin(self, treeview, context): self.dragging = True @@ -4619,14 +4619,14 @@ self.remove_contact_from_groups(c_source.jid, account, [grp_source]) - if context.action in (Gdk.DragAction.MOVE, Gdk.DragAction.COPY): + if context.get_action() in (Gdk.DragAction.MOVE, Gdk.DragAction.COPY): context.finish(True, True, etime) def drag_drop(self, treeview, context, x, y, timestamp): target_list = treeview.drag_dest_get_target_list() target = treeview.drag_dest_find_target(context, target_list) - treeview.drag_get_data(context, target) - context.finish(False, True) + treeview.drag_get_data(context, target, 0) + context.finish(False, True, 0) return True def move_group(self, old_name, new_name, account): @@ -4637,14 +4637,15 @@ def drag_data_received_data(self, treeview, context, x, y, selection, info, etime): - treeview.stop_emission('drag_data_received') + treeview.stop_emission_by_name('drag_data_received') drop_info = treeview.get_dest_row_at_pos(x, y) if not drop_info: return - if not selection.data: + data = selection.get_data().decode() + if not data: return # prevents tb when several entrys are dragged model = treeview.get_model() - data = selection.data + path_dest, position = drop_info if position == Gtk.TreeViewDropPosition.BEFORE and len(path_dest) == 2 \ @@ -6611,13 +6612,15 @@ # signals self.TARGET_TYPE_URI_LIST = 80 - TARGETS = [('MY_TREE_MODEL_ROW', - Gtk.TargetFlags.SAME_APP | Gtk.TargetFlags.SAME_WIDGET, 0)] - TARGETS2 = [('MY_TREE_MODEL_ROW', Gtk.TargetFlags.SAME_WIDGET, 0), - ('text/uri-list', 0, self.TARGET_TYPE_URI_LIST)] - self.tree.enable_model_drag_source(Gdk.ModifierType.BUTTON1_MASK, TARGETS, - Gdk.DragAction.DEFAULT | Gdk.DragAction.MOVE | Gdk.DragAction.COPY) - self.tree.enable_model_drag_dest(TARGETS2, Gdk.DragAction.DEFAULT) + self.tree.enable_model_drag_source(Gdk.ModifierType.BUTTON1_MASK, + [], Gdk.DragAction.DEFAULT | Gdk.DragAction.MOVE | \ + Gdk.DragAction.COPY) + self.tree.drag_source_add_text_targets() + self.tree.enable_model_drag_dest([], Gdk.DragAction.DEFAULT) + dst_targets = Gtk.TargetList.new([]) + dst_targets.add_text_targets(0) + dst_targets.add_uri_targets(self.TARGET_TYPE_URI_LIST) + self.tree.drag_dest_set_target_list(dst_targets) self.tree.connect('drag_begin', self.drag_begin) self.tree.connect('drag_end', self.drag_end) self.tree.connect('drag_drop', self.drag_drop)

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 August 2013