build: Fix some warnings.

Author: mtwebster

libnemo-private/nemo-action.c

@@ -1457,11 +1457,7 @@ get_insertion_string (NemoAction *action,
             break; 
     }
 
-    gchar *ret = str->str;
-
-    g_string_free (str, FALSE);
-
-    return ret;
+    return g_string_free (str, FALSE);
 }
 
 static GString *
@@ -1617,9 +1613,7 @@ get_final_label (NemoAction *action,
 
     DEBUG ("Action Label: %s", str->str);
 
-    gchar *ret = str->str;
-    g_string_free (str, FALSE);
-    return ret;
+    return g_string_free (str, FALSE);
 }
 
 static gchar *
@@ -1642,9 +1636,7 @@ get_final_tt (NemoAction *action,
 
     DEBUG ("Action Tooltip: %s", str->str);
 
-    gchar *ret = str->str;
-    g_string_free (str, FALSE);
-    return ret;
+    return g_string_free (str, FALSE);
 }
 
 static void

libnemo-private/nemo-search-engine-advanced.c

@@ -801,9 +801,7 @@ load_contents (SearchThreadData *data,
             break;
         }
 
-        if (chunk != NULL) {
-            g_string_append_len (str, chunk, len);
-        }
+        g_string_append_len (str, chunk, len);
     } while (!g_cancellable_is_cancelled (data->cancellable));
 
     g_input_stream_close (stream,

search-helpers/nemo-mso-to-txt.c

@@ -61,11 +61,8 @@ process_file (GString   *collective,
 
         gsf_input_read (GSF_INPUT (file), size, chunk);
 
-        if (chunk != NULL)
-        {
-            remaining -= size;
-            contents = g_string_append_len (contents, (const gchar *) chunk, size);
-        }
+        remaining -= size;
+        contents = g_string_append_len (contents, (const gchar *) chunk, size);
     } while (remaining > 0);
 
     g_string_append (contents, " ");

src/nemo-properties-window.c

@@ -4719,7 +4719,6 @@ get_pending_key (GList *file_list)
 	GList *l;
 	GList *uris;
 	GString *key;
-	char *ret;
 
 	uris = NULL;
 	for (l = file_list; l != NULL; l = l->next) {
@@ -4735,10 +4734,7 @@ get_pending_key (GList *file_list)
 
 	g_list_free_full (uris, g_free);
 
-	ret = key->str;
-	g_string_free (key, FALSE);
-
-	return ret;
+	return g_string_free (key, FALSE);
 }
 
 static StartupData *