Commits

commits@gajim.org

17632 discussions

gajim: fix ResourceWarnings. py3 way
by Denis Fomin 02 Jan '13

02 Jan '13

changeset 482ca6487aae in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=482ca6487aae description: fix ResourceWarnings. py3 way diffstat: src/dialogs.py | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-) diffs (52 lines): diff -r 50f829bc02b9 -r 482ca6487aae src/dialogs.py --- a/src/dialogs.py Thu Jan 03 00:55:00 2013 +0400 +++ b/src/dialogs.py Thu Jan 03 03:25:44 2013 +0400 @@ -1270,9 +1270,8 @@ dlg.set_copyright(s) copying_file_path = self.get_path('COPYING') if copying_file_path: - fp = open(copying_file_path) - text = fp.read() - fp.close() + with open(copying_file_path) as a_file: + text = a_file.read() dlg.set_license(text) gtk_ver = '%i.%i.%i' % (Gtk.get_major_version(), @@ -1285,9 +1284,8 @@ authors_file_path = self.get_path('AUTHORS') if authors_file_path: authors = [] - fp = open(authors_file_path) - authors_file = fp.read() - fp.close() + with open(authors_file_path) as a_file: + authors_file = a_file.read() authors_file = authors_file.split('\n') for author in authors_file: if author == 'CURRENT DEVELOPERS:': @@ -1300,10 +1298,8 @@ thanks_file_path = self.get_path('THANKS') if thanks_file_path: authors.append('\n' + _('THANKS:')) - - fp = open(thanks_file_path) - text = fp.read() - fp.close() + with open(thanks_file_path) as a_file: + text = a_file.read() text_splitted = text.split('\n') text = '\n'.join(text_splitted[:-2]) # remove one english sentence # and add it manually as translatable @@ -1323,9 +1319,8 @@ thanks_artists_file_path = self.get_path('THANKS.artists') if thanks_artists_file_path: - fp = open(thanks_artists_file_path) - artists_text = fp.read() - fp.close() + with open(thanks_artists_file_path) as a_file: + artists_text = a_file.read() artists = artists_text.split('\n') dlg.set_artists(artists) # connect close button to destroy() function

1 0

python-nbxmpp: fix HMAC computation
by Yann Leboulanger 02 Jan '13

02 Jan '13

changeset b3824e6bda79 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=b3824e6bda79 description: fix HMAC computation diffstat: nbxmpp/auth_nb.py | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diffs (22 lines): diff -r f374d0edd731 -r b3824e6bda79 nbxmpp/auth_nb.py --- a/nbxmpp/auth_nb.py Wed Jan 02 22:42:32 2013 +0100 +++ b/nbxmpp/auth_nb.py Wed Jan 02 22:50:52 2013 +0100 @@ -378,7 +378,7 @@ s = s.encode('utf-8') except: pass - ui_1 = HMAC(s, (salt + '\0\0\0\01').encode('utf-8')) + ui_1 = HMAC(s, salt + b'\0\0\0\01') ui = ui_1 for i in range(iters - 1): ii += 1 @@ -399,8 +399,7 @@ r += ',r=' + data['r'] self.scram_soup += r self.scram_soup = self.scram_soup.encode('utf-8') - salt = base64.b64decode(data['s'].encode('utf-8')).decode( - 'utf-8') + salt = base64.b64decode(data['s'].encode('utf-8')) iter = int(data['i']) SaltedPassword = Hi(self.password, salt, iter) # TODO: Could cache this, along with salt+iter.

1 0

python-nbxmpp: fix showing pending traceback
by Yann Leboulanger 02 Jan '13

02 Jan '13

changeset f374d0edd731 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=f374d0edd731 description: fix showing pending traceback diffstat: nbxmpp/dispatcher_nb.py | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diffs (27 lines): diff -r 9f4a4fe90ae6 -r f374d0edd731 nbxmpp/dispatcher_nb.py --- a/nbxmpp/dispatcher_nb.py Wed Jan 02 15:36:55 2013 +0100 +++ b/nbxmpp/dispatcher_nb.py Wed Jan 02 22:42:32 2013 +0100 @@ -222,9 +222,8 @@ handler(self) if len(self._pendingExceptions) > 0: _pendingException = self._pendingExceptions.pop() - e = _pendingException[0](_pendingException[1]) - e.__traceback__ = _pendingException[2] - raise e + sys.excepthook(*_pendingException) + return try: self.Stream.Parse(data) # end stream:stream tag received @@ -241,9 +240,8 @@ return 0 if len(self._pendingExceptions) > 0: _pendingException = self._pendingExceptions.pop() - e = _pendingException[0](_pendingException[1]) - e.__traceback__ = _pendingException[2] - raise e + sys.excepthook(*_pendingException) + return if len(data) == 0: return '0' return len(data)

1 0

gajim: fix ResourceWarnings
by Denis Fomin 02 Jan '13

02 Jan '13

changeset 50f829bc02b9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=50f829bc02b9 description: fix ResourceWarnings diffstat: src/dialogs.py | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diffs (47 lines): diff -r d8c90b355eb7 -r 50f829bc02b9 src/dialogs.py --- a/src/dialogs.py Wed Jan 02 23:46:44 2013 +0400 +++ b/src/dialogs.py Thu Jan 03 00:55:00 2013 +0400 @@ -1270,7 +1270,9 @@ dlg.set_copyright(s) copying_file_path = self.get_path('COPYING') if copying_file_path: - text = open(copying_file_path).read() + fp = open(copying_file_path) + text = fp.read() + fp.close() dlg.set_license(text) gtk_ver = '%i.%i.%i' % (Gtk.get_major_version(), @@ -1283,7 +1285,9 @@ authors_file_path = self.get_path('AUTHORS') if authors_file_path: authors = [] - authors_file = open(authors_file_path).read() + fp = open(authors_file_path) + authors_file = fp.read() + fp.close() authors_file = authors_file.split('\n') for author in authors_file: if author == 'CURRENT DEVELOPERS:': @@ -1297,7 +1301,9 @@ if thanks_file_path: authors.append('\n' + _('THANKS:')) - text = open(thanks_file_path).read() + fp = open(thanks_file_path) + text = fp.read() + fp.close() text_splitted = text.split('\n') text = '\n'.join(text_splitted[:-2]) # remove one english sentence # and add it manually as translatable @@ -1317,7 +1323,9 @@ thanks_artists_file_path = self.get_path('THANKS.artists') if thanks_artists_file_path: - artists_text = open(thanks_artists_file_path).read() + fp = open(thanks_artists_file_path) + artists_text = fp.read() + fp.close() artists = artists_text.split('\n') dlg.set_artists(artists) # connect close button to destroy() function

1 0

gajim: fix dict.keys
by Denis Fomin 02 Jan '13

02 Jan '13

changeset d8c90b355eb7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d8c90b355eb7 description: fix dict.keys diffstat: src/chat_control.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 9ad3483d0c75 -r d8c90b355eb7 src/chat_control.py --- a/src/chat_control.py Wed Jan 02 22:13:27 2013 +0400 +++ b/src/chat_control.py Wed Jan 02 23:46:44 2013 +0400 @@ -2700,7 +2700,7 @@ backend=backend) # remove all register handlers on widgets, created by self.xml # to prevent circular references among objects - for i in self.handlers.keys(): + for i in list(self.handlers.keys()): if self.handlers[i].handler_is_connected(i): self.handlers[i].disconnect(i) del self.handlers[i]

1 0

gajim: Merge
by Denis Fomin 02 Jan '13

02 Jan '13

changeset 9ad3483d0c75 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9ad3483d0c75 description: Merge diffstat: plugins/dbus_plugin/plugin.py | 6 +- src/adhoc_commands.py | 9 +- src/advanced_configuration_window.py | 33 +-- src/atom_window.py | 6 +- src/chat_control.py | 12 +- src/command_system/dispatcher.py | 7 +- src/command_system/framework.py | 12 +- src/command_system/implementation/custom.py | 2 +- src/command_system/implementation/execute.py | 8 +- src/command_system/implementation/middleware.py | 7 +- src/command_system/implementation/standard.py | 4 +- src/command_system/mapping.py | 31 +-- src/common/atom.py | 6 +- src/common/caps_cache.py | 11 +- src/common/check_paths.py | 100 +++++----- src/common/commands.py | 26 +- src/common/config.py | 18 +- src/common/configpaths.py | 72 ++++---- src/common/connection.py | 14 +- src/common/connection_handlers.py | 42 ++-- src/common/connection_handlers_events.py | 50 +++- src/common/contacts.py | 10 +- src/common/dataforms.py | 12 +- src/common/dbus_support.py | 18 +- src/common/file_props.py | 2 +- src/common/gajim.py | 25 +- src/common/ged.py | 4 +- src/common/gpg.py | 4 +- src/common/helpers.py | 156 ++++++++--------- src/common/i18n.py | 12 +- src/common/idle.py | 6 +- src/common/jingle.py | 12 +- src/common/jingle_content.py | 4 +- src/common/jingle_ft.py | 8 +- src/common/jingle_ftstates.py | 4 +- src/common/jingle_rtp.py | 17 +- src/common/jingle_session.py | 11 +- src/common/jingle_transport.py | 4 +- src/common/jingle_xtls.py | 11 +- src/common/kwalletbinding.py | 4 +- src/common/logger.py | 67 +++--- src/common/logging_helpers.py | 12 +- src/common/message_archiving.py | 2 +- src/common/multimedia_helpers.py | 2 +- src/common/nec.py | 2 +- src/common/optparser.py | 32 +-- src/common/passwords.py | 2 +- src/common/pep.py | 40 ---- src/common/protocol/bytestream.py | 49 ++-- src/common/proxy65_manager.py | 8 +- src/common/pubsub.py | 14 +- src/common/resolver.py | 27 +- src/common/rst_xhtml_generator.py | 18 +- src/common/sleepy.py | 3 +- src/common/socks5.py | 46 ++-- src/common/stanza_session.py | 2 +- src/common/zeroconf/client_zeroconf.py | 37 +-- src/common/zeroconf/connection_zeroconf.py | 9 +- src/common/zeroconf/roster_zeroconf.py | 12 - src/common/zeroconf/zeroconf_avahi.py | 23 +- src/common/zeroconf/zeroconf_bonjour.py | 8 +- src/config.py | 181 +++++++++----------- src/conversation_textview.py | 14 +- src/dataforms_widget.py | 14 +- src/dialogs.py | 114 ++++++------ src/disco.py | 61 +++--- src/features_window.py | 2 +- src/filetransfers_window.py | 34 +- src/gajim-remote.py | 33 +-- src/gajim.py | 38 ++-- src/gajim_themes_window.py | 11 +- src/groupchat_control.py | 42 ++-- src/gtkexcepthook.py | 6 +- src/gtkgui_helpers.py | 93 ++++++---- src/gui_interface.py | 50 ++-- src/gui_menu_builder.py | 2 +- src/history_manager.py | 16 +- src/history_window.py | 6 +- src/htmltextview.py | 17 +- src/ipython_view.py | 4 +- src/message_window.py | 12 +- src/music_track_listener.py | 8 +- src/notify.py | 13 +- src/plugins/__init__.py | 4 +- src/plugins/gui.py | 10 +- src/plugins/helpers.py | 2 +- src/plugins/plugin.py | 32 +- src/plugins/pluginmanager.py | 48 ++-- src/plugins/plugins_i18n.py | 2 +- src/profile_window.py | 9 +- src/remote_control.py | 18 +- src/roster_window.py | 207 +++++++++++------------ src/session.py | 14 +- src/statusicon.py | 2 +- src/tooltips.py | 19 +- src/vcard.py | 18 +- test/integration/test_resolver.py | 2 +- test/integration/test_roster.py | 4 +- test/integration/test_xmpp_client_nb.py | 2 +- test/integration/test_xmpp_transports_nb.py | 2 +- test/lib/data.py | 90 +++++----- test/lib/mock.py | 2 +- test/runtests.py | 10 +- test/unit/test_jingle.py | 82 ++++---- test/unit/test_socks5.py | 84 ++++---- test/unit/test_xmpp_transports_nb.py | 30 +- 106 files changed, 1284 insertions(+), 1395 deletions(-) diffs (truncated from 8657 to 300 lines): diff -r 4d25a6cba824 -r 9ad3483d0c75 plugins/dbus_plugin/plugin.py --- a/plugins/dbus_plugin/plugin.py Wed Jan 02 20:57:20 2013 +0400 +++ b/plugins/dbus_plugin/plugin.py Wed Jan 02 22:13:27 2013 +0400 @@ -407,7 +407,7 @@ return DBUS_DICT_SV() jid = self._get_real_jid(jid) - cached_vcard = gajim.connections.values()[0].get_cached_vcard(jid) + cached_vcard = list(gajim.connections.values())[0].get_cached_vcard(jid) if cached_vcard: return get_dbus_struct(cached_vcard) @@ -428,7 +428,7 @@ def account_info(self, account): '''show info on account: resource, jid, nick, prio, message''' result = DBUS_DICT_SS() - if gajim.connections.has_key(account): + if account in gajim.connections: # account is valid con = gajim.connections[account] index = con.connected @@ -508,7 +508,7 @@ def prefs_store(self): try: gajim.interface.save_config() - except Exception, e: + except Exception as e: return DBUS_BOOLEAN(False) return DBUS_BOOLEAN(True) diff -r 4d25a6cba824 -r 9ad3483d0c75 src/adhoc_commands.py --- a/src/adhoc_commands.py Wed Jan 02 20:57:20 2013 +0400 +++ b/src/adhoc_commands.py Wed Jan 02 22:13:27 2013 +0400 @@ -159,7 +159,7 @@ return self.stage_adhoc_commands_window_delete_event(self.window) def __del__(self): - print 'Object has been deleted.' + print('Object has been deleted.') # stage 1: waiting for command list def stage1(self): @@ -281,8 +281,6 @@ # close old stage self.stage_finish() - assert isinstance(self.commandnode, unicode) - self.form_status = None self.stages_notebook.set_current_page( @@ -452,7 +450,7 @@ note = command.getTag('note') if note: - self.notes_label.set_text(note.getData().decode('utf-8')) + self.notes_label.set_text(note.getData()) self.notes_label.set_no_show_all(False) self.notes_label.show() else: @@ -510,7 +508,7 @@ try: errorname = nbxmpp.NS_STANZAS + ' ' + str(errorid) errordesc = nbxmpp.ERRORS[errorname][2] - error = errordesc.decode('utf-8') + error = errordesc del errorname, errordesc except KeyError: # when stanza doesn't have error description error = _('Service returned an error.') @@ -608,7 +606,6 @@ Send the command with data form. Wait for reply """ # create the stanza - assert isinstance(self.commandnode, unicode) assert action in ('execute', 'prev', 'next', 'complete') stanza = nbxmpp.Iq(typ='set', to=self.jid) diff -r 4d25a6cba824 -r 9ad3483d0c75 src/advanced_configuration_window.py --- a/src/advanced_configuration_window.py Wed Jan 02 20:57:20 2013 +0400 +++ b/src/advanced_configuration_window.py Wed Jan 02 22:13:27 2013 +0400 @@ -141,8 +141,7 @@ """ optname = model[iter_][C_PREFNAME] opttype = model[iter_][C_TYPE] - - if opttype.decode('utf-8') == self.types['boolean'] or optname == 'password': + if opttype == self.types['boolean'] or optname == 'password': cell.set_property('editable', False) else: cell.set_property('editable', True) @@ -153,10 +152,10 @@ # path[1] is the key name # path[2] is the root of tree # last two is optional - path = [model[iter_][0].decode('utf-8')] + path = [model[iter_][0]] parent = model.iter_parent(iter_) while parent: - path.append(model[parent][0].decode('utf-8')) + path.append(model[parent][0]) parent = model.iter_parent(parent) return path @@ -194,17 +193,17 @@ def on_advanced_treeview_row_activated(self, treeview, path, column): modelpath = self.modelfilter.convert_path_to_child_path(path) modelrow = self.model[modelpath] - option = modelrow[0].decode('utf-8') - if modelrow[2].decode('utf-8') == self.types['boolean']: + option = modelrow[0] + if modelrow[2] == self.types['boolean']: for key in self.right_true_dict.keys(): - if self.right_true_dict[key] == modelrow[1].decode('utf-8'): + if self.right_true_dict[key] == modelrow[1]: modelrow[1] = str(key) newval = {'False': True, 'True': False}[modelrow[1]] if len(modelpath.get_indices()) > 1: optnamerow = self.model[modelpath.get_indices()[0]] - optname = optnamerow[0].decode('utf-8') + optname = optnamerow[0] keyrow = self.model[modelpath.get_indices()[:2]] - key = keyrow[0].decode('utf-8') + key = keyrow[0] self.remember_option(option + '\n' + key + '\n' + optname, modelrow[1], newval) gajim.config.set_per(optname, key, option, newval) @@ -234,13 +233,12 @@ modelpath = self.modelfilter.convert_path_to_child_path(path) modelrow = self.model[modelpath] modelpath = modelpath.get_indices() - option = modelrow[0].decode('utf-8') - text = text.decode('utf-8') + option = modelrow[0] if len(modelpath) > 1: optnamerow = self.model[modelpath[0]] - optname = optnamerow[0].decode('utf-8') + optname = optnamerow[0] keyrow = self.model[modelpath[:2]] - key = keyrow[0].decode('utf-8') + key = keyrow[0] self.remember_option(option + '\n' + key + '\n' + optname, modelrow[1], text) gajim.config.set_per(optname, key, option, text) @@ -269,12 +267,12 @@ return modelpath = self.modelfilter.convert_path_to_child_path(path) modelrow = self.model[modelpath] - option = modelrow[0].decode('utf-8') + option = modelrow[0] if len(modelpath) > 1: optnamerow = self.model[modelpath[0]] - optname = optnamerow[0].decode('utf-8') + optname = optnamerow[0] keyrow = self.model[modelpath[:2]] - key = keyrow[0].decode('utf-8') + key = keyrow[0] self.remember_option(option + '\n' + key + '\n' + optname, modelrow[C_VALUE], default) gajim.config.set_per(optname, key, option, default) @@ -313,11 +311,10 @@ value = str(option) except: value = option - value = helpers.ensure_utf8_string(value) self.model.append(parent, [name, value, type_]) def visible_func(self, model, treeiter, data): - search_string = self.entry.get_text().decode('utf-8').lower() + search_string = self.entry.get_text().lower() for it in tree_model_pre_order(model, treeiter): if model[it][C_TYPE] != '': opt_path = self.get_option_path(model, it) diff -r 4d25a6cba824 -r 9ad3483d0c75 src/atom_window.py --- a/src/atom_window.py Wed Jan 02 20:57:20 2013 +0400 +++ b/src/atom_window.py Wed Jan 02 22:13:27 2013 +0400 @@ -84,20 +84,20 @@ # fill the fields if newentry.feed_link is not None: self.feed_title_label.set_markup( - u'%s' % \ + '%s' % \ GObject.markup_escape_text(newentry.feed_title)) else: self.feed_title_label.set_markup( GObject.markup_escape_text(newentry.feed_title)) self.feed_tagline_label.set_markup( - u'%s' % \ + '%s' % \ GObject.markup_escape_text(newentry.feed_tagline)) if newentry.title: if newentry.uri is not None: self.entry_title_label.set_markup( - u'%s' % \ + '%s' % \ GObject.markup_escape_text(newentry.title)) else: self.entry_title_label.set_markup( diff -r 4d25a6cba824 -r 9ad3483d0c75 src/chat_control.py --- a/src/chat_control.py Wed Jan 02 20:57:20 2013 +0400 +++ b/src/chat_control.py Wed Jan 02 22:13:27 2013 +0400 @@ -620,7 +620,7 @@ message_buffer = self.msg_textview.get_buffer() start_iter = message_buffer.get_start_iter() end_iter = message_buffer.get_end_iter() - message = message_buffer.get_text(start_iter, end_iter, False).decode('utf-8') + message = message_buffer.get_text(start_iter, end_iter, False) xhtml = self.msg_textview.get_xhtml() # send the message @@ -917,7 +917,7 @@ scroll = False if pos == size else True # are we scrolling? # we don't want size of the buffer to grow indefinately max_size = gajim.config.get('key_up_lines') - for i in xrange(size - max_size + 1): + for i in range(size - max_size + 1): if pos == 0: break history.pop(0) @@ -1786,7 +1786,7 @@ pep = self.contact.pep img = self._pep_images[pep_type] if pep_type in pep: - img.set_from_pixbuf(pep[pep_type].asPixbufIcon()) + img.set_from_pixbuf(gtkgui_helpers.get_pep_as_pixbuf(pep[pep_type])) img.set_tooltip_markup(pep[pep_type].asMarkupText()) img.show() else: @@ -2506,7 +2506,7 @@ if num_unread == 1 and not gajim.config.get('show_unread_tab_icon'): unread = '*' elif num_unread > 1: - unread = '[' + unicode(num_unread) + ']' + unread = '[' + str(num_unread) + ']' # Draw tab label using chatstate theme = gajim.config.get('roster_theme') @@ -2843,7 +2843,7 @@ type_ = model[iter_][2] if type_ != 'contact': # source is not a contact return - dropped_jid = data.decode('utf-8') + dropped_jid = data dropped_transport = gajim.get_transport_name_from_jid(dropped_jid) c_transport = gajim.get_transport_name_from_jid(c.jid) @@ -3021,7 +3021,7 @@ # It's why I set it transparent. image = self.xml.get_object('avatar_image') pixbuf = image.get_pixbuf() - pixbuf.fill(0xffffff00L) # RGBA + pixbuf.fill(0xffffff00) # RGBA image.queue_draw() screen_w = Gdk.Screen.width() diff -r 4d25a6cba824 -r 9ad3483d0c75 src/command_system/dispatcher.py --- a/src/command_system/dispatcher.py Wed Jan 02 20:57:20 2013 +0400 +++ b/src/command_system/dispatcher.py Wed Jan 02 22:13:27 2013 +0400 @@ -31,8 +31,7 @@ over the process. """ -from types import NoneType -from tools import remove +from .tools import remove COMMANDS = {} CONTAINERS = {} @@ -71,7 +70,7 @@ return isinstance(attribute, Command) def is_root(namespace): - metaclass = namespace.get("__metaclass__", NoneType) + metaclass = namespace.get("__metaclass__", None) return issubclass(metaclass, Dispatchable) def get_command(host, name): @@ -83,7 +82,7 @@ def list_commands(host): for container in CONTAINERS[host]: commands = COMMANDS[container] - for name, command in commands.iteritems(): + for name, command in commands.items(): yield name, command class Dispatchable(type): diff -r 4d25a6cba824 -r 9ad3483d0c75 src/command_system/framework.py --- a/src/command_system/framework.py Wed Jan 02 20:57:20 2013 +0400 +++ b/src/command_system/framework.py Wed Jan 02 22:13:27 2013 +0400 @@ -23,10 +23,10 @@ from types import FunctionType from inspect import getargspec, getdoc -from dispatcher import Host, Container -from dispatcher import get_command, list_commands -from mapping import parse_arguments, adapt_arguments -from errors import DefinitionError, CommandError, NoCommandError +from .dispatcher import Host, Container +from .dispatcher import get_command, list_commands

1 0

gajim: fix some CursorType
by Denis Fomin 02 Jan '13

02 Jan '13

changeset f1eb67ab59d1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f1eb67ab59d1 description: fix some CursorType diffstat: src/chat_control.py | 2 +- src/conversation_textview.py | 6 ++++-- src/groupchat_control.py | 4 ++-- src/gui_interface.py | 3 ++- src/htmltextview.py | 10 +++++----- 5 files changed, 14 insertions(+), 11 deletions(-) diffs (125 lines): diff -r 442e95b59c28 -r f1eb67ab59d1 src/chat_control.py --- a/src/chat_control.py Wed Jan 02 14:51:55 2013 +0400 +++ b/src/chat_control.py Wed Jan 02 17:30:54 2013 +0400 @@ -1293,7 +1293,7 @@ if not self.conv_textview.auto_scrolling: self.conv_textview.stop_scrolling() self.was_at_the_end = (adjustment.get_upper() - adjustment.get_value() \ - - adjustment.page_size) < 18 + - adjustment.get_page_size()) < 18 if self.resource: jid = self.contact.get_full_jid() else: diff -r 442e95b59c28 -r f1eb67ab59d1 src/conversation_textview.py --- a/src/conversation_textview.py Wed Jan 02 14:51:55 2013 +0400 +++ b/src/conversation_textview.py Wed Jan 02 17:30:54 2013 +0400 @@ -30,6 +30,7 @@ from threading import Timer # for smooth scrolling from gi.repository import Gtk +from gi.repository import Gdk from gi.repository import GdkPixbuf from gi.repository import Pango from gi.repository import GObject @@ -663,16 +664,17 @@ tags = self.tv.get_iter_at_location(x, y).get_tags() if self.change_cursor: self.tv.get_window(Gtk.TextWindowType.TEXT).set_cursor( - Gdk.Cursor.new(Gdk.XTERM)) + Gdk.Cursor.new(Gdk.CursorType.XTERM)) self.change_cursor = False tag_table = self.tv.get_buffer().get_tag_table() over_line = False xep0184_warning = False + for tag in tags: if tag in (tag_table.lookup('url'), tag_table.lookup('mail'), \ tag_table.lookup('xmpp'), tag_table.lookup('sth_at_sth')): self.tv.get_window(Gtk.TextWindowType.TEXT).set_cursor( - Gdk.Cursor.new(Gdk.HAND2)) + Gdk.Cursor.new(Gdk.CursorType.HAND2)) self.change_cursor = True elif tag == tag_table.lookup('focus-out-line'): over_line = True diff -r 442e95b59c28 -r f1eb67ab59d1 src/groupchat_control.py --- a/src/groupchat_control.py Wed Jan 02 14:51:55 2013 +0400 +++ b/src/groupchat_control.py Wed Jan 02 17:30:54 2013 +0400 @@ -2583,11 +2583,11 @@ self.tooltip.hide_tooltip() def show_tooltip(self, contact): - if not self.list_treeview.window: + if not self.list_treeview.get_window(): # control has been destroyed since tooltip was requested return pointer = self.list_treeview.get_pointer() - props = self.list_treeview.get_path_at_pos(pointer[1], pointer[2]) + props = self.list_treeview.get_path_at_pos(pointer[0], pointer[1]) # check if the current pointer is at the same path # as it was before setting the timeout if props and self.tooltip.id == props[0]: diff -r 442e95b59c28 -r f1eb67ab59d1 src/gui_interface.py --- a/src/gui_interface.py Wed Jan 02 14:51:55 2013 +0400 +++ b/src/gui_interface.py Wed Jan 02 17:30:54 2013 +0400 @@ -1758,7 +1758,7 @@ self.roster.draw_contact(jid, account) if w: w.set_active_tab(ctrl) - w.window.window.focus(Gtk.get_current_event_time()) + w.window.get_window().focus(Gtk.get_current_event_time()) # Using isinstance here because we want to catch all derived types if isinstance(ctrl, ChatControlBase): tv = ctrl.conv_textview @@ -2102,6 +2102,7 @@ gc_control = GroupchatControl(mw, contact, account, is_continued=is_continued) mw.new_tab(gc_control) + mw.set_active_tab(gc_control) def new_private_chat(self, gc_contact, account, session=None): conn = gajim.connections[account] diff -r 442e95b59c28 -r f1eb67ab59d1 src/htmltextview.py --- a/src/htmltextview.py Wed Jan 02 14:51:55 2013 +0400 +++ b/src/htmltextview.py Wed Jan 02 17:30:54 2013 +0400 @@ -824,7 +824,7 @@ def __leave_event(self, widget, event): if self._changed_cursor: window = widget.get_window(Gtk.TextWindowType.TEXT) - window.set_cursor(Gdk.Cursor.new(Gdk.XTERM)) + window.set_cursor(Gdk.Cursor.new(Gdk.CursorType.XTERM)) self._changed_cursor = False def show_tooltip(self, tag): @@ -857,13 +857,13 @@ self.tooltip.hide_tooltip() if not self._changed_cursor and anchor_tags: window = widget.get_window(Gtk.TextWindowType.TEXT) - window.set_cursor(Gdk.Cursor.new(Gdk.HAND2)) + window.set_cursor(Gdk.Cursor.new(Gdk.CursorType.HAND2)) self._changed_cursor = True self.tooltip.timeout = GObject.timeout_add(500, self.show_tooltip, anchor_tags[0]) elif self._changed_cursor and not anchor_tags: window = widget.get_window(Gtk.TextWindowType.TEXT) - window.set_cursor(Gdk.Cursor.new(Gdk.XTERM)) + window.set_cursor(Gdk.Cursor.new(Gdk.CursorType.XTERM)) self._changed_cursor = False return False @@ -963,14 +963,14 @@ tags = htmlview.tv.get_iter_at_location(x, y).get_tags() if change_cursor: htmlview.tv.get_window(Gtk.TextWindowType.TEXT).set_cursor( - Gdk.Cursor.new(Gdk.XTERM)) + Gdk.Cursor.new(Gdk.CursorType.XTERM)) change_cursor = None tag_table = htmlview.tv.get_buffer().get_tag_table() for tag in tags: try: if tag.is_anchor: htmlview.tv.get_window(Gtk.TextWindowType.TEXT).set_cursor( - Gdk.Cursor.new(Gdk.HAND2)) + Gdk.Cursor.new(Gdk.CursorType.HAND2)) change_cursor = tag elif tag == tag_table.lookup('focus-out-line'): over_line = True

