[gnome-photos/wip/rishi/share-point: 18/18] export-notification, facebook-item: Style fixes
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-photos/wip/rishi/share-point: 18/18] export-notification, facebook-item: Style fixes
- Date: Sun, 21 Aug 2016 23:31:28 +0000 (UTC)
commit e10092986f9e783303a33dc78ece26a310217ad0
Author: Debarshi Ray <debarshir gnome org>
Date: Mon Aug 22 01:13:53 2016 +0200
export-notification, facebook-item: Style fixes
src/photos-export-notification.c | 3 +--
src/photos-facebook-item.c | 21 ++++++++++++---------
2 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/src/photos-export-notification.c b/src/photos-export-notification.c
index 38a79e8..14c1008 100644
--- a/src/photos-export-notification.c
+++ b/src/photos-export-notification.c
@@ -323,8 +323,7 @@ photos_export_notification_constructed (GObject *object)
gtk_container_add (GTK_CONTAINER (self), close);
g_signal_connect_swapped (close, "clicked", G_CALLBACK (photos_export_notification_close), self);
- photos_notification_manager_add_notification (PHOTOS_NOTIFICATION_MANAGER (self->ntfctn_mngr),
- GTK_WIDGET (self));
+ photos_notification_manager_add_notification (PHOTOS_NOTIFICATION_MANAGER (self->ntfctn_mngr), GTK_WIDGET
(self));
self->timeout_id = g_timeout_add_seconds (EXPORT_TIMEOUT, photos_export_notification_timeout, self);
}
diff --git a/src/photos-facebook-item.c b/src/photos-facebook-item.c
index 00c6af6..0cd5c90 100644
--- a/src/photos-facebook-item.c
+++ b/src/photos-facebook-item.c
@@ -89,8 +89,8 @@ photos_facebook_item_create_name_fallback (PhotosBaseItem *item)
PhotosFacebookItem *self = PHOTOS_FACEBOOK_ITEM (item);
GDateTime *date_modified;
const gchar *provider_name;
- gchar *ret_val;
gchar *date_modified_str;
+ gchar *ret_val;
gint64 mtime;
provider_name = photos_utils_get_provider_name (self->src_mngr, item);
@@ -114,10 +114,11 @@ static GFBGraphPhoto *
photos_facebook_get_gfbgraph_photo (PhotosBaseItem *item, GCancellable *cancellable, GError **error)
{
PhotosFacebookItem *self = PHOTOS_FACEBOOK_ITEM (item);
- PhotosSource *source;
- const gchar *identifier, *resource_urn;
GFBGraphGoaAuthorizer *authorizer;
GFBGraphPhoto *photo = NULL;
+ PhotosSource *source;
+ const gchar *identifier;
+ const gchar *resource_urn;
resource_urn = photos_base_item_get_resource_urn (item);
source = PHOTOS_SOURCE (photos_base_manager_get_object_by_id (self->src_mngr, resource_urn));
@@ -137,11 +138,13 @@ photos_facebook_get_gfbgraph_photo (PhotosBaseItem *item, GCancellable *cancella
static gboolean
photos_facebook_item_create_thumbnail (PhotosBaseItem *item, GCancellable *cancellable, GError **error)
{
+ GFile *local_file = NULL;
+ GFile *remote_file = NULL;
GFBGraphPhoto *photo = NULL;
const GFBGraphPhotoImage *thumbnail_image;
- gchar *local_path = NULL, *local_dir = NULL;
- GFile *local_file = NULL, *remote_file = NULL;
gboolean ret_val = FALSE;
+ gchar *local_dir = NULL;
+ gchar *local_path = NULL;
photo = photos_facebook_get_gfbgraph_photo (item, cancellable, error);
if (photo == NULL)
@@ -175,8 +178,8 @@ photos_facebook_item_create_thumbnail (PhotosBaseItem *item, GCancellable *cance
ret_val = TRUE;
out:
- g_free (local_path);
g_free (local_dir);
+ g_free (local_path);
g_clear_object (&local_file);
g_clear_object (&remote_file);
g_clear_object (&photo);
@@ -187,10 +190,10 @@ photos_facebook_item_create_thumbnail (PhotosBaseItem *item, GCancellable *cance
static gchar *
photos_facebook_item_download (PhotosBaseItem *item, GCancellable *cancellable, GError **error)
{
- GFBGraphPhoto *photo = NULL;
- const GFBGraphPhotoImage *higher_image;
GFile *local_file = NULL;
GFile *remote_file = NULL;
+ GFBGraphPhoto *photo = NULL;
+ const GFBGraphPhotoImage *higher_image;
const gchar *cache_dir;
const gchar *local_filename;
gchar *local_dir = NULL;
@@ -238,8 +241,8 @@ photos_facebook_item_download (PhotosBaseItem *item, GCancellable *cancellable,
local_path = NULL;
out:
- g_free (local_path);
g_free (local_dir);
+ g_free (local_path);
g_clear_object (&local_file);
g_clear_object (&remote_file);
g_clear_object (&photo);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]