Remove nautilus-desktop-file-loader.[ch]. Remove. Remove.

	* libnautilus-private/Makefile.am: Remove nautilus-desktop-file-loader.[ch].
	* libnautilus-private/nautilus-desktop-file-loader.c: Remove.
	* libnautilus-private/nautilus-desktop-file-loader.h: Remove.

	* libnautilus-private/nautilus-directory-async.c:
	(link_info_nautilus_link_read_callback): Pass in NULL for the new
	optional URI parameter for parsing existing link files.

	* libnautilus-private/nautilus-link-desktop-file.h:
	* libnautilus-private/nautilus-link-desktop-file.c:
	Change to use GnomeDesktopItem instead of NautilusDesktopFile.

	* libnautilus-private/nautilus-link.h:
	* libnautilus-private/nautilus-link.c:
	(nautilus_link_get_link_uri_given_file_contents),
	(nautilus_link_get_link_name_given_file_contents),
	(nautilus_link_get_link_icon_given_file_contents):
	Add optional URI parameter for parsing existing link files. This
	is passed down to the GnomeDesktopItem level, which can sometimes
	do a better job if it knows the URI.

	* src/file-manager/fm-directory-view.c: (activate_callback):
	Change to use GnomeDesktopItem instead of NautilusDesktopFile. Also,
	simplify error handling.

	* Many files:
	Fix includes to use <> style in headers more consistently, and remove
	unnecessarily includes.

1 files changed, 11 insertions, 11 deletions

diff --git a/libnautilus-private/nautilus-audio-player.c b/libnautilus-private/nautilus-audio-player.c
index 71f924511..b59bcd2f5 100644
--- a/libnautilus-private/nautilus-audio-player.c
+++ b/libnautilus-private/nautilus-audio-player.c
@@ -23,14 +23,15 @@
 */
 
 #include <config.h>
+#include "nautilus-audio-player.h"
+
+#include <esd.h>
+#include <glib/gmem.h>
+#include <glib/gstrfuncs.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
 #include <unistd.h>
 
-#include <esd.h>
-
-#include "nautilus-audio-player.h"
 
 /* BUFFER_FRAMES represents the size of the buffer in frames. */
 #define BUFFER_FRAMES 		4096
@@ -322,27 +323,26 @@ esdout_setup_format (ESDInfo *info, AudioFormat format, gint rate, gint nch)
 	}
 
 #ifdef WORDS_BIGENDIAN
-	if (format == FORMAT_U16_LE || format == FORMAT_S16_LE) {
+	if (format == FORMAT_U16_LE || format == FORMAT_S16_LE)
 #else
-	if (format == FORMAT_U16_BE || format == FORMAT_S16_BE) {
+	if (format == FORMAT_U16_BE || format == FORMAT_S16_BE)
 #endif
 		swap_16 = TRUE;
-	}
 
 	info->esd_translate = (void*(*)())NULL;
 	if (info->esd_format == ESD_BITS8) {
-		if (swap_sign == TRUE) {
+		if (swap_sign) {
 			info->esd_translate = esd_stou8;
 		}
 	} else {
-		if (swap_sign == TRUE) {
-			if (swap_16 == TRUE) {
+		if (swap_sign) {
+			if (swap_16) {
 				info->esd_translate = esd_utos16sw;
 			} else {
 				info->esd_translate = esd_utos16;
 			}
 		} else {
-			if (swap_16 == TRUE) {
+			if (swap_16) {
 				info->esd_translate = esd_16sw;
 			}
 		}