[nautilus/gnome-2-32: 124/283] Use single GTK+ header includes.

[Cosimo Cecchi <cosimoc src gnome org>]

commit 0cca6cddba4b815c56e22616f305166d6a8967f2
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Wed Jun 2 14:39:18 2010 +0200

    Use single GTK+ header includes.

 .../nautilus-file-conflict-dialog.c                |    1 -
 .../nautilus-file-conflict-dialog.h                |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/libnautilus-private/nautilus-file-conflict-dialog.c b/libnautilus-private/nautilus-file-conflict-dialog.c
index a2d4a99..ff64933 100644
--- a/libnautilus-private/nautilus-file-conflict-dialog.c
+++ b/libnautilus-private/nautilus-file-conflict-dialog.c
@@ -31,7 +31,6 @@
 #include <gio/gio.h>
 #include <glib/gi18n.h>
 #include <pango/pango.h>
-#include <gtk/gtk.h>
 #include <eel/eel-vfs-extensions.h>
 
 #include "nautilus-file.h"
diff --git a/libnautilus-private/nautilus-file-conflict-dialog.h b/libnautilus-private/nautilus-file-conflict-dialog.h
index a76018d..3bc08ea 100644
--- a/libnautilus-private/nautilus-file-conflict-dialog.h
+++ b/libnautilus-private/nautilus-file-conflict-dialog.h
@@ -28,7 +28,7 @@
 
 #include <glib-object.h>
 #include <gio/gio.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
 
 #define NAUTILUS_TYPE_FILE_CONFLICT_DIALOG \
 	(nautilus_file_conflict_dialog_get_type ())