nautilus r14859 - in trunk: . src/file-manager

[awalton svn gnome org]

Author: awalton
Date: Tue Jan 13 18:21:57 2009
New Revision: 14859
URL: http://svn.gnome.org/viewvc/nautilus?rev=14859&view=rev

Log:
2009-01-13  A. Walton  <awalton gnome org>

	* src/file-manager/fm-empty-view.c (fm_empty_view_end_loading),
	(fm_empty_view_create), (fm_empty_view_register):
	Unbreak build when building with --enable-empty-view.
	Closes bug #558537. Patch by Emmanuel Fleury.



Modified:
   trunk/ChangeLog
   trunk/src/file-manager/fm-empty-view.c

Modified: trunk/src/file-manager/fm-empty-view.c
==============================================================================
--- trunk/src/file-manager/fm-empty-view.c	(original)
+++ trunk/src/file-manager/fm-empty-view.c	Tue Jan 13 18:21:57 2009
@@ -234,7 +234,8 @@
 }
 
 static void
-fm_empty_view_end_loading (FMDirectoryView *view)
+fm_empty_view_end_loading (FMDirectoryView *view,
+			   gboolean all_files_seen)
 {
 }
 
@@ -347,7 +348,6 @@
 static NautilusView *
 fm_empty_view_create (NautilusWindowSlotInfo *slot)
 {
-	NautilusWindowSlotInfo *slot;
 	FMEmptyView *view;
 
 	g_assert (NAUTILUS_IS_WINDOW_SLOT_INFO (slot));
@@ -387,7 +387,6 @@
 	"Empty View",
 	"_Empty View",
 	"The empty view encountered an error.",
-	"The empty view encountered an error while starting up.",
 	"Display this location with the empty view.",
 	fm_empty_view_create,
 	fm_empty_view_supports_uri
@@ -396,11 +395,10 @@
 void
 fm_empty_view_register (void)
 {
-	fm_empty_view.label = fm_empty_view.label;
-	fm_empty_view.view_as_label = fm_empty_view.view_as_label;
-	fm_empty_view.view_as_label_with_mnemonic = fm_empty_view.view_as_label_with_mnemonic;
+	fm_empty_view.id = fm_empty_view.id;
+	fm_empty_view.view_combo_label = fm_empty_view.view_combo_label;
+	fm_empty_view.view_menu_label_with_mnemonic = fm_empty_view.view_menu_label_with_mnemonic;
 	fm_empty_view.error_label = fm_empty_view.error_label;
-	fm_empty_view.startup_error_label = fm_empty_view.startup_error_label;
 	fm_empty_view.display_location_label = fm_empty_view.display_location_label;
 
 	nautilus_view_factory_register (&fm_empty_view);