Commits

commits@gajim.org

17632 discussions

gajim: fix showing self contact when mode is always
by Gajim 09 Nov '14

09 Nov '14

changeset b5b34a9bcf6e in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=b5b34a9bcf6e description: fix showing self contact when mode is always diffstat: src/roster_window.py | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diffs (24 lines): diff -r 09cc7417185b -r b5b34a9bcf6e src/roster_window.py --- a/src/roster_window.py Sun Nov 09 14:03:01 2014 +0100 +++ b/src/roster_window.py Sun Nov 09 15:39:26 2014 +0100 @@ -2630,6 +2630,20 @@ self.add_account_contacts(obj.conn.name, improve_speed=False) self.fire_up_unread_messages_events(obj.conn.name) else: + # add self contact + if gajim.config.get('show_self_contact') == 'always': + account = obj.conn.name + self_jid = gajim.get_jid_from_account(account) + if self_jid not in gajim.contacts.get_jid_list(account): + resource = '' + if gajim.connections[account].server_resource: + resource = gajim.connections[account].server_resource + contact = gajim.contacts.create_contact(jid=self_jid, + account=account, name=gajim.nicks[account], + groups=['self_contact'], show='offline', sub='both', + ask='none', resource=resource) + gajim.contacts.add_contact(account, contact) + self.add_contact(self_jid, account) if gajim.config.get('remember_opened_chat_controls'): account = obj.conn.name controls = gajim.config.get_per('accounts', account,

1 0

gajim: warn user when custom hostname is wrong. Fixes #7489
by Gajim 09 Nov '14

09 Nov '14

changeset 09cc7417185b in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=09cc7417185b description: warn user when custom hostname is wrong. Fixes #7489 diffstat: src/common/connection.py | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diffs (28 lines): diff -r 6edeba793e2c -r 09cc7417185b src/common/connection.py --- a/src/common/connection.py Sun Oct 26 16:43:44 2014 +0100 +++ b/src/common/connection.py Sun Nov 09 14:03:01 2014 +0100 @@ -1136,10 +1136,20 @@ else: use_custom = gajim.config.get_per('accounts', self.name, 'use_custom_host') - custom_h = gajim.config.get_per('accounts', self.name, - 'custom_host') - custom_p = gajim.config.get_per('accounts', self.name, - 'custom_port') + if use_custom: + custom_h = gajim.config.get_per('accounts', self.name, + 'custom_host') + custom_p = gajim.config.get_per('accounts', self.name, + 'custom_port') + try: + helpers.idn_to_ascii(custom_h) + except Exception: + gajim.nec.push_incoming_event(InformationEvent(None, + conn=self, level='error', + pri_txt=_('Wrong Custom Hostname'), + sec_txt='Wrong custom hostname "%s". Ignoring it.' \ + % custom_h)) + use_custom = False # create connection if it doesn't already exist self.connected = 1

1 0

python-nbxmpp: [bseibold] Fix BOSH HTTP requests. Fixes #29
by Python-nbxmpp 08 Nov '14

08 Nov '14

