GNOME.org
 

[gnome-photos] Fix compilation warnings, mostly unused variables

commit a1d8ef2c068f6dbae59f69ff02649bc89c0c75e3
Author: Emanuele Aina <emanuele aina collabora com>
Date:   Tue Jul 9 17:37:06 2013 +0200

    Fix compilation warnings, mostly unused variables
    
    https://bugzilla.gnome.org/show_bug.cgi?id=703269

 src/photos-application.c              |    2 --
 src/photos-base-item.c                |    1 -
 src/photos-dlna-renderer.c            |   14 +-------------
 src/photos-dlna-renderers-dialog.c    |    1 -
 src/photos-dlna-renderers-manager.c   |    1 -
 src/photos-embed.c                    |    3 ---
 src/photos-error-box.c                |   11 -----------
 src/photos-flickr-item.c              |    1 -
 src/photos-load-more-button.c         |    2 +-
 src/photos-local-item.c               |    1 -
 src/photos-main-window.c              |    1 -
 src/photos-organize-collection-view.c |    1 -
 src/photos-preview-view.c             |    5 -----
 src/photos-print-operation.c          |    3 ---
 src/photos-print-setup.c              |    1 -
 src/photos-query-builder.c            |    5 -----
 src/photos-remote-display-manager.c   |    4 +---
 src/photos-selection-toolbar.c        |    2 --
 src/photos-source-manager.c           |    2 --
 src/photos-source.c                   |    3 ---
 src/photos-view-container.c           |    2 --
 21 files changed, 3 insertions(+), 63 deletions(-)
