[gnome-photos] remote-display-manager: Use g_auto*
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-photos] remote-display-manager: Use g_auto*
- Date: Tue, 5 Dec 2017 10:16:40 +0000 (UTC)
commit f0cbb17b8b26d24dac0b8a899f57edbec4ee704e
Author: Umang Jain <mailumangjain gmail com>
Date: Sun Dec 3 11:53:33 2017 +0530
remote-display-manager: Use g_auto*
https://bugzilla.gnome.org/show_bug.cgi?id=788174
src/photos-remote-display-manager.c | 37 +++++++++++++++++------------------
1 files changed, 18 insertions(+), 19 deletions(-)
---
diff --git a/src/photos-remote-display-manager.c b/src/photos-remote-display-manager.c
index d83c588..ad9dba3 100644
--- a/src/photos-remote-display-manager.c
+++ b/src/photos-remote-display-manager.c
@@ -171,23 +171,23 @@ static void
photos_remote_display_manager_share_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
{
Share *share = user_data;
+ g_autoptr (PhotosBaseItem) item = NULL;
PhotosDlnaRenderer *renderer = PHOTOS_DLNA_RENDERER (source_object);
- PhotosBaseItem *item;
- GError *error = NULL;
- item = photos_dlna_renderer_share_finish (renderer, res, &error);
+ {
+ g_autoptr (GError) error = NULL;
- if (error != NULL)
- {
- g_warning ("Unable to remotely display item '%s': %s",
- share->item != NULL ? photos_filterable_get_id (PHOTOS_FILTERABLE (share->item)) : "(none)",
- error->message);
- g_signal_emit (share->manager, signals[SHARE_ERROR], 0, share->renderer, share->item, error);
- g_error_free (error);
- goto out;
- }
+ item = photos_dlna_renderer_share_finish (renderer, res, &error);
+ if (error != NULL)
+ {
+ g_warning ("Unable to remotely display item '%s': %s",
+ share->item != NULL ? photos_filterable_get_id (PHOTOS_FILTERABLE (share->item)) :
"(none)",
+ error->message);
+ g_signal_emit (share->manager, signals[SHARE_ERROR], 0, share->renderer, share->item, error);
+ goto out;
+ }
+ }
- g_object_unref (item); /* We already hold a ref to the item to be shared */
g_signal_emit (share->manager, signals[SHARE_BEGAN], 0, share->renderer, share->item);
out:
@@ -200,15 +200,14 @@ photos_remote_display_manager_unshare_all_cb (GObject *source_object, GAsyncResu
{
PhotosDlnaRenderer *renderer = PHOTOS_DLNA_RENDERER (source_object);
PhotosRemoteDisplayManager *self = PHOTOS_REMOTE_DISPLAY_MANAGER (user_data);
- GError *error = NULL;
- photos_dlna_renderer_unshare_all_finish (renderer, res, &error);
+ {
+ g_autoptr (GError) error = NULL;
- if (error != NULL)
- {
+ photos_dlna_renderer_unshare_all_finish (renderer, res, &error);
+ if (error != NULL)
g_warning ("Error while unsharing: %s", error->message);
- g_error_free (error);
- }
+ }
/* Avoid firing ::share-ended if any other item has been shared between the
* _unshare_all() call and this callback */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]