changeset 7c7c2ca7effb in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=7c7c2ca7effb description: [bseibold] Fix BOSH HTTP requests. Fixes #29 diffstat: nbxmpp/transports_nb.py | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diffs (60 lines): diff -r 0c337cf01ae4 -r 7c7c2ca7effb nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Sat Oct 04 22:25:11 2014 +0200 +++ b/nbxmpp/transports_nb.py Sat Nov 08 22:21:36 2014 +0100 @@ -37,7 +37,6 @@ import time import traceback import base64 -import locale try: from urllib.parse import urlparse @@ -370,8 +369,7 @@ self._sock.setblocking(False) self._sock.connect((self.server, self.port)) except Exception as exc: - errnum, errstr = exc.errno,\ - exc.strerror.decode(locale.getpreferredencoding()) + errnum, errstr = exc.errno, exc.strerror if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK): # connecting in progress @@ -474,7 +472,7 @@ self._sock.shutdown(socket.SHUT_RDWR) self._sock.close() except socket.error as e: - errstr = e.strerror.decode(locale.getpreferredencoding()) + errstr = e.strerror log.info('Error while disconnecting socket: %s' % errstr) self.fd = -1 NonBlockingTransport.disconnect(self, do_callback) @@ -558,7 +556,7 @@ return None self.sendbuff = self.sendqueue.pop(0) try: - send_count = self._send(self.sendbuff.encode("utf-8")) + send_count = self._send(self.sendbuff) if send_count: sent_data = self.sendbuff[:send_count] self.sendbuff = self.sendbuff[send_count:] @@ -602,8 +600,7 @@ except tls_nb.SSLWrapper.Error as e: log.info("_do_receive, caught SSL error, got %s:" % received, exc_info=True) - errnum, errstr = e.errno,\ - e.strerror.decode(locale.getpreferredencoding()) + errnum, errstr = e.errno, e.strerror if received == '': errstr = 'zero bytes on recv' @@ -766,9 +763,7 @@ Builds http message with given body. Values for headers and status line fields are taken from class variables """ - absolute_uri = '%s://%s:%s%s' % (self.http_protocol, self.http_host, - self.http_port, self.http_path) - headers = ['%s %s %s' % (method, absolute_uri, self.http_version), + headers = ['%s %s %s' % (method, self.http_path, self.http_version), 'Host: %s:%s' % (self.http_host, self.http_port), 'User-Agent: Gajim', 'Content-Type: text/xml; charset=utf-8',

1 0

gajim: [bluec0re] Fix bug when server assign a contact to a grou...
by Gajim 26 Oct '14

26 Oct '14

changeset 6edeba793e2c in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=6edeba793e2c description: [bluec0re] Fix bug when server assign a contact to a group with empty name. Fixes #7865 diffstat: src/common/contacts.py | 2 +- src/roster_window.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 4539f519671d -r 6edeba793e2c src/common/contacts.py --- a/src/common/contacts.py Sun Oct 26 16:37:11 2014 +0100 +++ b/src/common/contacts.py Sun Oct 26 16:43:44 2014 +0100 @@ -99,7 +99,7 @@ our_chatstate, chatstate, client_caps=client_caps) self.contact_name = '' # nick choosen by contact - self.groups = [i for i in set(groups)] # filter duplicate values + self.groups = [i if i else _('General') for i in set(groups)] # filter duplicate values self.sub = sub self.ask = ask diff -r 4539f519671d -r 6edeba793e2c src/roster_window.py --- a/src/roster_window.py Sun Oct 26 16:37:11 2014 +0100 +++ b/src/roster_window.py Sun Oct 26 16:43:44 2014 +0100 @@ -299,7 +299,7 @@ delimiter = gajim.connections[account].nested_group_delimiter group_splited = group.split(delimiter) parent_group = delimiter.join(group_splited[:-1]) - if parent_group in self._iters[account_group]['groups']: + if len(group_splited) > 1 and parent_group in self._iters[account_group]['groups']: iter_parent = self._iters[account_group]['groups'][parent_group] elif parent_group: iter_parent = self._add_group_iter(account, parent_group)

1 0

gajim: [bluec0re] Make ipython_view compatible to version >= 1.0...
by Gajim 26 Oct '14

26 Oct '14

changeset 4539f519671d in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=4539f519671d description: [bluec0re] Make ipython_view compatible to version >= 1.0. Fixes #7868 diffstat: src/ipython_view.py | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diffs (27 lines): diff -r 48a980bef230 -r 4539f519671d src/ipython_view.py --- a/src/ipython_view.py Sun Oct 26 16:35:36 2014 +0100 +++ b/src/ipython_view.py Sun Oct 26 16:37:11 2014 +0100 @@ -90,7 +90,10 @@ @type input_func: function """ if input_func: - IPython.frontend.terminal.interactiveshell.raw_input_original = input_func + if IPython.version_info[0] >= 1: + IPython.terminal.interactiveshell.raw_input_original = input_func + else: + IPython.frontend.terminal.interactiveshell.raw_input_original = input_func if cin: IPython.utils.io.stdin = IPython.utils.io.IOStream(cin) if cout: @@ -110,7 +113,10 @@ cfg = Config() cfg.InteractiveShell.colors = "Linux" - self.IP = IPython.frontend.terminal.embed.InteractiveShellEmbed(config=cfg, user_ns=user_ns) + if IPython.version_info[0] >= 1: + self.IP = IPython.terminal.embed.InteractiveShellEmbed(config=cfg, user_ns=user_ns) + else: + self.IP = IPython.frontend.terminal.embed.InteractiveShellEmbed(config=cfg, user_ns=user_ns) self.IP.system = lambda cmd: self.shell(self.IP.var_expand(cmd), header='IPython system call: ', local_ns=user_ns)

