copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix some PyGObject deprecation warnings

Browse source 
like
The "flags" argument for dialog construction is deprecated. Please use initializer keywords: modal=True and/or destroy_with_parent=True.
or
Using positional arguments with the GObject constructor has been deprecated. Please specify keyword(s) for "title, transient_for, flags" or use a class specific constructor.

See: https://wiki.gnome.org/PyGObject/InitializerDeprecations
This commit is contained in:
André Apitzsch 2018-11-03 13:54:28 +01:00
parent 4e0295fcd9
commit 09f0835fbd
5 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gajim/application.py
View file

@ -189,11 +189,12 @@ class GajimApplication(Gtk.Application):
caps_cache.initialize(app.logger) caps_cache.initialize(app.logger)
except exceptions.DatabaseMalformed as error: except exceptions.DatabaseMalformed as error:
dlg = Gtk.MessageDialog( dlg = Gtk.MessageDialog(
None, transient_for=None,
Gtk.DialogFlags.DESTROY_WITH_PARENT | Gtk.DialogFlags.MODAL, destroy_with_parent=True,
Gtk.MessageType.ERROR, modal=True,
Gtk.ButtonsType.OK, message_type=Gtk.MessageType.ERROR,
_('Database Error')) buttons=Gtk.ButtonsType.OK,
text=_('Database Error'))
dlg.format_secondary_text(str(error)) dlg.format_secondary_text(str(error))
dlg.run() dlg.run()
dlg.destroy() dlg.destroy()

5
gajim/dialogs.py
View file

@ -1511,8 +1511,9 @@ class TransformChatToMUC:
class Dialog(Gtk.Dialog): class Dialog(Gtk.Dialog):
def __init__(self, parent, title, buttons, default=None, def __init__(self, parent, title, buttons, default=None,
on_response_ok=None, on_response_cancel=None): on_response_ok=None, on_response_cancel=None):
Gtk.Dialog.__init__(self, title, parent, super().__init__(title=title,
Gtk.DialogFlags.DESTROY_WITH_PARENT) transient_for=parent,
destroy_with_parent=True)
self.user_response_ok = on_response_ok self.user_response_ok = on_response_ok
self.user_response_cancel = on_response_cancel self.user_response_cancel = on_response_cancel

7
gajim/gtk/dialogs.py
View file

@ -900,8 +900,9 @@ class SSLErrorDialog(ConfirmationDialogDoubleCheck):
class ChangePasswordDialog(Gtk.Dialog): class ChangePasswordDialog(Gtk.Dialog):
def __init__(self, account, success_cb, transient_for): def __init__(self, account, success_cb, transient_for):
flags = Gtk.DialogFlags.DESTROY_WITH_PARENT super().__init__(title=_('Change Password'),
super().__init__(_('Change Password'), None, flags) transient_for=transient_for,
destroy_with_parent=True)
self._account = account self._account = account
self._success_cb = success_cb self._success_cb = success_cb
@ -913,8 +914,6 @@ class ChangePasswordDialog(Gtk.Dialog):
self._password2_entry = self._builder.get_object('password2_entry') self._password2_entry = self._builder.get_object('password2_entry')
self._error_label = self._builder.get_object('error_label') self._error_label = self._builder.get_object('error_label')
self.set_transient_for(transient_for)
self.add_button(_('_OK'), Gtk.ResponseType.OK) self.add_button(_('_OK'), Gtk.ResponseType.OK)
self.set_default_response(Gtk.ResponseType.OK) self.set_default_response(Gtk.ResponseType.OK)
self.get_style_context().add_class('dialog-margin') self.get_style_context().add_class('dialog-margin')

11
gajim/gtk/features.py
View file

@ -31,8 +31,9 @@ from gajim.common.i18n import _
class FeaturesDialog(Gtk.Dialog): class FeaturesDialog(Gtk.Dialog):
def __init__(self): def __init__(self):
flags = Gtk.DialogFlags.DESTROY_WITH_PARENT super().__init__(title=_('Features'),
super().__init__(_('Features'), None, flags) transient_for=None,
destroy_with_parent=True)
self.set_transient_for(app.interface.roster.window) self.set_transient_for(app.interface.roster.window)
self.set_resizable(False) self.set_resizable(False)
@ -205,12 +206,14 @@ class FeatureItem(Gtk.Grid):
if not feature.available: if not feature.available:
self.feature_dependency_u.set_halign(Gtk.Align.START) self.feature_dependency_u.set_halign(Gtk.Align.START)
self.feature_dependency_u.set_alignment(0.0, 0.0) self.feature_dependency_u.set_xalign(0.0)
self.feature_dependency_u.set_yalign(0.0)
self.feature_dependency_u.set_line_wrap(True) self.feature_dependency_u.set_line_wrap(True)
self.feature_dependency_u.set_max_width_chars(50) self.feature_dependency_u.set_max_width_chars(50)
self.feature_dependency_u.set_selectable(True) self.feature_dependency_u.set_selectable(True)
self.feature_dependency_w.set_halign(Gtk.Align.START) self.feature_dependency_w.set_halign(Gtk.Align.START)
self.feature_dependency_w.set_alignment(0.0, 0.0) self.feature_dependency_w.set_xalign(0.0)
self.feature_dependency_w.set_yalign(0.0)
self.feature_dependency_w.set_line_wrap(True) self.feature_dependency_w.set_line_wrap(True)
self.feature_dependency_w.set_max_width_chars(50) self.feature_dependency_w.set_max_width_chars(50)
self.feature_dependency_w.set_selectable(True) self.feature_dependency_w.set_selectable(True)

5
gajim/gtk/server_info.py
View file

@ -29,8 +29,9 @@ log = logging.getLogger('gajim.gtk.serverinfo')
class ServerInfoDialog(Gtk.Dialog): class ServerInfoDialog(Gtk.Dialog):
def __init__(self, account): def __init__(self, account):
flags = Gtk.DialogFlags.DESTROY_WITH_PARENT super().__init__(title=_('Server Info'),
super().__init__(_('Server Info'), None, flags) transient_for=None,
destroy_with_parent=True)
self.account = account self.account = account
self.set_transient_for(app.interface.roster.window) self.set_transient_for(app.interface.roster.window)