From 4ba143fd683ebe219ea226f01707362ddc994c25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <forenjunkie@chello.at>
Date: Sun, 16 Jul 2017 22:49:34 +0200
Subject: [PATCH] Fix not working ManagePEPServicesWindow Dialog

---
 data/gui/data_form_window.ui           | 5 +++--
 data/gui/manage_pep_services_window.ui | 4 ++--
 gajim/config.py                        | 2 +-
 gajim/dialogs.py                       | 8 ++++----
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/data/gui/data_form_window.ui b/data/gui/data_form_window.ui
index ca6d7816f..f9856c8b2 100644
--- a/data/gui/data_form_window.ui
+++ b/data/gui/data_form_window.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="data_form_fake_window">
@@ -35,6 +35,7 @@
               <object class="GtkScrolledWindow" id="single_form_scrolledwindow">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="vexpand">True</property>
                 <child>
                   <object class="GtkViewport" id="single_form_viewport">
                     <property name="visible">True</property>
@@ -307,8 +308,8 @@
                           <object class="GtkLabel" id="title_label">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="wrap">True</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
diff --git a/data/gui/manage_pep_services_window.ui b/data/gui/manage_pep_services_window.ui
index cdefa44eb..ebb5a3f53 100644
--- a/data/gui/manage_pep_services_window.ui
+++ b/data/gui/manage_pep_services_window.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkImage" id="image1">
@@ -37,7 +37,7 @@
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
+            <property name="expand">True</property>
             <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
diff --git a/gajim/config.py b/gajim/config.py
index 1531a2e95..bab1e7501 100644
--- a/gajim/config.py
+++ b/gajim/config.py
@@ -4146,7 +4146,7 @@ class ManagePEPServicesWindow:
         self.treeview.append_column(col)
 
         cellrenderer_text = Gtk.CellRendererText()
-        col.pack_start(cellrenderer_text, True, True, 0)
+        col.pack_start(cellrenderer_text, True)
         col.add_attribute(cellrenderer_text, 'text', 0)
 
         our_jid = gajim.get_jid_from_account(self.account)
diff --git a/gajim/dialogs.py b/gajim/dialogs.py
index 48203b566..6f54c9ec6 100644
--- a/gajim/dialogs.py
+++ b/gajim/dialogs.py
@@ -1384,8 +1384,8 @@ class AboutDialog(Gtk.AboutDialog):
 class Dialog(Gtk.Dialog):
     def __init__(self, parent, title, buttons, default=None,
     on_response_ok=None, on_response_cancel=None):
-        GObject.GObject.__init__(self, title, parent,
-            Gtk.DialogFlags.DESTROY_WITH_PARENT | Gtk.DialogFlags.NO_SEPARATOR)
+        Gtk.Dialog.__init__(self, title, parent,
+            Gtk.DialogFlags.DESTROY_WITH_PARENT)
 
         self.user_response_ok = on_response_ok
         self.user_response_cancel = on_response_cancel
@@ -5296,11 +5296,11 @@ class DataFormWindow(Dialog):
     def __init__(self, form, on_response_ok):
         self.df_response_ok = on_response_ok
         Dialog.__init__(self, None, 'test', [(Gtk.STOCK_CANCEL,
-            Gtk.ResponseType.REJECT), (Gtk.STOCK_OK, Gtk.ResponseType.ACCEPT)],
+            Gtk.ResponseType.CANCEL), (Gtk.STOCK_OK, Gtk.ResponseType.OK)],
             on_response_ok=self.on_ok)
         self.set_resizable(True)
         gtkgui_helpers.resize_window(self, 600, 400)
-        self.dataform_widget =  dataforms_widget.DataFormWidget()
+        self.dataform_widget = dataforms_widget.DataFormWidget()
         self.dataform = dataforms.ExtendForm(node=form)
         self.dataform_widget.set_sensitive(True)
         self.dataform_widget.data_form = self.dataform