1 0

gajim: changeset: 15552:375dd51393bb
by Gajim 26 Oct '14

26 Oct '14

changeset 48a980bef230 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=48a980bef230 description: changeset: 15552:375dd51393bb tag: tip parent: 15503:a8bd9ca4ef63 user: Dominik George <nik(a)naturalnet.de> date: Fri Oct 24 21:45:17 2014 +0200 summary: Fix #7866 &7848 - cast digest_size from hashlib to int for OpenSSL diffstat: src/common/stanza_session.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 5cbe9feb0824 -r 48a980bef230 src/common/stanza_session.py --- a/src/common/stanza_session.py Sat Oct 18 21:58:04 2014 +0200 +++ b/src/common/stanza_session.py Sun Oct 26 16:35:36 2014 +0100 @@ -952,7 +952,7 @@ if not rshashes: # we've never spoken before, but we'll pretend we have - rshash_size = self.hash_alg().digest_size + rshash_size = int(self.hash_alg().digest_size) rshashes.append(crypto.random_bytes(rshash_size)) rshashes = [base64.b64encode(rshash).decode('utf-8') for rshash in \

1 0

gajim: =?UTF-8?q?Don=E2=80=99t=20use=20positional=20arguments=20...
by Gajim 20 Oct '14

20 Oct '14

