[gnome-control-center/gnome-3-38] Revert the g_signal_connect_object changes for PpPPDSelectionDialog

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 3da883c365d38f9fc1163c1038046656f3c34b1e
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri Sep 25 14:18:10 2020 +1200

    Revert the g_signal_connect_object changes for PpPPDSelectionDialog
    
    The dialog is not a GObject, so this didn't work. It was converted to a GObject
    in master in 26e8f115665302e6347e211951db24d68712707b.
    
    The reverts part of 4502673b6c2584cbcd116c782fc0b6c8392e3e3d

 panels/printers/pp-ppd-selection-dialog.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/panels/printers/pp-ppd-selection-dialog.c b/panels/printers/pp-ppd-selection-dialog.c
index c94a7c3b4..4c6a09232 100644
--- a/panels/printers/pp-ppd-selection-dialog.c
+++ b/panels/printers/pp-ppd-selection-dialog.c
@@ -65,7 +65,8 @@ struct _PpPPDSelectionDialog {
 };
 
 static void
-manufacturer_selection_changed_cb (PpPPDSelectionDialog *self)
+manufacturer_selection_changed_cb (GtkTreeSelection *selection,
+                                   PpPPDSelectionDialog *self)
 {
   GtkTreeView  *treeview;
   GtkListStore *store;
@@ -122,7 +123,8 @@ manufacturer_selection_changed_cb (PpPPDSelectionDialog *self)
 }
 
 static void
-model_selection_changed_cb (PpPPDSelectionDialog *self)
+model_selection_changed_cb (GtkTreeSelection *selection,
+                            PpPPDSelectionDialog *self)
 {
   GtkTreeView  *treeview;
   GtkTreeModel *model;
@@ -256,11 +258,11 @@ populate_dialog (PpPPDSelectionDialog *self)
   gtk_tree_view_append_column (models_treeview, column);
 
 
-  g_signal_connect_object (gtk_tree_view_get_selection (models_treeview),
-                           "changed", G_CALLBACK (model_selection_changed_cb), self, G_CONNECT_SWAPPED);
+  g_signal_connect (gtk_tree_view_get_selection (models_treeview),
+                    "changed", G_CALLBACK (model_selection_changed_cb), self);
 
-  g_signal_connect_object (gtk_tree_view_get_selection (manufacturers_treeview),
-                           "changed", G_CALLBACK (manufacturer_selection_changed_cb), self, 
G_CONNECT_SWAPPED);
+  g_signal_connect (gtk_tree_view_get_selection (manufacturers_treeview),
+                    "changed", G_CALLBACK (manufacturer_selection_changed_cb), self);
 
   gtk_widget_show_all (self->dialog);
 
@@ -282,8 +284,9 @@ populate_dialog (PpPPDSelectionDialog *self)
 }
 
 static void
-ppd_selection_dialog_response_cb (PpPPDSelectionDialog *self,
-                                  gint       response_id)
+ppd_selection_dialog_response_cb (GtkDialog *dialog,
+                                  gint       response_id,
+                                  PpPPDSelectionDialog *self)
 {
   GtkTreeSelection *selection;
   GtkTreeModel     *model;
@@ -354,7 +357,7 @@ pp_ppd_selection_dialog_new (GtkWindow            *parent,
 
   /* connect signals */
   g_signal_connect (self->dialog, "delete-event", G_CALLBACK (gtk_widget_hide_on_delete), NULL);
-  g_signal_connect_object (self->dialog, "response", G_CALLBACK (ppd_selection_dialog_response_cb), self, 
G_CONNECT_SWAPPED);
+  g_signal_connect (self->dialog, "response", G_CALLBACK (ppd_selection_dialog_response_cb), self);
 
   gtk_window_set_transient_for (GTK_WINDOW (self->dialog), GTK_WINDOW (parent));