Philipp Hörist pushed to branch master at gajim / gajim

Commits: 73928836 by Philipp Hörist at 2018-08-17T22:10:10Z Fix deprecation warning

- - - - - 042d8aa6 by Philipp Hörist at 2018-08-17T22:13:51Z Fix deprecation warning

only keyword args should be used

- - - - -

5 changed files:

- gajim/accounts_window.py - gajim/chat_control_base.py - gajim/filetransfers_window.py - gajim/gtk/start_chat.py - gajim/gtk/themes.py

Changes:

===================================== gajim/accounts_window.py ===================================== --- a/gajim/accounts_window.py +++ b/gajim/accounts_window.py @@ -313,7 +313,7 @@ class AddAccount(Gtk.Box):

self.account = None

- self.label = Gtk.Label(_('Add Account…')) + self.label = Gtk.Label(label=_('Add Account…')) self.label.set_halign(Gtk.Align.START) self.label.set_hexpand(True)

@@ -342,7 +342,7 @@ class Preferences(Gtk.Box): self.parent = parent self.account = None

- self.label = Gtk.Label(_('Preferences')) + self.label = Gtk.Label(label=_('Preferences')) self.label.set_halign(Gtk.Align.START) self.label.set_hexpand(True)

===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -75,7 +75,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): A base class containing a banner, ConversationTextview, MessageTextView """

- keymap = Gdk.Keymap.get_default() + keymap = Gdk.Keymap.get_for_display(Gdk.Display.get_default()) try: keycode_c = keymap.get_entries_for_keyval(Gdk.KEY_c)[1][0].keycode except TypeError:

===================================== gajim/filetransfers_window.py ===================================== --- a/gajim/filetransfers_window.py +++ b/gajim/filetransfers_window.py @@ -1071,7 +1071,7 @@ class FileRow(Gtk.ListBoxRow): def __init__(self, path): Gtk.ListBoxRow.__init__(self) self.path = Path(path) - label = Gtk.Label(self.path.name) + label = Gtk.Label(label=self.path.name) label.set_ellipsize(Pango.EllipsizeMode.END) label.set_xalign(0) self.add(label)

===================================== gajim/gtk/start_chat.py ===================================== --- a/gajim/gtk/start_chat.py +++ b/gajim/gtk/start_chat.py @@ -297,7 +297,7 @@ class ContactRow(Gtk.Grid): else: self.name = _('New Contact')

- self.name_label = Gtk.Label(self.name) + self.name_label = Gtk.Label(label=self.name) self.name_label.set_ellipsize(Pango.EllipsizeMode.END) self.name_label.set_xalign(0) self.name_label.set_width_chars(25) @@ -310,7 +310,7 @@ class ContactRow(Gtk.Grid): self.name_label.get_style_context().add_class(css_class) middle_box.add(self.name_label)

- self.jid_label = Gtk.Label(jid) + self.jid_label = Gtk.Label(label=jid) self.jid_label.set_ellipsize(Pango.EllipsizeMode.END) self.jid_label.set_xalign(0) self.jid_label.set_width_chars(25) @@ -320,7 +320,7 @@ class ContactRow(Gtk.Grid): self.add(middle_box)

if show_account: - account_label = Gtk.Label(self.account_label) + account_label = Gtk.Label(label=self.account_label) account_label.set_halign(Gtk.Align.START) account_label.set_valign(Gtk.Align.START)

===================================== gajim/gtk/themes.py ===================================== --- a/gajim/gtk/themes.py +++ b/gajim/gtk/themes.py @@ -409,7 +409,7 @@ class ChooseOption(Gtk.ListBoxRow): def __init__(self, option): Gtk.ListBoxRow.__init__(self) self.option = option - label = Gtk.Label(option.label) + label = Gtk.Label(label=option.label) label.set_xalign(0) self.add(label) self.show_all()

View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3392f663dedfe38530ec81ee3b7b60917d...