changeset 82599a0f0053 in /home/hg/repos/gajim author: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl(a)redhat.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=82599a0f0053 description: =?UTF-8?q?Don=E2=80=99t=20use=20positional=20arguments=20?= =?UTF-8?q?with=20*MenuItem=20inits.?= Avoid DepreciationWarning for ImageMenuItem, CheckMenuItemi, and MenuItem. Fix #7858 Signed-off-by: Matěj Cepl <mcepl(a)redhat.com> --- src/chat_control.py | 8 +++---- src/conversation_textview.py | 5 ++-- src/groupchat_control.py | 4 ++-- src/gui_interface.py | 2 +- src/gui_menu_builder.py | 15 +++++++----- src/roster_window.py | 56 +++++++++++++++++++++++++++----------------- src/statusicon.py | 13 ++++++---- 7 files changed, 61 insertions(+), 42 deletions(-) diffstat: src/chat_control.py | 8 +++--- src/conversation_textview.py | 5 ++- src/groupchat_control.py | 4 +- src/gui_interface.py | 2 +- src/gui_menu_builder.py | 15 +++++++---- src/roster_window.py | 56 ++++++++++++++++++++++++++----------------- src/statusicon.py | 13 ++++++--- 7 files changed, 61 insertions(+), 42 deletions(-) diffs (truncated from 376 to 300 lines): diff -r 7b97d2ab8f70 -r 82599a0f0053 src/chat_control.py --- a/src/chat_control.py Sat Oct 18 23:10:42 2014 +0200 +++ b/src/chat_control.py Mon Oct 20 17:20:38 2014 +0200 @@ -1083,7 +1083,7 @@ active_tags = self.msg_textview.get_active_tags() for menuitem in menuitems: - item = Gtk.CheckMenuItem(menuitem[0]) + item = Gtk.CheckMenuItem.new_with_label(menuitem[0]) if menuitem[1] in active_tags: item.set_active(True) else: @@ -1095,13 +1095,13 @@ item = Gtk.SeparatorMenuItem.new() # separator menu.append(item) - item = Gtk.ImageMenuItem(_('Color')) + item = Gtk.ImageMenuItem.new_with_label(_('Color')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_SELECT_COLOR, Gtk.IconSize.MENU) item.set_image(icon) item.connect('activate', self.on_color_menuitem_activale) menu.append(item) - item = Gtk.ImageMenuItem(_('Font')) + item = Gtk.ImageMenuItem.new_with_label(_('Font')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_SELECT_FONT, Gtk.IconSize.MENU) item.set_image(icon) item.connect('activate', self.on_font_menuitem_activale) @@ -1110,7 +1110,7 @@ item = Gtk.SeparatorMenuItem.new() # separator menu.append(item) - item = Gtk.ImageMenuItem(_('Clear formating')) + item = Gtk.ImageMenuItem.new_with_label(_('Clear formating')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_CLEAR, Gtk.IconSize.MENU) item.set_image(icon) item.connect('activate', self.msg_textview.clear_tags) diff -r 7b97d2ab8f70 -r 82599a0f0053 src/conversation_textview.py --- a/src/conversation_textview.py Sat Oct 18 23:10:42 2014 +0200 +++ b/src/conversation_textview.py Mon Oct 20 17:20:38 2014 +0200 @@ -816,7 +816,7 @@ else: if dict_link.find('%s') == -1: # we must have %s in the url if not WIKTIONARY - item = Gtk.MenuItem(_( + item = Gtk.MenuItem.new_with_label(_( 'Dictionary URL is missing an "%s" and it is not WIKTIONARY')) item.set_property('sensitive', False) else: @@ -830,7 +830,8 @@ search_link = gajim.config.get('search_engine') if search_link.find('%s') == -1: # we must have %s in the url - item = Gtk.MenuItem(_('Web Search URL is missing an "%s"')) + item = Gtk.MenuItem.new_with_label( + _('Web Search URL is missing an "%s"')) item.set_property('sensitive', False) else: item = Gtk.MenuItem.new_with_mnemonic(_('Web _Search for it')) diff -r 7b97d2ab8f70 -r 82599a0f0053 src/groupchat_control.py --- a/src/groupchat_control.py Sat Oct 18 23:10:42 2014 +0200 +++ b/src/groupchat_control.py Mon Oct 20 17:20:38 2014 +0200 @@ -586,14 +586,14 @@ item = Gtk.SeparatorMenuItem.new() menu.prepend(item) - item = Gtk.MenuItem(_('Insert Nickname')) + item = Gtk.MenuItem.new_with_label(_('Insert Nickname')) menu.prepend(item) submenu = Gtk.Menu() item.set_submenu(submenu) for nick in sorted(gajim.contacts.get_nick_list(self.account, self.room_jid)): - item = Gtk.MenuItem(nick, use_underline=False) + item = Gtk.MenuItem.new_with_label(nick, use_underline=False) submenu.append(item) id_ = item.connect('activate', self.append_nick_in_msg_textview, nick) diff -r 7b97d2ab8f70 -r 82599a0f0053 src/gui_interface.py --- a/src/gui_interface.py Sat Oct 18 23:10:42 2014 +0200 +++ b/src/gui_interface.py Mon Oct 20 17:20:38 2014 +0200 @@ -1948,7 +1948,7 @@ size = int(round(math.sqrt(len(self.emoticons_images)))) for image in self.emoticons_images: # In Gtk 3.6, Gtk.MenuItem() doesn't contain a label child - item = Gtk.MenuItem('q') + item = Gtk.MenuItem.new_with_label('q') img = Gtk.Image() if isinstance(image[1], GdkPixbuf.PixbufAnimation): img.set_from_animation(image[1]) diff -r 7b97d2ab8f70 -r 82599a0f0053 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Sat Oct 18 23:10:42 2014 +0200 +++ b/src/gui_menu_builder.py Mon Oct 20 17:20:38 2014 +0200 @@ -44,7 +44,8 @@ for c in contacts: # icon MUST be different instance for every item state_images = gtkgui_helpers.load_iconset(path) - item = Gtk.ImageMenuItem('%s (%s)' % (c.resource, str(c.priority))) + item = Gtk.ImageMenuItem.new_with_label( + '%s (%s)' % (c.resource, str(c.priority))) icon_name = helpers.get_icon_name_to_show(c, account) icon = state_images[icon_name] item.set_image(icon) @@ -154,7 +155,7 @@ item = Gtk.SeparatorMenuItem.new() # separator invite_to_submenu.append(item) for (room_jid, account) in rooms: - menuitem = Gtk.ImageMenuItem(room_jid.split('@')[0]) + menuitem = Gtk.ImageMenuItem.new_with_label(room_jid.split('@')[0]) muc_active_icon = gtkgui_helpers.load_icon('muc_active') menuitem.set_image(muc_active_icon) if len(contact_list) > 1: # several resources @@ -190,7 +191,7 @@ item = Gtk.SeparatorMenuItem.new() # separator invite_to_submenu.append(item) for (room_jid, account) in rooms2: - menuitem = Gtk.ImageMenuItem(room_jid.split('@')[0]) + menuitem = Gtk.ImageMenuItem.new_with_label(room_jid.split('@')[0]) muc_inactive_icon = gtkgui_helpers.load_icon('muc_inactive') menuitem.set_image(muc_inactive_icon) if len(contact_list) > 1: # several resources @@ -473,9 +474,10 @@ for s in ('online', 'chat', 'away', 'xa', 'dnd', 'offline'): # icon MUST be different instance for every item state_images = gtkgui_helpers.load_iconset(path) - status_menuitem = Gtk.ImageMenuItem(helpers.get_uf_show(s)) + status_menuitem = Gtk.ImageMenuItem.new_with_label( + helpers.get_uf_show(s)) status_menuitem.connect('activate', roster.on_send_custom_status, - [(contact, account)], s) + [(contact, account)], s) icon = state_images[s] status_menuitem.set_image(icon) status_menuitems.append(status_menuitem) @@ -619,7 +621,8 @@ for s in ('online', 'chat', 'away', 'xa', 'dnd', 'offline'): # icon MUST be different instance for every item state_images = gtkgui_helpers.load_iconset(path) - status_menuitem = Gtk.ImageMenuItem(helpers.get_uf_show(s)) + status_menuitem = Gtk.ImageMenuItem.new_with_label( + helpers.get_uf_show(s)) status_menuitem.connect('activate', roster.on_send_custom_status, [(contact, account)], s) icon = state_images[s] diff -r 7b97d2ab8f70 -r 82599a0f0053 src/roster_window.py --- a/src/roster_window.py Sat Oct 18 23:10:42 2014 +0200 +++ b/src/roster_window.py Mon Oct 20 17:20:38 2014 +0200 @@ -4850,7 +4850,7 @@ # c_dest is None if jid_dest doesn't belong to account return menu = Gtk.Menu() - item = Gtk.MenuItem(_('Send %s to %s') % ( + item = Gtk.MenuItem.new_with_label(_('Send %s to %s') % ( c_source.get_shown_name(), c_dest.get_shown_name())) item.set_use_underline(False) item.connect('activate', self.on_drop_rosterx, account_source, @@ -4862,11 +4862,13 @@ source_family = gajim.contacts.get_metacontacts_family( account_source, c_source.jid) if dest_family == source_family and dest_family: - item = Gtk.MenuItem(_('Make %s first contact') % ( + item = Gtk.MenuItem.new_with_label( + _('Make %s first contact') % ( c_source.get_shown_name())) item.set_use_underline(False) else: - item = Gtk.MenuItem(_('Make %s and %s metacontacts') % ( + item = Gtk.MenuItem.new_with_label( + _('Make %s and %s metacontacts') % ( c_source.get_shown_name(), c_dest.get_shown_name())) item.set_use_underline(False) @@ -5333,7 +5335,8 @@ continue # new chat - new_chat_item = Gtk.MenuItem(_('using account %s') % account) + new_chat_item = Gtk.MenuItem.new_with_label( + _('using account %s') % account) new_chat_item.set_use_underline(False) new_chat_sub_menu.append(new_chat_item) new_chat_item.connect('activate', @@ -5387,8 +5390,8 @@ continue # single message - single_message_item = Gtk.MenuItem(_('using account %s') % \ - account) + single_message_item = Gtk.MenuItem.new_with_label( + _('using account %s') % account) single_message_item.set_use_underline(False) single_message_sub_menu.append(single_message_item) single_message_item.connect('activate', @@ -5397,7 +5400,8 @@ # join gc if gajim.connections[account].private_storage_supported: connected_accounts_with_private_storage += 1 - gc_item = Gtk.MenuItem(_('using account %s') % account) + gc_item = Gtk.MenuItem.new_with_label( + _('using account %s') % account) gc_item.set_use_underline(False) gc_sub_menu.append(gc_item) gc_menuitem_menu = Gtk.Menu() @@ -5405,13 +5409,15 @@ gc_item.set_submenu(gc_menuitem_menu) # add - add_item = Gtk.MenuItem(_('to %s account') % account) + add_item = Gtk.MenuItem.new_with_label( + _('to %s account') % account) add_item.set_use_underline(False) add_sub_menu.append(add_item) add_item.connect('activate', self.on_add_new_contact, account) # disco - disco_item = Gtk.MenuItem(_('using %s account') % account) + disco_item = Gtk.MenuItem.new_with_label( + _('using %s account') % account) disco_item.set_use_underline(False) disco_sub_menu.append(disco_item) disco_item.connect('activate', @@ -5470,7 +5476,8 @@ profile_avatar_sub_menu = Gtk.Menu() for account in connected_accounts_with_vcard: # profile, avatar - profile_avatar_item = Gtk.MenuItem(_('of account %s') % account) + profile_avatar_item = Gtk.MenuItem.new_with_label( + _('of account %s') % account) profile_avatar_item.set_use_underline(False) profile_avatar_sub_menu.append(profile_avatar_item) profile_avatar_item.connect('activate', @@ -5511,7 +5518,8 @@ accounts.append(account) accounts.sort() for account in accounts: - advanced_item = Gtk.MenuItem(_('for account %s') % account) + advanced_item = Gtk.MenuItem.new_with_label( + _('for account %s') % account) advanced_item.set_use_underline(False) advanced_sub_menu.append(advanced_item) advanced_menuitem_menu = \ @@ -5594,7 +5602,7 @@ pep_submenu = Gtk.Menu() pep_menuitem.set_submenu(pep_submenu) def add_item(label, opt_name, func): - item = Gtk.CheckMenuItem(label) + item = Gtk.CheckMenuItem.new_with_label(label) pep_submenu.append(item) if not dbus_support.supported: item.set_sensitive(False) @@ -5609,7 +5617,8 @@ add_item(_('Publish Location'), 'publish_location', self.on_publish_location_toggled) - pep_config = Gtk.ImageMenuItem(_('Configure Services...')) + pep_config = Gtk.ImageMenuItem.new_with_label( + _('Configure Services...')) item = Gtk.SeparatorMenuItem.new() pep_submenu.append(item) pep_config.set_sensitive(True) @@ -5718,7 +5727,7 @@ accounts.sort() for account in accounts: state_images = gtkgui_helpers.load_iconset(path) - item = Gtk.ImageMenuItem(account) + item = Gtk.ImageMenuItem.new_with_label(account) show = gajim.SHOW_LIST[gajim.connections[account].connected] icon = state_images[show] item.set_image(icon) @@ -5780,11 +5789,11 @@ send_group_message_item.set_submenu(send_group_message_submenu) menu.append(send_group_message_item) - group_message_to_all_item = Gtk.MenuItem.new_with_mnemonic(_( + group_message_to_all_item = Gtk.MenuItem.new_with_label(_( 'To all users')) send_group_message_submenu.append(group_message_to_all_item) - group_message_to_all_online_item = Gtk.MenuItem.new_with_mnemonic( + group_message_to_all_online_item = Gtk.MenuItem.new_with_label( _('To all online users')) send_group_message_submenu.append(group_message_to_all_online_item) @@ -5825,7 +5834,8 @@ for s in ('online', 'chat', 'away', 'xa', 'dnd', 'offline'): # icon MUST be different instance for every item state_images = gtkgui_helpers.load_iconset(path) - status_menuitem = Gtk.ImageMenuItem(helpers.get_uf_show(s)) + status_menuitem = Gtk.ImageMenuItem.new_with_label( + helpers.get_uf_show(s)) status_menuitem.connect('activate', self.on_send_custom_status, list_, s, group) icon = state_images[s] @@ -5867,8 +5877,8 @@ if is_blocked and gajim.connections[account].\ privacy_rules_supported: - unblock_menuitem = Gtk.ImageMenuItem.new_with_mnemonic(_( - '_Unblock'))

