Commits

commits@gajim.org

17632 discussions

gajim: don't allow to browse non-MUC server in join groupchat di...
by Yann Leboulanger 01 Aug '13

01 Aug '13

changeset ca0cbe69a25f in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=ca0cbe69a25f description: don't allow to browse non-MUC server in join groupchat dialog. diffstat: src/common/connection_handlers.py | 24 ++++++++++++-- src/common/connection_handlers_events.py | 9 +++++ src/dialogs.py | 50 ++++++++++++++++++++++++++++++- 3 files changed, 76 insertions(+), 7 deletions(-) diffs (203 lines): diff -r af16b3f443a8 -r ca0cbe69a25f src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Jul 29 22:05:39 2013 +0200 +++ b/src/common/connection_handlers.py Tue Jul 30 20:09:52 2013 +0200 @@ -104,7 +104,8 @@ jid is mandatory; name, node, action is optional. """ - self._discover(nbxmpp.NS_DISCO_ITEMS, jid, node, id_prefix) + id_ = self._discover(nbxmpp.NS_DISCO_ITEMS, jid, node, id_prefix) + self.disco_items_ids.append(id_) def discoverInfo(self, jid, node=None, id_prefix=None): """ @@ -112,7 +113,8 @@ For identity: category, type is mandatory, name is optional. For feature: var is mandatory. """ - self._discover(nbxmpp.NS_DISCO_INFO, jid, node, id_prefix) + id_ = self._discover(nbxmpp.NS_DISCO_INFO, jid, node, id_prefix) + self.disco_info_ids.append(id_) def request_register_agent_info(self, agent): if not self.connection or self.connected < 2: @@ -166,12 +168,14 @@ if not self.connection or self.connected < 2: return iq = nbxmpp.Iq(typ='get', to=jid, queryNS=ns) + id_ = self.connection.getAnID() if id_prefix: - id_ = self.connection.getAnID() - iq.setID('%s%s' % (id_prefix, id_)) + id_ = id_prefix + id_ + iq.setID(id_) if node: iq.setQuerynode(node) self.connection.send(iq) + return id_ def _ReceivedRegInfo(self, con, resp, agent): nbxmpp.features_nb._ReceivedRegInfo(con, resp, agent) @@ -1439,6 +1443,10 @@ self.version_ids = [] # IDs of urn:xmpp:time requests self.entity_time_ids = [] + # IDs of disco#items requests + self.disco_items_ids = [] + # IDs of disco#info requests + self.disco_info_ids = [] # ID of urn:xmpp:ping requests self.awaiting_xmpp_ping_id = None self.continue_connect_info = None @@ -1590,6 +1598,14 @@ gajim.nec.push_incoming_event(TimeResultReceivedEvent(None, conn=self, stanza=obj.stanza)) return True + if obj.id_ in self.disco_items_ids: + gajim.nec.push_incoming_event(AgentItemsErrorReceivedEvent(None, + conn=self, stanza=obj.stanza)) + return True + if obj.id_ in self.disco_info_ids: + gajim.nec.push_incoming_event(AgentInfoErrorReceivedEvent(None, + conn=self, stanza=obj.stanza)) + return True def _nec_private_storate_bookmarks_received(self, obj): if obj.conn.name != self.name: diff -r af16b3f443a8 -r ca0cbe69a25f src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Jul 29 22:05:39 2013 +0200 +++ b/src/common/connection_handlers_events.py Tue Jul 30 20:09:52 2013 +0200 @@ -1929,6 +1929,8 @@ self.get_jid_resource() hostname = gajim.config.get_per('accounts', self.conn.name, 'hostname') self.get_id() + if self.id_ in self.conn.disco_items_ids: + self.conn.disco_items_ids.remove(self.id_) if self.fjid == hostname and self.id_[:6] == 'Gajim_': for item in self.items: self.conn.discoverInfo(item['jid'], id_prefix='Gajim_') @@ -1941,6 +1943,9 @@ def generate(self): self.get_jid_resource() + self.get_id() + if self.id_ in self.conn.disco_items_ids: + self.conn.disco_items_ids.remove(self.id_) return True class AgentInfoReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): @@ -1949,6 +1954,8 @@ def generate(self): self.get_id() + if self.id_ in self.conn.disco_info_ids: + self.conn.disco_info_ids.remove(self.id_) if self.id_ is None: log.warn('Invalid IQ received without an ID. Ignoring it: %s' % \ self.stanza) @@ -1993,6 +2000,8 @@ def generate(self): self.get_jid_resource() self.get_id() + if self.id_ in self.conn.disco_info_ids: + self.conn.disco_info_ids.remove(self.id_) return True class FileRequestReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): diff -r af16b3f443a8 -r ca0cbe69a25f src/dialogs.py --- a/src/dialogs.py Mon Jul 29 22:05:39 2013 +0200 +++ b/src/dialogs.py Tue Jul 30 20:09:52 2013 +0200 @@ -32,6 +32,7 @@ import gtk import gobject import os +import nbxmpp import gtkgui_helpers import vcard @@ -2407,6 +2408,11 @@ if 'jabber' in gajim.connections[account].muc_jid: server_list.append(gajim.connections[account].muc_jid['jabber']) + entry = self.server_comboboxentry.child + entry.connect('changed', self.on_server_entry_changed) + self.browse_button = self.xml.get_object('browse_rooms_button') + self.browse_button.set_sensitive(False) + self.recently_combobox = self.xml.get_object('recently_combobox') liststore = gtk.ListStore(str, str) self.recently_combobox.set_model(liststore) @@ -2451,12 +2457,22 @@ if account and not gajim.connections[account].private_storage_supported: self.xml.get_object('bookmark_checkbutton').set_sensitive(False) + self.requested_jid = None + gajim.ged.register_event_handler('agent-info-received', ged.GUI1, + self._nec_agent_info_received) + gajim.ged.register_event_handler('agent-info-error-received', ged.GUI1, + self._nec_agent_info_error_received) + self.window.show_all() def on_join_groupchat_window_destroy(self, widget): """ Close window """ + gajim.ged.remove_event_handler('agent-info-received', ged.GUI1, + self._nec_agent_info_received) + gajim.ged.register_event_handler('agent-info-error-received', ged.GUI1, + self._nec_agent_info_error_received) if self.account and 'join_gc' in gajim.interface.instances[self.account]: # remove us from open windows del gajim.interface.instances[self.account]['join_gc'] @@ -2505,19 +2521,47 @@ def on_browse_rooms_button_clicked(self, widget): server = self.server_comboboxentry.child.get_text().decode('utf-8') - if server in gajim.interface.instances[self.account]['disco']: - gajim.interface.instances[self.account]['disco'][server].window.\ + self.requested_jid = server + gajim.connections[self.account].discoverInfo(server) + + def _nec_agent_info_error_received(self, obj): + if obj.conn.name != self.account: + return + if obj.jid != self.requested_jid: + return + self.requested_jid = None + ErrorDialog(_('Wrong server'), _('%s is not a groupchat server') % \ + obj.jid) + + def _nec_agent_info_received(self, obj): + if obj.conn.name != self.account: + return + if obj.jid != self.requested_jid: + return + self.requested_jid = None + if nbxmpp.NS_MUC not in obj.features: + ErrorDialog(_('Wrong server'), _('%s is not a groupchat server') % \ + obj.jid) + return + if obj.jid in gajim.interface.instances[self.account]['disco']: + gajim.interface.instances[self.account]['disco'][obj.jid].window.\ present() else: try: # Object will add itself to the window dict import disco - disco.ServiceDiscoveryWindow(self.account, server, + disco.ServiceDiscoveryWindow(self.account, obj.jid, initial_identities=[{'category': 'conference', 'type': 'text'}]) except GajimGeneralException: pass + def on_server_entry_changed(self, widget): + if not widget.get_text(): + self.browse_button.set_sensitive(False) + else: + self.browse_button.set_sensitive(True) + def on_cancel_button_clicked(self, widget): """ When Cancel button is clicked

