summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2015-01-20 11:09:44 -0800
committerCarlos Soriano <csoriano@gnome.org>2015-01-24 02:06:03 +0100
commit354d4acb9fb338eb6eae6121261631cd8ac70626 (patch)
tree385ed3c6fb435871c34b88702e7702bea1eae32c
parentdfb27bf84c1a5ff921388d787f081637e17e7668 (diff)
downloadnautilus-354d4acb9fb338eb6eae6121261631cd8ac70626.tar.gz
view: fix some warnings
-rw-r--r--src/nautilus-view.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/nautilus-view.c b/src/nautilus-view.c
index 1b3912452..7cdf598cc 100644
--- a/src/nautilus-view.c
+++ b/src/nautilus-view.c
@@ -3929,7 +3929,6 @@ add_extension_menu_items (NautilusView *view,
GMenu *gmenu, *children_menu;
char *name, *parsed_name, *label, *detailed_action_name;
gboolean sensitive;
- GdkPixbuf *pixbuf;
gmenu = g_menu_new ();
@@ -4333,8 +4332,8 @@ update_directory_in_scripts_menu (NautilusView *view,
char *uri;
int num;
- g_return_if_fail (NAUTILUS_IS_VIEW (view));
- g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
+ g_return_val_if_fail (NAUTILUS_IS_VIEW (view), NULL);
+ g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), NULL);
file_list = nautilus_directory_get_file_list (directory);
filtered = nautilus_file_list_filter_hidden (file_list, FALSE);
@@ -4549,8 +4548,8 @@ update_directory_in_templates_menu (NautilusView *view,
char *templates_directory_uri;
int num;
- g_return_if_fail (NAUTILUS_IS_VIEW (view));
- g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
+ g_return_val_if_fail (NAUTILUS_IS_VIEW (view), NULL);
+ g_return_val_if_fail (NAUTILUS_IS_DIRECTORY (directory), NULL);
file_list = nautilus_directory_get_file_list (directory);
filtered = nautilus_file_list_filter_hidden (file_list, FALSE);