[nautilus] general: quash some warnings
- From: Ernestas Kulik <ernestask src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] general: quash some warnings
- Date: Fri, 7 Oct 2016 18:04:07 +0000 (UTC)
commit 8c47f50ff2c9a03da5cf65ba4c305361fc28558a
Author: Ernestas Kulik <ernestask src gnome org>
Date: Fri Oct 7 20:53:13 2016 +0300
general: quash some warnings
lineup-parameters: remove unused variable (fixed upstream)
bookmark: cast away const modifier in nautilus_bookmark_compare_with()
when using GLib macros
file-operations: used correct enum in a function call
https://bugzilla.gnome.org/show_bug.cgi?id=772586
data/lineup-parameters.c | 1 -
src/nautilus-bookmark.c | 8 ++++----
src/nautilus-file-operations.c | 2 +-
3 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/data/lineup-parameters.c b/data/lineup-parameters.c
index 610cafe..51a01e1 100644
--- a/data/lineup-parameters.c
+++ b/data/lineup-parameters.c
@@ -146,7 +146,6 @@ match_parameter (gchar *line,
{
static GRegex *regex = NULL;
GMatchInfo *match_info;
- gboolean first_param;
gint start_pos = 0;
if (G_UNLIKELY (regex == NULL))
diff --git a/src/nautilus-bookmark.c b/src/nautilus-bookmark.c
index 8d00466..1f915ed 100644
--- a/src/nautilus-bookmark.c
+++ b/src/nautilus-bookmark.c
@@ -736,11 +736,11 @@ nautilus_bookmark_compare_with (gconstpointer a,
NautilusBookmark *bookmark_a;
NautilusBookmark *bookmark_b;
- g_return_val_if_fail (NAUTILUS_IS_BOOKMARK (a), 1);
- g_return_val_if_fail (NAUTILUS_IS_BOOKMARK (b), 1);
+ g_return_val_if_fail (NAUTILUS_IS_BOOKMARK ((gpointer) a), 1);
+ g_return_val_if_fail (NAUTILUS_IS_BOOKMARK ((gpointer) b), 1);
- bookmark_a = NAUTILUS_BOOKMARK (a);
- bookmark_b = NAUTILUS_BOOKMARK (b);
+ bookmark_a = NAUTILUS_BOOKMARK ((gpointer) a);
+ bookmark_b = NAUTILUS_BOOKMARK ((gpointer) b);
if (!g_file_equal (bookmark_a->location,
bookmark_b->location))
diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c
index bf9a4de..c491daf 100644
--- a/src/nautilus-file-operations.c
+++ b/src/nautilus-file-operations.c
@@ -8404,7 +8404,7 @@ extract_task_thread_func (GTask *task,
source_file = G_FILE (l->data);
info = g_file_query_info (source_file,
G_FILE_ATTRIBUTE_STANDARD_SIZE,
- G_FILE_COPY_NOFOLLOW_SYMLINKS,
+ G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
extract_job->common.cancellable,
NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]