1 0

gajim: Use explicit set_use_underline on MenuItem.
by Gajim 18 Oct '14

18 Oct '14

changeset 7b97d2ab8f70 in /home/hg/repos/gajim author: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl(a)redhat.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=7b97d2ab8f70 description: Use explicit set_use_underline on MenuItem. There are many warnings Using positional arguments with the GObject constructor has been deprecated. cluttering stderr needlessly. Fixes #7855 diffstat: src/roster_window.py | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) diffs (112 lines): diff -r f96ae8997a05 -r 7b97d2ab8f70 src/roster_window.py --- a/src/roster_window.py Sat Oct 18 23:08:59 2014 +0200 +++ b/src/roster_window.py Sat Oct 18 23:10:42 2014 +0200 @@ -4851,8 +4851,8 @@ return menu = Gtk.Menu() item = Gtk.MenuItem(_('Send %s to %s') % ( - c_source.get_shown_name(), c_dest.get_shown_name()), - use_underline=False) + c_source.get_shown_name(), c_dest.get_shown_name())) + item.set_use_underline(False) item.connect('activate', self.on_drop_rosterx, account_source, c_source, account_dest, c_dest, is_big_brother, context, etime) menu.append(item) @@ -4863,11 +4863,12 @@ account_source, c_source.jid) if dest_family == source_family and dest_family: item = Gtk.MenuItem(_('Make %s first contact') % ( - c_source.get_shown_name()), use_underline=False) + c_source.get_shown_name())) + item.set_use_underline(False) else: item = Gtk.MenuItem(_('Make %s and %s metacontacts') % ( - c_source.get_shown_name(), c_dest.get_shown_name()), - use_underline=False) + c_source.get_shown_name(), c_dest.get_shown_name())) + item.set_use_underline(False) item.connect('activate', self.on_drop_in_contact, account_source, c_source, account_dest, c_dest, is_big_brother, context, etime) @@ -5332,8 +5333,8 @@ continue # new chat - new_chat_item = Gtk.MenuItem(_('using account %s') % account, - use_underline=False) + new_chat_item = Gtk.MenuItem(_('using account %s') % account) + new_chat_item.set_use_underline(False) new_chat_sub_menu.append(new_chat_item) new_chat_item.connect('activate', self.on_new_chat_menuitem_activate, account) @@ -5387,7 +5388,8 @@ # single message single_message_item = Gtk.MenuItem(_('using account %s') % \ - account, use_underline=False) + account) + single_message_item.set_use_underline(False) single_message_sub_menu.append(single_message_item) single_message_item.connect('activate', self.on_send_single_message_menuitem_activate, account) @@ -5395,22 +5397,22 @@ # join gc if gajim.connections[account].private_storage_supported: connected_accounts_with_private_storage += 1 - gc_item = Gtk.MenuItem(_('using account %s') % account, - use_underline=False) + gc_item = Gtk.MenuItem(_('using account %s') % account) + gc_item.set_use_underline(False) gc_sub_menu.append(gc_item) gc_menuitem_menu = Gtk.Menu() self.add_bookmarks_list(gc_menuitem_menu, account) gc_item.set_submenu(gc_menuitem_menu) # add - add_item = Gtk.MenuItem(_('to %s account') % account, - use_underline=False) + add_item = Gtk.MenuItem(_('to %s account') % account) + add_item.set_use_underline(False) add_sub_menu.append(add_item) add_item.connect('activate', self.on_add_new_contact, account) # disco - disco_item = Gtk.MenuItem(_('using %s account') % account, - use_underline=False) + disco_item = Gtk.MenuItem(_('using %s account') % account) + disco_item.set_use_underline(False) disco_sub_menu.append(disco_item) disco_item.connect('activate', self.on_service_disco_menuitem_activate, account) @@ -5468,8 +5470,8 @@ profile_avatar_sub_menu = Gtk.Menu() for account in connected_accounts_with_vcard: # profile, avatar - profile_avatar_item = Gtk.MenuItem(_('of account %s') % account, - use_underline=False) + profile_avatar_item = Gtk.MenuItem(_('of account %s') % account) + profile_avatar_item.set_use_underline(False) profile_avatar_sub_menu.append(profile_avatar_item) profile_avatar_item.connect('activate', self.on_profile_avatar_menuitem_activate, account) @@ -5509,8 +5511,8 @@ accounts.append(account) accounts.sort() for account in accounts: - advanced_item = Gtk.MenuItem(_('for account %s') % account, - use_underline=False) + advanced_item = Gtk.MenuItem(_('for account %s') % account) + advanced_item.set_use_underline(False) advanced_sub_menu.append(advanced_item) advanced_menuitem_menu = \ self.get_and_connect_advanced_menuitem_menu(account) @@ -6201,7 +6203,8 @@ for bookmark in gajim.connections[account].bookmarks: # Do not use underline. - item = Gtk.MenuItem(bookmark['name'], use_underline=False) + item = Gtk.MenuItem(bookmark['name']) + item.set_use_underline(False) item.connect('activate', self.on_bookmark_menuitem_activate, account, bookmark) gc_sub_menu.append(item)

