[nautilus] all: trivial cleanups

[Cosimo Cecchi <cosimoc src gnome org>]

commit 2cf25e2a64a88b09e3d1cd5d205a9c401da42f0e
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Apr 23 18:29:32 2012 -0400

    all: trivial cleanups

 eel/eel-gtk-extensions.c      |    2 +-
 eel/eel-gtk-extensions.h      |    8 --------
 src/nautilus-desktop-window.c |   30 +++++++++++++++---------------
 src/nautilus-desktop-window.h |    2 --
 src/nautilus-window-menus.c   |    1 -
 5 files changed, 16 insertions(+), 27 deletions(-)
---
diff --git a/eel/eel-gtk-extensions.c b/eel/eel-gtk-extensions.c
index 01c5943..68e6577 100644
--- a/eel/eel-gtk-extensions.c
+++ b/eel/eel-gtk-extensions.c
@@ -140,7 +140,7 @@ sanity_check_window_dimensions (guint *width, guint *height)
  * @width: width of window in pixels
  * @height: height of window in pixels
  */
-void
+static void
 eel_gtk_window_set_initial_geometry (GtkWindow *window, 
 					  EelGdkGeometryFlags geometry_flags,
 					  int left,
diff --git a/eel/eel-gtk-extensions.h b/eel/eel-gtk-extensions.h
index dd9b332..bde1360 100644
--- a/eel/eel-gtk-extensions.h
+++ b/eel/eel-gtk-extensions.h
@@ -32,15 +32,7 @@
 #include <gtk/gtk.h>
 #include <eel/eel-gdk-extensions.h>
 
-#define EEL_STANDARD_CLOSE_WINDOW_CONTROL_KEY 	'w'
-
 /* GtkWindow */
-void                  eel_gtk_window_set_initial_geometry             (GtkWindow            *window,
-								       EelGdkGeometryFlags   geometry_flags,
-								       int                   left,
-								       int                   top,
-								       guint                 width,
-								       guint                 height);
 void                  eel_gtk_window_set_initial_geometry_from_string (GtkWindow            *window,
 								       const char           *geometry_string,
 								       guint                 minimum_width,
diff --git a/src/nautilus-desktop-window.c b/src/nautilus-desktop-window.c
index b9b42f0..55ee447 100644
--- a/src/nautilus-desktop-window.c
+++ b/src/nautilus-desktop-window.c
@@ -48,6 +48,21 @@ G_DEFINE_TYPE (NautilusDesktopWindow, nautilus_desktop_window,
 	       NAUTILUS_TYPE_WINDOW);
 
 static void
+nautilus_desktop_window_update_directory (NautilusDesktopWindow *window)
+{
+	GFile *location;
+
+	g_assert (NAUTILUS_IS_DESKTOP_WINDOW (window));
+
+	window->details->loaded = FALSE;
+	location = g_file_new_for_uri (EEL_DESKTOP_URI);
+	nautilus_window_go_to (NAUTILUS_WINDOW (window), location);
+	window->details->loaded = TRUE;
+
+	g_object_unref (location);
+}
+
+static void
 nautilus_desktop_window_dispose (GObject *obj)
 {
 	NautilusDesktopWindow *window = NAUTILUS_DESKTOP_WINDOW (obj);
@@ -124,21 +139,6 @@ nautilus_desktop_window_delete_event (NautilusDesktopWindow *window)
 	return TRUE;
 }
 
-void
-nautilus_desktop_window_update_directory (NautilusDesktopWindow *window)
-{
-	GFile *location;
-
-	g_assert (NAUTILUS_IS_DESKTOP_WINDOW (window));
-
-	window->details->loaded = FALSE;
-	location = g_file_new_for_uri (EEL_DESKTOP_URI);
-	nautilus_window_go_to (NAUTILUS_WINDOW (window), location);
-	window->details->loaded = TRUE;
-
-	g_object_unref (location);
-}
-
 static void
 nautilus_desktop_window_screen_size_changed (GdkScreen             *screen,
 					     NautilusDesktopWindow *window)
diff --git a/src/nautilus-desktop-window.h b/src/nautilus-desktop-window.h
index e2ed780..a5ce391 100644
--- a/src/nautilus-desktop-window.h
+++ b/src/nautilus-desktop-window.h
@@ -47,7 +47,6 @@ typedef struct NautilusDesktopWindowDetails NautilusDesktopWindowDetails;
 typedef struct {
 	NautilusWindow parent_spot;
 	NautilusDesktopWindowDetails *details;
-        gboolean affect_desktop_on_next_location_change;
 } NautilusDesktopWindow;
 
 typedef struct {
@@ -56,7 +55,6 @@ typedef struct {
 
 GType                  nautilus_desktop_window_get_type            (void);
 NautilusDesktopWindow *nautilus_desktop_window_new                 (GdkScreen *screen);
-void                   nautilus_desktop_window_update_directory    (NautilusDesktopWindow *window);
 gboolean               nautilus_desktop_window_loaded              (NautilusDesktopWindow *window);
 
 #endif /* NAUTILUS_DESKTOP_WINDOW_H */
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index b5a5975..265bfbd 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -66,7 +66,6 @@
 
 #define NETWORK_URI          "network:"
 #define COMPUTER_URI         "computer:"
-#define BURN_CD_URI          "burn:"
 
 static void
 action_close_window_slot_callback (GtkAction *action,