[gnome-settings-daemon] sharing: Fix function arguments



commit 5b6b26eba58f5c3b8b5441f07f0af7a84af5cc52
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Aug 31 17:52:32 2016 +0200

    sharing: Fix function arguments
    
    e0b7f41 was committed after some code massaging, which resulted the
    wrong arguments being passed to a few functions,
    gsd_sharing_manager_handle_service() amongst them.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=770642

 plugins/sharing/gsd-sharing-manager.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/plugins/sharing/gsd-sharing-manager.c b/plugins/sharing/gsd-sharing-manager.c
index 170674b..8ad25f4 100644
--- a/plugins/sharing/gsd-sharing-manager.c
+++ b/plugins/sharing/gsd-sharing-manager.c
@@ -124,7 +124,6 @@ handle_unit_cb (GObject      *source_object,
 static void
 gsd_sharing_manager_handle_service (GsdSharingManager   *manager,
                                     const char          *method,
-                                    GAsyncReadyCallback  callback,
                                     ServiceInfo         *service)
 {
         char *service_file;
@@ -140,8 +139,8 @@ gsd_sharing_manager_handle_service (GsdSharingManager   *manager,
                                 G_DBUS_CALL_FLAGS_NONE,
                                 -1,
                                 manager->priv->cancellable,
-                                callback,
-                                manager);
+                                handle_unit_cb,
+                                (gpointer) method);
         g_free (service_file);
 }
 
@@ -154,8 +153,7 @@ gsd_sharing_manager_start_service (GsdSharingManager *manager,
         /* We use StartUnit, not StartUnitReplace, since the latter would
          * cancel any pending start we already have going from an
          * earlier _start_service() call */
-        gsd_sharing_manager_handle_service (manager, "StartUnit",
-                                            handle_unit_cb, "start");
+        gsd_sharing_manager_handle_service (manager, "StartUnit", service);
 }
 
 static void
@@ -164,8 +162,7 @@ gsd_sharing_manager_stop_service (GsdSharingManager *manager,
 {
         g_debug ("About to stop %s", service->name);
 
-        gsd_sharing_manager_handle_service (manager, "StopUnit",
-                                            handle_unit_cb, "stop");
+        gsd_sharing_manager_handle_service (manager, "StopUnit", service);
 }
 
 #ifdef HAVE_NETWORK_MANAGER


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]