1 0

gajim: fix some windows
by Denis Fomin 02 Jan '13

02 Jan '13

changeset 4d25a6cba824 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4d25a6cba824 description: fix some windows diffstat: data/gui/chat_to_muc_window.ui | 2 +- src/chat_control.py | 13 +++++++------ src/dialogs.py | 12 ++++++++---- src/gtkgui_helpers.py | 6 +++--- 4 files changed, 19 insertions(+), 14 deletions(-) diffs (105 lines): diff -r f1eb67ab59d1 -r 4d25a6cba824 data/gui/chat_to_muc_window.ui --- a/data/gui/chat_to_muc_window.ui Wed Jan 02 17:30:54 2013 +0400 +++ b/data/gui/chat_to_muc_window.ui Wed Jan 02 20:57:20 2013 +0400 @@ -75,7 +75,7 @@ </packing> </child> <child> - <object class="GtkComboBoxEntry" id="server_list_comboboxentry"> + <object class="GtkComboBox" id="server_list_comboboxentry"> <property name="visible">True</property> </object> <packing> diff -r f1eb67ab59d1 -r 4d25a6cba824 src/chat_control.py --- a/src/chat_control.py Wed Jan 02 17:30:54 2013 +0400 +++ b/src/chat_control.py Wed Jan 02 20:57:20 2013 +0400 @@ -119,11 +119,11 @@ keymap = Gdk.Keymap.get_default() try: - keycode_c = keymap.get_entries_for_keyval(Gdk.KEY_c)[0][0] + keycode_c = keymap.get_entries_for_keyval(Gdk.KEY_c)[1][0].keycode except TypeError: keycode_c = 54 try: - keycode_ins = keymap.get_entries_for_keyval(Gdk.KEY_Insert)[0][0] + keycode_ins = keymap.get_entries_for_keyval(Gdk.KEY_Insert)[1][0].keycode except TypeError: keycode_ins = 118 @@ -693,10 +693,11 @@ def _conv_textview_key_press_event(self, widget, event): # translate any layout to latin_layout - keymap = Gdk.keymap_get_default() - keycode = keymap.get_entries_for_keyval(event.keyval)[0][0] - if (event.get_state() & Gdk.ModifierType.CONTROL_MASK and keycode in (self.keycode_c, - self.keycode_ins)) or (event.get_state() & Gdk.ModifierType.SHIFT_MASK and \ + valid, entries = self.keymap.get_entries_for_keyval(event.keyval) + keycode = entries[0].keycode + if (event.get_state() & Gdk.ModifierType.CONTROL_MASK and keycode in ( + self.keycode_c, self.keycode_ins)) or ( + event.get_state() & Gdk.ModifierType.SHIFT_MASK and \ event.keyval in (Gdk.KEY_Page_Down, Gdk.KEY_Page_Up)): return False self.parent_win.notebook.emit('key_press_event', event) diff -r f1eb67ab59d1 -r 4d25a6cba824 src/dialogs.py --- a/src/dialogs.py Wed Jan 02 17:30:54 2013 +0400 +++ b/src/dialogs.py Wed Jan 02 20:57:20 2013 +0400 @@ -1460,7 +1460,8 @@ GObject.GObject.__init__(self, title=title_text, action=action) self.add_button(buttons[0],buttons[1]) - self.add_button(buttons[2],buttons[3]) + if len(buttons) ==4: + self.add_button(buttons[2],buttons[3]) self.set_default_response(default_response) self.set_select_multiple(select_multiple) if current_folder and os.path.isdir(current_folder): @@ -4862,8 +4863,9 @@ server_list = [] self.servers = Gtk.ListStore(str) self.server_list_comboboxentry.set_model(self.servers) - - self.server_list_comboboxentry.set_text_column(0) + cell = Gtk.CellRendererText() + self.server_list_comboboxentry.pack_start(cell, True) + self.server_list_comboboxentry.add_attribute(cell, 'text', 0) # get the muc server of our server if 'jabber' in gajim.connections[account].muc_jid: @@ -4950,7 +4952,9 @@ self.window.destroy() def on_invite_button_clicked(self, widget): - server = self.server_list_comboboxentry.get_active_text() + row = self.server_list_comboboxentry.get_child().get_displayed_row() + model = self.server_list_comboboxentry.get_model() + server = model[row][0].decode('utf-8').strip() if server == '': return gajim.connections[self.account].check_unique_room_id_support(server, self) diff -r f1eb67ab59d1 -r 4d25a6cba824 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Wed Jan 02 17:30:54 2013 +0400 +++ b/src/gtkgui_helpers.py Wed Jan 02 20:57:20 2013 +0400 @@ -892,9 +892,9 @@ Value_list is [(label1, value1)] """ liststore = Gtk.ListStore(str, str) - combobox = Gtk.ComboBox(liststore) + combobox = Gtk.ComboBox.new_with_model(liststore) cell = Gtk.CellRendererText() - combobox.pack_start(cell, True, True, 0) + combobox.pack_start(cell, True) combobox.add_attribute(cell, 'text', 0) i = -1 for value in value_list: @@ -911,7 +911,7 @@ Value_list is [(label1, value1)] """ liststore = Gtk.ListStore(str, str) - treeview = Gtk.TreeView(liststore) + treeview = Gtk.TreeView.new_with_model(liststore) treeview.get_selection().set_mode(Gtk.SelectionMode.MULTIPLE) treeview.set_headers_visible(False) col = Gtk.TreeViewColumn()