---
diff --git a/src/photos-application.c b/src/photos-application.c
index 430c2e9..14b9266 100644
--- a/src/photos-application.c
+++ b/src/photos-application.c
@@ -108,8 +108,6 @@ photos_application_refresh_data_free (PhotosApplicationRefreshData *data)
 static void
 photos_application_action_toggle (GSimpleAction *simple, GVariant *parameter, gpointer user_data)
 {
-  PhotosApplication *self = PHOTOS_APPLICATION (user_data);
-  PhotosApplicationPrivate *priv = self->priv;
   GVariant *state;
   GVariant *new_state;
 
diff --git a/src/photos-base-item.c b/src/photos-base-item.c
index 9524291..abcf08e 100644
--- a/src/photos-base-item.c
+++ b/src/photos-base-item.c
@@ -460,7 +460,6 @@ photos_base_item_file_query_info (GObject *source_object, GAsyncResult *res, gpo
   GError *error = NULL;
   GFile *file = G_FILE (source_object);
   GFileInfo *info;
-  gboolean have_new_icon = FALSE;
 
   info = g_file_query_info_finish (file, res, &error);
   if (error != NULL)
diff --git a/src/photos-dlna-renderer.c b/src/photos-dlna-renderer.c
index 8ded217..0927b3b 100644
--- a/src/photos-dlna-renderer.c
+++ b/src/photos-dlna-renderer.c
@@ -475,14 +475,9 @@ photos_dlna_renderer_share_play_cb (GObject      *source_object,
                                     gpointer      user_data)
 {
   GTask *task = G_TASK (user_data);
-  PhotosDlnaRenderer *self;
-  PhotosDlnaRendererPrivate *priv;
   PhotosBaseItem *item;
   GError *error = NULL;
 
-  self = PHOTOS_DLNA_RENDERER (g_task_get_source_object (task));
-  priv = self->priv;
-
   mpris_player_call_play_finish (MPRIS_PLAYER (source_object), res, &error);
   if (error != NULL)
     {
@@ -662,7 +657,6 @@ photos_dlna_renderer_unshare_remove_file_cb (GObject      *source_object,
 
   g_task_return_boolean (task, success);
 
-out:
   g_object_unref (task);
 }
 
@@ -716,7 +710,6 @@ photos_dlna_renderer_unshare_all_unshare_cb (GObject      *source_object,
                                              gpointer      user_data)
 {
   PhotosDlnaRenderer *self = PHOTOS_DLNA_RENDERER (source_object);
-  PhotosDlnaRendererPrivate *priv = self->priv;
   GTask *task = G_TASK (user_data);
   guint remaining;
   GError *error = NULL;
@@ -748,7 +741,6 @@ photos_dlna_renderer_unshare_all (PhotosDlnaRenderer  *self,
   GTask *task;
   GList *items, *item;
   guint remaining;
-  GError *error = NULL;
 
   task = g_task_new (self, cancellable, callback, user_data);
 
@@ -782,18 +774,15 @@ photos_dlna_renderer_device_get_icon_cb (GObject      *source_object,
                                          gpointer      user_data)
 {
   GTask *task = G_TASK (user_data);
-  PhotosDlnaRenderer *self;
   GInputStream *icon_stream = NULL;
   GdkPixbuf *pixbuf = NULL;
   GVariant *icon_variant = NULL;
   GBytes *icon_bytes = NULL;
   const gchar *icon_data;
-  gssize icon_data_size;
+  gsize icon_data_size;
   gchar *mimetype = NULL;
   GError *error = NULL;
 
-  self = PHOTOS_DLNA_RENDERER (g_task_get_source_object (task));
-
   /* The icon data is forced to be a GVariant since the GDBus bindings assume
    * bytestrings (type 'ay') to be nul-terminated and thus do not return the length
    * of the buffer */
@@ -851,7 +840,6 @@ photos_dlna_renderer_get_icon (PhotosDlnaRenderer  *self,
 {
   PhotosDlnaRendererPrivate *priv = self->priv;
   GTask *task;
-  GError *error = NULL;
 
   task = g_task_new (self, cancellable, callback, user_data);
 
diff --git a/src/photos-dlna-renderers-dialog.c b/src/photos-dlna-renderers-dialog.c
index c3d4602..d859508 100644
--- a/src/photos-dlna-renderers-dialog.c
+++ b/src/photos-dlna-renderers-dialog.c
@@ -180,7 +180,6 @@ photos_dlna_renderers_dialog_add_renderer (PhotosDlnaRenderersDialog *self,
   GtkWidget *image;
   GtkWidget *label;
   const gchar *name;
-  const gchar *icon_url;
 
   row = gtk_list_box_row_new ();
   row_grid = gtk_grid_new ();
diff --git a/src/photos-dlna-renderers-manager.c b/src/photos-dlna-renderers-manager.c
index 888fbeb..a722368 100644
--- a/src/photos-dlna-renderers-manager.c
+++ b/src/photos-dlna-renderers-manager.c
@@ -199,7 +199,6 @@ static void
 photos_dlna_renderers_manager_init (PhotosDlnaRenderersManager *self)
 {
   PhotosDlnaRenderersManagerPrivate *priv;
-  GError *error = NULL;
 
   self->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_DLNA_RENDERERS_MANAGER,
                                                    PhotosDlnaRenderersManagerPrivate);
diff --git a/src/photos-embed.c b/src/photos-embed.c
index c1dcd45..d3c9057 100644
--- a/src/photos-embed.c
+++ b/src/photos-embed.c
@@ -243,7 +243,6 @@ photos_embed_notify_visible_child (PhotosEmbed *self)
 {
   PhotosEmbedPrivate *priv = self->priv;
   GtkWidget *visible_child;
-  PhotosWindowMode mode;
 
   visible_child = gd_stack_get_visible_child (GD_STACK (priv->stack));
   if (visible_child == priv->overview)
@@ -365,7 +364,6 @@ photos_embed_window_mode_changed (PhotosModeController *mode_cntrlr,
                                   gpointer user_data)
 {
   PhotosEmbed *self = PHOTOS_EMBED (user_data);
-  PhotosEmbedPrivate *priv = self->priv;
 
   if (mode == PHOTOS_WINDOW_MODE_COLLECTIONS)
     photos_embed_prepare_for_collections (self);
@@ -412,7 +410,6 @@ photos_embed_init (PhotosEmbed *self)
 {
   PhotosEmbedPrivate *priv;
   gboolean querying;
-  GtkStyleContext *context;
 
   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_EMBED, PhotosEmbedPrivate);
   priv = self->priv;
diff --git a/src/photos-error-box.c b/src/photos-error-box.c
index 30bfd41..33cc206 100644
--- a/src/photos-error-box.c
+++ b/src/photos-error-box.c
@@ -79,16 +79,6 @@ photos_error_box_constructed (GObject *object)
 
 
 static void
-photos_error_box_dispose (GObject *object)
-{
-  PhotosErrorBox *self = PHOTOS_ERROR_BOX (object);
-  PhotosErrorBoxPrivate *priv = self->priv;
-
-  G_OBJECT_CLASS (photos_error_box_parent_class)->dispose (object);
-}
-
-
-static void
 photos_error_box_init (PhotosErrorBox *self)
 {
   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_ERROR_BOX, PhotosErrorBoxPrivate);
@@ -101,7 +91,6 @@ photos_error_box_class_init (PhotosErrorBoxClass *class)
   GObjectClass *object_class = G_OBJECT_CLASS (class);
 
   object_class->constructed = photos_error_box_constructed;
-  object_class->dispose = photos_error_box_dispose;
 
   g_type_class_add_private (class, sizeof (PhotosErrorBoxPrivate));
 }
diff --git a/src/photos-flickr-item.c b/src/photos-flickr-item.c
index 68af65b..a475c78 100644
--- a/src/photos-flickr-item.c
+++ b/src/photos-flickr-item.c
@@ -101,7 +101,6 @@ static void
 photos_flickr_item_constructed (GObject *object)
 {
   PhotosFlickrItem *self = PHOTOS_FLICKR_ITEM (object);
-  PhotosFlickrItemPrivate *priv = self->priv;
   GAppInfo *default_app = NULL;
   const gchar *default_app_name;
   const gchar *mime_type;
diff --git a/src/photos-load-more-button.c b/src/photos-load-more-button.c
index 16e3ebb..f432996 100644
--- a/src/photos-load-more-button.c
+++ b/src/photos-load-more-button.c
@@ -135,7 +135,7 @@ photos_load_more_button_dispose (GObject *object)
   PhotosLoadMoreButton *self = PHOTOS_LOAD_MORE_BUTTON (object);
   PhotosLoadMoreButtonPrivate *priv = self->priv;
 
-  g_clear_object (&self->priv->offset_cntrlr);
+  g_clear_object (&priv->offset_cntrlr);
 
   G_OBJECT_CLASS (photos_load_more_button_parent_class)->dispose (object);
 }
diff --git a/src/photos-local-item.c b/src/photos-local-item.c
index 79e6143..035313f 100644
--- a/src/photos-local-item.c
+++ b/src/photos-local-item.c
@@ -71,7 +71,6 @@ static void
 photos_local_item_constructed (GObject *object)
 {
   PhotosLocalItem *self = PHOTOS_LOCAL_ITEM (object);
-  PhotosLocalItemPrivate *priv = self->priv;
   GAppInfo *default_app = NULL;
   const gchar *default_app_name;
   const gchar *mime_type;
diff --git a/src/photos-main-window.c b/src/photos-main-window.c
index 881c3de..aecda02 100644
--- a/src/photos-main-window.c
+++ b/src/photos-main-window.c
@@ -134,7 +134,6 @@ static void
 photos_main_window_fullscreen_changed (PhotosModeController *controller, gboolean fullscreen, gpointer 
user_data)
 {
   PhotosMainWindow *self = PHOTOS_MAIN_WINDOW (user_data);
-  PhotosMainWindowPrivate *priv = self->priv;
 
   if (fullscreen)
     gtk_window_fullscreen (GTK_WINDOW (self));
diff --git a/src/photos-organize-collection-view.c b/src/photos-organize-collection-view.c
index b570e11..221ffa8 100644
--- a/src/photos-organize-collection-view.c
+++ b/src/photos-organize-collection-view.c
@@ -341,7 +341,6 @@ static void
 photos_organize_collection_view_class_init (PhotosOrganizeCollectionViewClass *class)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
 
   object_class->dispose = photos_organize_collection_view_dispose;
 
diff --git a/src/photos-preview-view.c b/src/photos-preview-view.c
index 1b1183a..5cbfb90 100644
--- a/src/photos-preview-view.c
+++ b/src/photos-preview-view.c
@@ -191,11 +191,6 @@ void
 photos_preview_view_set_node (PhotosPreviewView *self, GeglNode *node)
 {
   PhotosPreviewViewPrivate *priv = self->priv;
-  GeglRectangle bbox;
-  GtkAllocation alloc;
-  float delta_x;
-  float delta_y;
-  float scale = 1.0;
 
   if (priv->node == node)
     return;
diff --git a/src/photos-print-operation.c b/src/photos-print-operation.c
index 429232f..ada251c 100644
--- a/src/photos-print-operation.c
+++ b/src/photos-print-operation.c
@@ -222,9 +222,6 @@ photos_print_operation_dispose (GObject *object)
 static void
 photos_print_operation_finalize (GObject *object)
 {
-  PhotosPrintOperation *self = PHOTOS_PRINT_OPERATION (object);
-  PhotosPrintOperationPrivate *priv = self->priv;
-
   G_OBJECT_CLASS (photos_print_operation_parent_class)->finalize (object);
 }
 
diff --git a/src/photos-print-setup.c b/src/photos-print-setup.c
index 239285c..627cc3b 100644
--- a/src/photos-print-setup.c
+++ b/src/photos-print-setup.c
@@ -93,7 +93,6 @@ enum
 #define FACTOR_MM_TO_PIXEL 2.834645669
 
 static void photos_print_setup_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec 
*pspec);
-static void photos_print_setup_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec 
*pspec);
 
 static void on_left_value_changed   (GtkSpinButton *spinbutton, gpointer user_data);
 static void on_right_value_changed  (GtkSpinButton *spinbutton, gpointer user_data);
diff --git a/src/photos-query-builder.c b/src/photos-query-builder.c
index 44f9cfe..62db4ff 100644
--- a/src/photos-query-builder.c
+++ b/src/photos-query-builder.c
@@ -160,11 +160,8 @@ photos_query_builder_where (gboolean global, gint flags)
 static gchar *
 photos_query_builder_query (gboolean global, gint flags)
 {
-  gchar *filter;
-  gchar *optional;
   gchar *sparql;
   gchar *tail_sparql = NULL;
-  gchar *tmp;
   gchar *where_sparql;
 
   where_sparql = photos_query_builder_where (global, flags);
@@ -256,7 +253,6 @@ photos_query_builder_collection_icon_query (const gchar *resource)
 PhotosQuery *
 photos_query_builder_count_query (gint flags)
 {
-  PhotosBaseManager *srch_typ_mngr;
   gchar *sparql;
   gchar *where_sparql;
 
@@ -355,7 +351,6 @@ photos_query_builder_update_mtime_query (const gchar *resource)
 gchar *
 photos_query_builder_filter_local (void)
 {
-  GFile *file;
   gchar *desktop_uri;
   gchar *download_uri;
   gchar *filter;
diff --git a/src/photos-remote-display-manager.c b/src/photos-remote-display-manager.c
index 36b10d1..69d013d 100644
--- a/src/photos-remote-display-manager.c
+++ b/src/photos-remote-display-manager.c
@@ -171,13 +171,11 @@ photos_remote_display_manager_share_cb (GObject      *source_object,
                                         gpointer      user_data)
 {
   Share *share = user_data;
-  PhotosRemoteDisplayManager *self = share->manager;
-  PhotosRemoteDisplayManagerPrivate *priv = self->priv;
   PhotosDlnaRenderer *renderer = PHOTOS_DLNA_RENDERER (source_object);
   PhotosBaseItem *item;
   GError *error = NULL;
 
-  item = photos_dlna_renderer_share_finish (priv->renderer, res, &error);
+  item = photos_dlna_renderer_share_finish (renderer, res, &error);
   g_object_unref (item); /* We already hold a ref to the item to be shared */
 
   if (error != NULL)
diff --git a/src/photos-selection-toolbar.c b/src/photos-selection-toolbar.c
index 778d708..2158fdb 100644
--- a/src/photos-selection-toolbar.c
+++ b/src/photos-selection-toolbar.c
@@ -105,7 +105,6 @@ static void
 photos_selection_toolbar_collection_clicked (GtkButton *button, gpointer user_data)
 {
   PhotosSelectionToolbar *self = PHOTOS_SELECTION_TOOLBAR (user_data);
-  PhotosSelectionToolbarPrivate *priv = self->priv;
   GtkWidget *dialog;
   GtkWidget *toplevel;
 
@@ -217,7 +216,6 @@ photos_selection_toolbar_properties_clicked (GtkButton *button, gpointer user_da
   GList *windows;
   GtkApplication *app;
   GtkWidget *dialog;
-  GtkWidget *toplevel;
   const gchar *urn;
 
   app = photos_application_new ();
diff --git a/src/photos-source-manager.c b/src/photos-source-manager.c
index 72e53e0..c74925e 100644
--- a/src/photos-source-manager.c
+++ b/src/photos-source-manager.c
@@ -73,8 +73,6 @@ photos_source_manager_client_account_removed (GoaClient *client, GoaObject *obje
 static void
 photos_source_manager_client_account_changed (GoaClient *client, GoaObject *object, gpointer user_data)
 {
-  PhotosSourceManager *self = PHOTOS_SOURCE_MANAGER (user_data);
-
   if (goa_object_peek_photos (object) == NULL)
     photos_source_manager_client_account_removed (client, object, user_data);
   else
diff --git a/src/photos-source.c b/src/photos-source.c
index a3684d2..4380c1a 100644
--- a/src/photos-source.c
+++ b/src/photos-source.c
@@ -192,10 +192,7 @@ photos_source_set_property (GObject *object, guint prop_id, const GValue *value,
 static void
 photos_source_init (PhotosSource *self)
 {
-  PhotosSourcePrivate *priv;
-
   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_SOURCE, PhotosSourcePrivate);
-  priv = self->priv;
 }
 
 
diff --git a/src/photos-view-container.c b/src/photos-view-container.c
index 47baadd..64f9635 100644
--- a/src/photos-view-container.c
+++ b/src/photos-view-container.c
@@ -373,8 +373,6 @@ photos_view_container_set_property (GObject *object, guint prop_id, const GValue
 static void
 photos_view_container_init (PhotosViewContainer *self)
 {
-  PhotosViewContainerPrivate *priv;
-
   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
                                             PHOTOS_TYPE_VIEW_CONTAINER,
                                             PhotosViewContainerPrivate);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]