1 0

gajim: don't try to get xid of a non-existing window
by Yann Leboulanger 01 Aug '13

01 Aug '13

changeset d10080b40a4d in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=d10080b40a4d description: don't try to get xid of a non-existing window diffstat: src/dialogs.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (16 lines): diff -r ca0cbe69a25f -r d10080b40a4d src/dialogs.py --- a/src/dialogs.py Tue Jul 30 20:09:52 2013 +0200 +++ b/src/dialogs.py Wed Jul 31 18:22:55 2013 +0200 @@ -5314,10 +5314,11 @@ fixed.set_no_show_all(False) video_hbox.show_all() in_xid = ctrl.xml.get_object('incoming_drawingarea').window.xid - out_xid = ctrl.xml.get_object('outgoing_drawingarea').window.xid content = session.get_content('video') # move outgoing stream to chat window 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')

1 0

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 = '%s' % (font_attrs, name) + text = '%s' % (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

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

31 Jul '13

changeset cf7a9b63343d in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=cf7a9b63343d 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 17b1e19e4f6f -r cf7a9b63343d 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 17b1e19e4f6f -r cf7a9b63343d 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: don't try to get xid of a non-existing window
by Yann Leboulanger 31 Jul '13

31 Jul '13

changeset 17b1e19e4f6f in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=17b1e19e4f6f description: don't try to get xid of a non-existing window diffstat: src/dialogs.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (16 lines): diff -r 77abba75deb0 -r 17b1e19e4f6f src/dialogs.py --- a/src/dialogs.py Tue Jul 30 20:09:52 2013 +0200 +++ b/src/dialogs.py Wed Jul 31 18:22:55 2013 +0200 @@ -5314,10 +5314,11 @@ fixed.set_no_show_all(False) video_hbox.show_all() in_xid = ctrl.xml.get_object('incoming_drawingarea').window.xid - out_xid = ctrl.xml.get_object('outgoing_drawingarea').window.xid content = session.get_content('video') # move outgoing stream to chat window 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')