1 0

gajim: create full empty pixbuf
by Denis Fomin 02 Jan '13

02 Jan '13

changeset 442e95b59c28 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=442e95b59c28 description: create full empty pixbuf diffstat: src/roster_window.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 3ec72e33c6b8 -r 442e95b59c28 src/roster_window.py --- a/src/roster_window.py Wed Jan 02 13:32:17 2013 +0400 +++ b/src/roster_window.py Wed Jan 02 14:51:55 2013 +0400 @@ -91,6 +91,7 @@ ) = range(11) empty_pixbuf = GdkPixbuf.Pixbuf.new(GdkPixbuf.Colorspace.RGB, True, 8, 1, 1) +empty_pixbuf.fill(0xffffff00) class RosterWindow:

1 0

gajim: fix join gc dialog
by Denis Fomin 02 Jan '13

02 Jan '13

changeset 3ec72e33c6b8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3ec72e33c6b8 description: fix join gc dialog diffstat: data/gui/join_groupchat_window.ui | 23 +++++++++++------------ src/dataforms_widget.py | 2 +- src/dialogs.py | 27 ++++++++++++++++++--------- src/groupchat_control.py | 15 ++++++++------- src/roster_window.py | 7 +++++-- 5 files changed, 43 insertions(+), 31 deletions(-) diffs (283 lines): diff -r 093f965f539c -r 3ec72e33c6b8 data/gui/join_groupchat_window.ui --- a/data/gui/join_groupchat_window.ui Wed Jan 02 00:31:13 2013 +0400 +++ b/data/gui/join_groupchat_window.ui Wed Jan 02 13:32:17 2013 +0400 @@ -33,7 +33,7 @@ <property name="right_attach">2</property> <property name="top_attach">3</property> <property name="bottom_attach">4</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -48,7 +48,7 @@ <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -61,7 +61,7 @@ <property name="top_attach">3</property> <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -74,7 +74,7 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -87,7 +87,7 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -114,7 +114,7 @@ <property name="top_attach">5</property> <property name="bottom_attach">6</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -129,7 +129,7 @@ <property name="right_attach">2</property> <property name="top_attach">5</property> <property name="bottom_attach">6</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -147,7 +147,7 @@ <property name="top_attach">7</property> <property name="bottom_attach">8</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -158,7 +158,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -188,7 +188,7 @@ <property name="top_attach">6</property> <property name="bottom_attach">7</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -207,10 +207,9 @@ <property name="visible">True</property> <property name="spacing">6</property> <child> - <object class="GtkComboBoxEntry" id="server_comboboxentry"> + <object class="GtkComboBox" id="server_comboboxentry"> <property name="visible">True</property> <property name="model">liststore1</property> - <property name="text_column">0</property> </object> <packing> <property name="position">0</property> diff -r 093f965f539c -r 3ec72e33c6b8 src/dataforms_widget.py --- a/src/dataforms_widget.py Wed Jan 02 00:31:13 2013 +0400 +++ b/src/dataforms_widget.py Wed Jan 02 13:32:17 2013 +0400 @@ -570,7 +570,7 @@ pixbuf_l = GdkPixbuf.PixbufLoader() pixbuf_l.write(img_data) pixbuf_l.close() - media = Gtk.image_new_from_pixbuf(pixbuf_l.\ + media = Gtk.Image.new_from_pixbuf(pixbuf_l.\ get_pixbuf()) except Exception: media = Gtk.Label(label=_('Unable to load image')) diff -r 093f965f539c -r 3ec72e33c6b8 src/dialogs.py --- a/src/dialogs.py Wed Jan 02 00:31:13 2013 +0400 +++ b/src/dialogs.py Wed Jan 02 13:32:17 2013 +0400 @@ -1643,7 +1643,7 @@ label = Gtk.Label(label=text_label) self.vbox.pack_start(label, False, True, 0) buff = Gtk.TextBuffer() - self.textview = Gtk.TextView(buff) + self.textview = Gtk.TextView.new_with_buffer(buff) frame = Gtk.Frame() frame.set_shadow_type(Gtk.ShadowType.IN) frame.add(self.textview) @@ -2341,7 +2341,7 @@ liststore = Gtk.ListStore(str) account_combobox.set_model(liststore) cell = Gtk.CellRendererText() - account_combobox.pack_start(cell, True, True, 0) + account_combobox.pack_start(cell, True) account_combobox.add_attribute(cell, 'text', 0) account_combobox.set_active(-1) @@ -2350,7 +2350,7 @@ gajim.account_is_connected(a)]: if gajim.connections[acct].is_zeroconf: continue - account_combobox.append_text(acct) + liststore.append([acct]) if account and account == acct: account_combobox.set_active(liststore.iter_n_children(None)-1) @@ -2379,7 +2379,13 @@ self.window.set_title(title) self.server_comboboxentry = self.xml.get_object('server_comboboxentry') - self.server_model = self.server_comboboxentry.get_model() + liststore = Gtk.ListStore(str) + self.server_comboboxentry.set_model(liststore) + cell = Gtk.CellRendererText() + self.server_comboboxentry.pack_start(cell, True) + self.server_comboboxentry.add_attribute(cell, 'text', 0) + self.server_comboboxentry.set_active(-1) + self.server_model = liststore#self.server_comboboxentry.get_model() server_list = [] # get the muc server of our server if 'jabber' in gajim.connections[account].muc_jid: @@ -2389,11 +2395,11 @@ liststore = Gtk.ListStore(str) self.recently_combobox.set_model(liststore) cell = Gtk.CellRendererText() - self.recently_combobox.pack_start(cell, True, True, 0) + self.recently_combobox.pack_start(cell, True) self.recently_combobox.add_attribute(cell, 'text', 0) self.recently_groupchat = gajim.config.get('recently_groupchat').split() for g in self.recently_groupchat: - self.recently_combobox.append_text(g) + liststore.append([g]) server = gajim.get_server_from_jid(g) if server not in server_list and not server.startswith('irc'): server_list.append(server) @@ -2463,7 +2469,9 @@ def _set_room_jid(self, room_jid): room, server = gajim.get_name_and_server_from_jid(room_jid) self._room_jid_entry.set_text(room) - self.server_comboboxentry.get_child().set_text(server) + model = self.server_comboboxentry.get_model() + model.append([server]) + #self.server_comboboxentry.set_active(0) def on_recently_combobox_changed(self, widget): model = widget.get_model() @@ -2509,8 +2517,9 @@ 'groupchat.')) return nickname = self._nickname_entry.get_text().decode('utf-8') - server = self.server_comboboxentry.get_child().get_text().decode('utf-8').\ - strip() + row = self.server_comboboxentry.get_child().get_displayed_row() + model = self.server_comboboxentry.get_model() + server = model[row][0].decode('utf-8').strip() room = self._room_jid_entry.get_text().decode('utf-8').strip() room_jid = room + '@' + server password = self._password_entry.get_text().decode('utf-8') diff -r 093f965f539c -r 3ec72e33c6b8 src/groupchat_control.py --- a/src/groupchat_control.py Wed Jan 02 00:31:13 2013 +0400 +++ b/src/groupchat_control.py Wed Jan 02 13:32:17 2013 +0400 @@ -470,7 +470,7 @@ # workaround to avoid gtk arrows to be shown column = Gtk.TreeViewColumn() # 2nd COLUMN renderer = Gtk.CellRendererPixbuf() - column.pack_start(renderer, False, True, 0) + column.pack_start(renderer, False) self.list_treeview.append_column(column) column.set_visible(False) self.list_treeview.set_expander_column(column) @@ -508,7 +508,7 @@ def fill_column(self, col): for rend in self.renderers_list: - col.pack_start(rend[1], rend[2], True, 0) + col.pack_start(rend[1], rend[2]) col.add_attribute(rend[1], rend[3], rend[4]) col.set_cell_data_func(rend[1], rend[5], rend[6]) # set renderers propertys @@ -594,8 +594,9 @@ """ The MUC treeview has resized. Move the hpaned in all tabs to match """ - if gparamspec.name != 'position': - return + # print pane, dir(pane) + #if gparamspec.name != 'position': + #return if self.resize_from_another_muc: # Don't send the event to other MUC return @@ -1430,7 +1431,7 @@ gc_contact.affiliation != 'none' and gajim.config.get( 'show_affiliation_in_groupchat'): pixbuf1 = image.get_pixbuf().copy() - pixbuf2 = GdkPixbuf.Pixbuf(GdkPixbuf.Colorspace.RGB, True, 8, 4, 4) + pixbuf2 = GdkPixbuf.Pixbuf.new(GdkPixbuf.Colorspace.RGB, True, 8, 4, 4) if gc_contact.affiliation == 'owner': pixbuf2.fill(0xff0000ff) # Red elif gc_contact.affiliation == 'admin': @@ -1440,7 +1441,7 @@ pixbuf2.composite(pixbuf1, 12, 12, pixbuf2.get_property('width'), pixbuf2.get_property('height'), 0, 0, 1.0, 1.0, GdkPixbuf.InterpType.HYPER, 127) - image = Gtk.image_new_from_pixbuf(pixbuf1) + image = Gtk.Image.new_from_pixbuf(pixbuf1) self.model[iter_][C_IMG] = image self.model[iter_][C_TEXT] = name @@ -1453,7 +1454,7 @@ fake_jid = self.room_jid + '/' + nick pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(fake_jid) if pixbuf in ('ask', None): - scaled_pixbuf = None + scaled_pixbuf = '' else: scaled_pixbuf = gtkgui_helpers.get_scaled_pixbuf(pixbuf, 'roster') self.model[iter_][C_AVATAR] = scaled_pixbuf diff -r 093f965f539c -r 3ec72e33c6b8 src/roster_window.py --- a/src/roster_window.py Wed Jan 02 00:31:13 2013 +0400 +++ b/src/roster_window.py Wed Jan 02 13:32:17 2013 +0400 @@ -1489,7 +1489,10 @@ # do not change selection while DND'ing return # Expand his parent, so this path is visible, don't expand it. - self.tree.expand_to_path(path[:-1]) + path_ = str(path.get_indices()[:-1])[1:-1] + path_ = path_.replace(', ', ':') + path = path.new_from_string(path_) + self.tree.expand_to_path(path) self.tree.scroll_to_cell(path) self.tree.set_cursor(path) @@ -2395,7 +2398,7 @@ if isinstance(w, dict): self.close_all_from_dict(w) else: - w.window().destroy() + w.window.destroy() def close_all(self, account, force=False): """

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