From 305141d5b465a3dc5ec4d4768fbca800ea4ec5ff Mon Sep 17 00:00:00 2001
From: Nick Schermer <nick@xfce.org>
Date: Wed, 20 Jan 2010 10:58:33 +0100
Subject: [PATCH] Fix some compiler warnings.
---
plugins/thunar-wallpaper/twp-provider.c | 2 +-
tdb/tdbtool.c | 4 ++--
thunar/thunar-io-scan-directory.c | 2 +-
thunar/thunar-list-model.c | 8 ++++----
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/plugins/thunar-wallpaper/twp-provider.c b/plugins/thunar-wallpaper/twp-provider.c
index f8c8e8c8e..b68b91680 100644
--- a/plugins/thunar-wallpaper/twp-provider.c
+++ b/plugins/thunar-wallpaper/twp-provider.c
@@ -201,7 +201,7 @@ twp_provider_get_file_actions (ThunarxMenuProvider *menu_provider,
if ((desktop_type == DESKTOP_TYPE_NONE) && (action != NULL))
{
- //gtk_widget_set_sensitive (action, FALSE);
+ /* gtk_widget_set_sensitive (action, FALSE); */
}
return actions;
diff --git a/tdb/tdbtool.c b/tdb/tdbtool.c
index 857a14085..ab5947490 100644
--- a/tdb/tdbtool.c
+++ b/tdb/tdbtool.c
@@ -482,9 +482,9 @@ int main(int argc, char *argv[])
delete_tdb();
} else if (strcmp(tok,"dump") == 0) {
bIterate = 0;
- if(open_dump_file() == 0) { //open file
+ if(open_dump_file() == 0) { /* open file */
tdb_traverse(tdb, print_rec, NULL);
- close_dump_file(); //close file
+ close_dump_file(); /* close file */
}
pDumpFile = stdout;
} else if (strcmp(tok,"list") == 0) {
diff --git a/thunar/thunar-io-scan-directory.c b/thunar/thunar-io-scan-directory.c
index 3cb0bee88..7d0432ff7 100644
--- a/thunar/thunar-io-scan-directory.c
+++ b/thunar/thunar-io-scan-directory.c
@@ -1,4 +1,4 @@
-//* vi:set et ai sw=2 sts=2 ts=2: */
+/* vi:set et ai sw=2 sts=2 ts=2: */
/*-
* Copyright (c) 2009 Jannis Pohlmann <jannis@xfce.org>
*
diff --git a/thunar/thunar-list-model.c b/thunar/thunar-list-model.c
index adea6526e..dacb4ad39 100644
--- a/thunar/thunar-list-model.c
+++ b/thunar/thunar-list-model.c
@@ -1212,7 +1212,7 @@ thunar_list_model_folder_destroy (ThunarFolder *folder,
thunar_list_model_set_folder (store, NULL);
- // TODO: What to do when the folder is deleted?
+ /* TODO: What to do when the folder is deleted? */
}
@@ -1455,7 +1455,7 @@ sort_by_group (const ThunarFile *a,
gid_b = g_file_info_get_attribute_uint32 (thunar_file_get_info (b),
G_FILE_ATTRIBUTE_UNIX_GID);
- result = CLAMP (gid_a - gid_b, -1, 1);
+ result = CLAMP ((gint) gid_a - (gint) gid_b, -1, 1);
}
if (group_a != NULL)
@@ -1554,7 +1554,7 @@ sort_by_owner (const ThunarFile *a,
uid_b = g_file_info_get_attribute_uint32 (thunar_file_get_info (b),
G_FILE_ATTRIBUTE_UNIX_UID);
- result = CLAMP (uid_a - uid_b, -1, 1);
+ result = CLAMP ((gint) uid_a - (gint) uid_b, -1, 1);
}
if (result == 0)
@@ -1652,7 +1652,7 @@ sort_by_type (const ThunarFile *a,
g_free (description_b);
if (result == 0)
- result = sort_by_name (a, b, case_sensitive);
+ return sort_by_name (a, b, case_sensitive);
else
return result;
}
--
GitLab