From 09f0835fbd02f4586181d1ea08310f176558291c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Apitzsch?= <git@apitzsch.eu>
Date: Sat, 3 Nov 2018 13:54:28 +0100
Subject: [PATCH] Fix some PyGObject deprecation warnings

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
---
 gajim/application.py     | 11 ++++++-----
 gajim/dialogs.py         |  5 +++--
 gajim/gtk/dialogs.py     |  7 +++----
 gajim/gtk/features.py    | 11 +++++++----
 gajim/gtk/server_info.py |  5 +++--
 5 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/gajim/application.py b/gajim/application.py
index 464b367f4..bc3e3ec82 100644
--- a/gajim/application.py
+++ b/gajim/application.py
@@ -189,11 +189,12 @@ class GajimApplication(Gtk.Application):
             caps_cache.initialize(app.logger)
         except exceptions.DatabaseMalformed as error:
             dlg = Gtk.MessageDialog(
-                None,
-                Gtk.DialogFlags.DESTROY_WITH_PARENT | Gtk.DialogFlags.MODAL,
-                Gtk.MessageType.ERROR,
-                Gtk.ButtonsType.OK,
-                _('Database Error'))
+                transient_for=None,
+                destroy_with_parent=True,
+                modal=True,
+                message_type=Gtk.MessageType.ERROR,
+                buttons=Gtk.ButtonsType.OK,
+                text=_('Database Error'))
             dlg.format_secondary_text(str(error))
             dlg.run()
             dlg.destroy()
diff --git a/gajim/dialogs.py b/gajim/dialogs.py
index c73a472a3..e2cde1d06 100644
--- a/gajim/dialogs.py
+++ b/gajim/dialogs.py
@@ -1511,8 +1511,9 @@ class TransformChatToMUC:
 class Dialog(Gtk.Dialog):
     def __init__(self, parent, title, buttons, default=None,
     on_response_ok=None, on_response_cancel=None):
-        Gtk.Dialog.__init__(self, title, parent,
-            Gtk.DialogFlags.DESTROY_WITH_PARENT)
+        super().__init__(title=title,
+                         transient_for=parent,
+                         destroy_with_parent=True)
 
         self.user_response_ok = on_response_ok
         self.user_response_cancel = on_response_cancel
diff --git a/gajim/gtk/dialogs.py b/gajim/gtk/dialogs.py
index 87944fe26..ce2383950 100644
--- a/gajim/gtk/dialogs.py
+++ b/gajim/gtk/dialogs.py
@@ -900,8 +900,9 @@ class SSLErrorDialog(ConfirmationDialogDoubleCheck):
 
 class ChangePasswordDialog(Gtk.Dialog):
     def __init__(self, account, success_cb, transient_for):
-        flags = Gtk.DialogFlags.DESTROY_WITH_PARENT
-        super().__init__(_('Change Password'), None, flags)
+        super().__init__(title=_('Change Password'),
+                         transient_for=transient_for,
+                         destroy_with_parent=True)
 
         self._account = account
         self._success_cb = success_cb
@@ -913,8 +914,6 @@ class ChangePasswordDialog(Gtk.Dialog):
         self._password2_entry = self._builder.get_object('password2_entry')
         self._error_label = self._builder.get_object('error_label')
 
-        self.set_transient_for(transient_for)
-
         self.add_button(_('_OK'), Gtk.ResponseType.OK)
         self.set_default_response(Gtk.ResponseType.OK)
         self.get_style_context().add_class('dialog-margin')
diff --git a/gajim/gtk/features.py b/gajim/gtk/features.py
index 0af3ca3f9..8d50bc83a 100644
--- a/gajim/gtk/features.py
+++ b/gajim/gtk/features.py
@@ -31,8 +31,9 @@ from gajim.common.i18n import _
 
 class FeaturesDialog(Gtk.Dialog):
     def __init__(self):
-        flags = Gtk.DialogFlags.DESTROY_WITH_PARENT
-        super().__init__(_('Features'), None, flags)
+        super().__init__(title=_('Features'),
+                         transient_for=None,
+                         destroy_with_parent=True)
 
         self.set_transient_for(app.interface.roster.window)
         self.set_resizable(False)
@@ -205,12 +206,14 @@ class FeatureItem(Gtk.Grid):
 
         if not feature.available:
             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_max_width_chars(50)
             self.feature_dependency_u.set_selectable(True)
             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_max_width_chars(50)
             self.feature_dependency_w.set_selectable(True)
diff --git a/gajim/gtk/server_info.py b/gajim/gtk/server_info.py
index 290b5f320..4dc9b367c 100644
--- a/gajim/gtk/server_info.py
+++ b/gajim/gtk/server_info.py
@@ -29,8 +29,9 @@ log = logging.getLogger('gajim.gtk.serverinfo')
 
 class ServerInfoDialog(Gtk.Dialog):
     def __init__(self, account):
-        flags = Gtk.DialogFlags.DESTROY_WITH_PARENT
-        super().__init__(_('Server Info'), None, flags)
+        super().__init__(title=_('Server Info'),
+                         transient_for=None,
+                         destroy_with_parent=True)
 
         self.account = account
         self.set_transient_for(app.interface.roster.window)