1 0

gajim: modify_fg/bg/font -> override_*
by Yann Leboulanger 31 Jul '13

31 Jul '13

changeset 22207cfaa0c4 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=22207cfaa0c4 description: modify_fg/bg/font -> override_* diffstat: src/chat_control.py | 24 ++++++++++++++---------- src/conversation_textview.py | 2 +- src/dialogs.py | 17 +++++++++++------ src/disco.py | 11 +++++++---- src/gajim.py | 8 -------- src/groupchat_control.py | 4 ++-- src/gtkexcepthook.py | 2 +- src/gui_interface.py | 2 +- src/ipython_view.py | 2 +- src/tooltips.py | 2 -- 10 files changed, 38 insertions(+), 36 deletions(-) diffs (225 lines): diff -r badca2c87d88 -r 22207cfaa0c4 src/chat_control.py --- a/src/chat_control.py Wed Jul 31 15:05:45 2013 +0200 +++ b/src/chat_control.py Wed Jul 31 16:40:33 2013 +0200 @@ -648,16 +648,20 @@ self.disconnect_style_event(banner_name_label) self.disconnect_style_event(self.banner_status_label) if bgcolor: - banner_eventbox.modify_bg(Gtk.StateType.NORMAL, - Gdk.color_parse(bgcolor)) + color = Gdk.RGBA() + Gdk.RGBA.parse(color, bgcolor) + banner_eventbox.override_background_color(Gtk.StateType.NORMAL, + color) default_bg = False else: default_bg = True if textcolor: - banner_name_label.modify_fg(Gtk.StateType.NORMAL, - Gdk.color_parse(textcolor)) - self.banner_status_label.modify_fg(Gtk.StateType.NORMAL, - Gdk.color_parse(textcolor)) + color = Gdk.RGBA() + Gdk.RGBA.parse(color, textcolor) + banner_name_label.override_background_color(Gtk.StateType.NORMAL, + color) + self.banner_status_label.override_background_color( + Gtk.StateType.NORMAL, color) default_fg = False else: default_fg = True @@ -1183,8 +1187,8 @@ def update_font(self): font = Pango.FontDescription(gajim.config.get('conversation_font')) - self.conv_textview.tv.modify_font(font) - self.msg_textview.modify_font(font) + self.conv_textview.tv.override_font(font) + self.msg_textview.override_font(font) def update_tags(self): self.conv_textview.update_tags() @@ -2434,8 +2438,8 @@ self.conv_textview.correct_last_sent_message(message, xhtml, self.get_our_nick(), old_txt) self.correcting = False - self.msg_textview.modify_base(Gtk.StateType.NORMAL, - self.old_message_tv_color) + self.msg_textview.override_background_color( + Gtk.StateType.NORMAL, self.old_message_tv_color) return self.print_conversation(message, self.contact.jid, encrypted=encrypted, xep0184_id=xep0184_id, xhtml=xhtml, diff -r badca2c87d88 -r 22207cfaa0c4 src/conversation_textview.py --- a/src/conversation_textview.py Wed Jul 31 15:05:45 2013 +0200 +++ b/src/conversation_textview.py Wed Jul 31 16:40:33 2013 +0200 @@ -240,7 +240,7 @@ self.last_time_printout = 0 font = Pango.FontDescription(gajim.config.get('conversation_font')) - self.tv.modify_font(font) + self.tv.override_font(font) buffer_ = self.tv.get_buffer() end_iter = buffer_.get_end_iter() buffer_.create_mark('end', end_iter, False) diff -r badca2c87d88 -r 22207cfaa0c4 src/dialogs.py --- a/src/dialogs.py Wed Jul 31 15:05:45 2013 +0200 +++ b/src/dialogs.py Wed Jul 31 16:40:33 2013 +0200 @@ -2919,7 +2919,9 @@ GLib.markup_escape_text(title)) # set colors [ http://www.pitt.edu/~nisg/cis/web/cgi/rgb.html ] - self.window.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse('black')) + color = Gdk.RGBA() + Gdk.RGBA.parse(color, 'black') + self.window.override_background_color(Gtk.StateType.NORMAL, color) # default image if not path_to_image: @@ -2945,9 +2947,11 @@ bg_color = gajim.config.get('notif_status_color') else: # Unknown event! Shouldn't happen but deal with it bg_color = gajim.config.get('notif_other_color') - popup_bg_color = Gdk.color_parse(bg_color) - close_button.modify_bg(Gtk.StateType.NORMAL, popup_bg_color) - eventbox.modify_bg(Gtk.StateType.NORMAL, popup_bg_color) + popup_bg_color = Gdk.RGBA() + Gdk.RGBA.parse(popup_bg_color, bg_color) + close_button.override_background_color(Gtk.StateType.NORMAL, + popup_bg_color) + eventbox.override_background_color(Gtk.StateType.NORMAL, popup_bg_color) event_description_label.set_markup('%s' % GLib.markup_escape_text(text)) @@ -3337,8 +3341,9 @@ self.enabled = True self.xml.get_object('enable_checkbutton').set_active(True) - self.input_textview.modify_text( - Gtk.StateType.NORMAL, Gdk.color_parse(color)) + col = Gdk.RGBA() + Gdk.RGBA.parse(col, color) + self.input_textview.override_color(Gtk.StateType.NORMAL, col) if len(gajim.connections) > 1: title = _('XML Console for %s') % self.account diff -r badca2c87d88 -r 22207cfaa0c4 src/disco.py --- a/src/disco.py Wed Jul 31 15:05:45 2013 +0200 +++ b/src/disco.py Wed Jul 31 16:40:33 2013 +0200 @@ -645,15 +645,18 @@ textcolor = gajim.config.get_per('themes', theme, 'bannertextcolor') self.disconnect_style_event() if bgcolor: - color = Gdk.color_parse(bgcolor) - self.banner_eventbox.modify_bg(Gtk.StateType.NORMAL, color) + color = Gdk.RGBA() + Gdk.RGBA.parse(color, bgcolor) + self.banner_eventbox.override_background_color(Gtk.StateType.NORMAL, + color) default_bg = False else: default_bg = True if textcolor: - color = Gdk.color_parse(textcolor) - self.banner.modify_fg(Gtk.StateType.NORMAL, color) + color = Gdk.RGBA() + Gdk.RGBA.parse(color, textcolor) + self.banner.override_color(Gtk.StateType.NORMAL, color) default_fg = False else: default_fg = True diff -r badca2c87d88 -r 22207cfaa0c4 src/gajim.py --- a/src/gajim.py Wed Jul 31 15:05:45 2013 +0200 +++ b/src/gajim.py Wed Jul 31 16:40:33 2013 +0200 @@ -193,7 +193,6 @@ warnings.filterwarnings('error', module='gtk') try: from gi.repository import GObject - GObject.threads_init() GObject.set_prgname('gajim') from gi.repository import Gtk from gi.repository import Gdk @@ -464,13 +463,6 @@ interface.run() try: - if os.name != 'nt': - # This makes Gajim unusable under windows, and threads are used only - # for GPG, so not under windows - Gdk.threads_init() - Gdk.threads_enter() Gtk.main() - if os.name != 'nt': - Gdk.threads_leave() except KeyboardInterrupt: print('KeyboardInterrupt', file=sys.stderr) diff -r badca2c87d88 -r 22207cfaa0c4 src/groupchat_control.py --- a/src/groupchat_control.py Wed Jul 31 15:05:45 2013 +0200 +++ b/src/groupchat_control.py Wed Jul 31 16:40:33 2013 +0200 @@ -1958,8 +1958,8 @@ self.last_sent_msg = msg if self.correcting: self.correcting = False - self.msg_textview.modify_base(Gtk.StateType.NORMAL, - self.old_message_tv_color) + self.msg_textview.override_background_color( + Gtk.StateType.NORMAL, self.old_message_tv_color) if self.correcting and self.last_sent_msg: correction_msg = self.last_sent_msg diff -r badca2c87d88 -r 22207cfaa0c4 src/gtkexcepthook.py --- a/src/gtkexcepthook.py Wed Jul 31 15:05:45 2013 +0200 +++ b/src/gtkexcepthook.py Wed Jul 31 16:40:33 2013 +0200 @@ -59,7 +59,7 @@ # Details textview = Gtk.TextView() textview.set_editable(False) - textview.modify_font(Pango.FontDescription('Monospace')) + textview.override_font(Pango.FontDescription('Monospace')) sw = Gtk.ScrolledWindow() sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) sw.add(textview) diff -r badca2c87d88 -r 22207cfaa0c4 src/gui_interface.py --- a/src/gui_interface.py Wed Jul 31 15:05:45 2013 +0200 +++ b/src/gui_interface.py Wed Jul 31 16:40:33 2013 +0200 @@ -2591,7 +2591,7 @@ sw = Gtk.ScrolledWindow() sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) view = IPythonView() - view.modify_font(Pango.FontDescription(font)) + view.override_font(Pango.FontDescription(font)) view.set_wrap_mode(Gtk.WrapMode.CHAR) sw.add(view) window.add(sw) diff -r badca2c87d88 -r 22207cfaa0c4 src/ipython_view.py --- a/src/ipython_view.py Wed Jul 31 15:05:45 2013 +0200 +++ b/src/ipython_view.py Wed Jul 31 16:40:33 2013 +0200 @@ -349,7 +349,7 @@ Initialize console view """ GObject.GObject.__init__(self) - self.modify_font(Pango.FontDescription('Mono')) + self.override_font(Pango.FontDescription('Mono')) self.set_cursor_visible(True) self.text_buffer = self.get_buffer() self.mark = self.text_buffer.create_mark('scroll_mark', diff -r badca2c87d88 -r 22207cfaa0c4 src/tooltips.py --- a/src/tooltips.py Wed Jul 31 15:05:45 2013 +0200 +++ b/src/tooltips.py Wed Jul 31 16:40:33 2013 +0200 @@ -151,7 +151,6 @@ self.preferred_position = [pointer_x, preferred_y] self.widget_height = widget_height - self.win.ensure_style() self.win.show_all() def hide_tooltip(self): @@ -678,7 +677,6 @@ self.win.destroy() self.win = None self.populate(self.cur_data) - self.win.ensure_style() self.win.show_all() def _append_pep_info(self, contact, properties):

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