[nautilus] general: Fix some details from the desktop removal
- From: Carlos Soriano <csoriano src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] general: Fix some details from the desktop removal
- Date: Tue, 2 Jan 2018 18:05:56 +0000 (UTC)
commit 31271dc377475c223d38755a027205545bf6af74
Author: Carlos Soriano <csoriano gnome org>
Date: Tue Jan 2 19:04:49 2018 +0100
general: Fix some details from the desktop removal
Basically unused vars, etc.
src/nautilus-canvas-container.c | 4 ----
src/nautilus-canvas-dnd.c | 4 +---
src/nautilus-canvas-view.c | 2 --
src/nautilus-file-operations.c | 4 ++--
4 files changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/src/nautilus-canvas-container.c b/src/nautilus-canvas-container.c
index 7a375cea2..0f69bdf68 100644
--- a/src/nautilus-canvas-container.c
+++ b/src/nautilus-canvas-container.c
@@ -250,15 +250,11 @@ icon_set_position (NautilusCanvasIcon *icon,
double x,
double y)
{
- NautilusCanvasContainer *container;
-
if (icon->x == x && icon->y == y)
{
return;
}
- container = NAUTILUS_CANVAS_CONTAINER (EEL_CANVAS_ITEM (icon->item)->canvas);
-
if (icon->x == ICON_UNPOSITIONED_VALUE)
{
icon->x = 0;
diff --git a/src/nautilus-canvas-dnd.c b/src/nautilus-canvas-dnd.c
index 5fb97c34b..feab5d090 100644
--- a/src/nautilus-canvas-dnd.c
+++ b/src/nautilus-canvas-dnd.c
@@ -897,7 +897,7 @@ handle_nonlocal_move (NautilusCanvasContainer *container,
gboolean icon_hit)
{
GList *source_uris, *p;
- gboolean free_target_uri, is_rtl;
+ gboolean free_target_uri;
if (container->details->dnd_info->drag_info.selection_list == NULL)
{
@@ -912,8 +912,6 @@ handle_nonlocal_move (NautilusCanvasContainer *container,
}
source_uris = g_list_reverse (source_uris);
- is_rtl = nautilus_canvas_container_is_layout_rtl (container);
-
free_target_uri = FALSE;
/* start the copy */
diff --git a/src/nautilus-canvas-view.c b/src/nautilus-canvas-view.c
index 71187cfc3..f00fa5064 100644
--- a/src/nautilus-canvas-view.c
+++ b/src/nautilus-canvas-view.c
@@ -523,7 +523,6 @@ static void
nautilus_canvas_view_begin_loading (NautilusFilesView *view)
{
NautilusCanvasView *canvas_view;
- GtkWidget *canvas_container;
NautilusFile *file;
char *uri;
const SortCriterion *sort;
@@ -533,7 +532,6 @@ nautilus_canvas_view_begin_loading (NautilusFilesView *view)
canvas_view = NAUTILUS_CANVAS_VIEW (view);
file = nautilus_files_view_get_directory_as_file (view);
uri = nautilus_file_get_uri (file);
- canvas_container = GTK_WIDGET (get_canvas_container (canvas_view));
g_free (uri);
diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c
index 9f9623a17..6429bbd33 100644
--- a/src/nautilus-file-operations.c
+++ b/src/nautilus-file-operations.c
@@ -1212,8 +1212,8 @@ do_run_simple_dialog (gpointer _data)
if (data->details_text)
{
- GtkWidget *content_area, *label;
- content_area = gtk_message_dialog_get_message_area (dialog);
+ GtkWidget *content_area, *label;
+ content_area = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (dialog));
label = gtk_label_new (data->details_text);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]