[gnome-photos/wip/rishi/edit-mode: 28/30] organize-collection-dialog: simply callback

[Debarshi Ray <debarshir src gnome org>]

commit 452b04744d81010b259c69b638aae369c199782e
Author: Debarshi Ray <debarshir gnome org>
Date:   Sat Jun 13 01:18:39 2015 +0200

    organize-collection-dialog: simply callback

 src/photos-organize-collection-dialog.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/src/photos-organize-collection-dialog.c b/src/photos-organize-collection-dialog.c
index 80084c0..c9fff67 100644
--- a/src/photos-organize-collection-dialog.c
+++ b/src/photos-organize-collection-dialog.c
@@ -41,10 +41,8 @@ G_DEFINE_TYPE_WITH_PRIVATE (PhotosOrganizeCollectionDialog, photos_organize_coll
 
 
 static gboolean
-photos_organize_collection_dialog_button_press_event (GtkWidget *widget, GdkEvent *event, gpointer user_data)
+photos_organize_collection_dialog_button_press_event (PhotosOrganizeCollectionDialog *self, GdkEvent *event)
 {
-  PhotosOrganizeCollectionDialog *self = PHOTOS_ORGANIZE_COLLECTION_DIALOG (user_data);
-
   photos_organize_collection_view_confirmed_choice (PHOTOS_ORGANIZE_COLLECTION_VIEW (self->priv->coll_view));
   return FALSE;
 }
@@ -98,10 +96,10 @@ photos_organize_collection_dialog_init (PhotosOrganizeCollectionDialog *self)
    *   editing-canceled signal and add the collection in that case
    *   instead.
    */
-  g_signal_connect (ok_button,
-                    "button-press-event",
-                    G_CALLBACK (photos_organize_collection_dialog_button_press_event),
-                    self);
+  g_signal_connect_swapped (ok_button,
+                            "button-press-event",
+                            G_CALLBACK (photos_organize_collection_dialog_button_press_event),
+                            self);
 }