1 0

gajim: fix opening discover services window. Fixes #7854
by Gajim 18 Oct '14

18 Oct '14

changeset f96ae8997a05 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=f96ae8997a05 description: fix opening discover services window. Fixes #7854 diffstat: data/gui/service_discovery_window.ui | 46 +++++++++++++++++++++++++---------- 1 files changed, 33 insertions(+), 13 deletions(-) diffs (86 lines): diff -r 50315cad4a6d -r f96ae8997a05 data/gui/service_discovery_window.ui --- a/data/gui/service_discovery_window.ui Sat Oct 18 22:40:33 2014 +0200 +++ b/data/gui/service_discovery_window.ui Sat Oct 18 23:08:59 2014 +0200 @@ -1,17 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> + <interface> -  + <requires lib="gtk+" version="3.0"/> <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="stock">gtk-jump-to</property> </object> - <object class="GtkListStore" id="liststore1"> - <columns> -  - <column type="gchararray"/> - </columns> - </object> <object class="GtkWindow" id="service_discovery_window"> <property name="can_focus">False</property> <property name="border_width">6</property> @@ -84,12 +79,6 @@ <placeholder/> </child> <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> <object class="GtkButton" id="browse_button"> <property name="label" translatable="yes">G_o</property> <property name="visible">True</property> @@ -122,6 +111,28 @@ <property name="y_options"/> </packing> </child> + <child> + <object class="GtkComboBoxText" id="address_comboboxtext"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="has_entry">True</property> + <child internal-child="entry"> + <object class="GtkEntry" id="comboboxtext-entry"> + <property name="can_focus">False</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> @@ -140,6 +151,9 @@ <property name="can_focus">True</property> <property name="headers_visible">False</property> <signal name="row-activated" handler="on_services_treeview_row_activated" swapped="no"/> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> + </child> </object> </child> </object> @@ -219,4 +233,10 @@ </object> </child> </object> + <object class="GtkListStore" id="liststore1"> + <columns> +  + <column type="gchararray"/> + </columns> + </object> </interface>

1 0

gajim: Fix a typo.
by Gajim 18 Oct '14

18 Oct '14

changeset 50315cad4a6d in /home/hg/repos/gajim author: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl(a)redhat.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=50315cad4a6d description: Fix a typo. Fixes #7664 Signed-off-by: Matěj Cepl <mcepl(a)redhat.com> diffstat: src/gui_menu_builder.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 097ac847b4b7 -r 50315cad4a6d src/gui_menu_builder.py --- a/src/gui_menu_builder.py Thu May 29 23:28:25 2014 +0200 +++ b/src/gui_menu_builder.py Sat Oct 18 22:40:33 2014 +0200 @@ -609,7 +609,7 @@ send_custom_status_menuitem.set_image(gtkgui_helpers.load_icon( gajim.interface.status_sent_to_users[account][jid])) else: - icon = Gtk.Imag.new_from_stock(Gtk.STOCK_NETWORK, + icon = Gtk.Image.new_from_stock(Gtk.STOCK_NETWORK, Gtk.IconSize.MENU) send_custom_status_menuitem.set_image(icon) status_menuitems = Gtk.Menu()

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