nautilus r14824 - in trunk: . src

[hadess svn gnome org]

Author: hadess
Date: Tue Dec 16 15:52:40 2008
New Revision: 14824
URL: http://svn.gnome.org/viewvc/nautilus?rev=14824&view=rev

Log:
2008-12-16  Bastien Nocera  <hadess hadess net>

	* src/nautilus-window-menus.c:
	* src/nautilus-window-private.h:
	* src/nautilus-window.c (nautilus_window_constructor):
	Remove the CD/DVD creator from the places menu, and the
	places sidebar (Closes: #508384)



Modified:
   trunk/ChangeLog
   trunk/src/nautilus-window-menus.c
   trunk/src/nautilus-window-private.h
   trunk/src/nautilus-window.c

Modified: trunk/src/nautilus-window-menus.c
==============================================================================
--- trunk/src/nautilus-window-menus.c	(original)
+++ trunk/src/nautilus-window-menus.c	Tue Dec 16 15:52:40 2008
@@ -237,31 +237,6 @@
 	gtk_widget_show (dialog);
 }
 
-static gboolean
-have_burn_uri (void)
-{
-	static gboolean initialized = FALSE;
-	static gboolean res;
-	GVfs *vfs;
-	int i;
-	const gchar * const * supported_uri_schemes;
-
-	if (!initialized) {
-		vfs = g_vfs_get_default ();
-		supported_uri_schemes = g_vfs_get_supported_uri_schemes (vfs);
-
-		res = FALSE;
-		for (i = 0; supported_uri_schemes != NULL && supported_uri_schemes[i] != NULL; i++) {
-			if (strcmp ("burn", supported_uri_schemes[i]) == 0) {
-				res = TRUE;
-				break;
-			}
-		}
-		initialized = TRUE;
-	}
-	return res;
-}
-
 static void
 action_stop_callback (GtkAction *action, 
 		      gpointer user_data)
@@ -373,25 +348,6 @@
 }
 
 static void
-action_go_to_burn_cd_callback (GtkAction *action,
-			       gpointer user_data) 
-{
-	NautilusWindow *window;
-	NautilusWindowSlot *slot;
-	GFile *burn;
-
-	window = NAUTILUS_WINDOW (user_data);
-	slot = nautilus_window_get_active_slot (window);
-
-	burn = g_file_new_for_uri (BURN_CD_URI);
-	nautilus_window_slot_go_to (slot,
-				    burn,
-				    should_open_in_new_tab ());
-	g_object_unref (burn);
-	
-}
-
-static void
 action_reload_callback (GtkAction *action, 
 			gpointer user_data) 
 {
@@ -871,10 +827,6 @@
   /* label, accelerator */       N_("_Trash"), NULL,
   /* tooltip */                  N_("Open your personal trash folder"),
                                  G_CALLBACK (action_go_to_trash_callback) },
-  /* name, stock id */         { "Go to Burn CD", NAUTILUS_ICON_BURN,
-  /* label, accelerator */       N_("CD/_DVD Creator"), NULL,
-  /* tooltip */                  N_("Open a folder into which you can drag files to burn to a CD or DVD"),
-                                 G_CALLBACK (action_go_to_burn_cd_callback) },
 };
 
 static const GtkToggleActionEntry main_toggle_entries[] = {
@@ -945,22 +897,6 @@
 	nautilus_window_initialize_bookmarks_menu (window);
 }
 
-void
-nautilus_window_initialize_menus_constructed (NautilusWindow *window)
-{
-	GtkAction *action;
-
-	/* Don't call have_burn_uri() for the desktop window, as this is a very
-	 * expensive operation during login (around 1 second) ---
-	 * have_burn_uri() has to create a "burn:///" URI, which causes
-	 * gnome-vfs to link in libmapping.so from nautilus-cd-burner.
-	 */
-	if (nautilus_window_has_menubar_and_statusbar (window) && !have_burn_uri ()) {
-		action = gtk_action_group_get_action (window->details->main_action_group, NAUTILUS_ACTION_GO_TO_BURN_CD);
- 		gtk_action_set_visible (action, FALSE);
- 	}
-}
-
 static GList *
 get_extension_menus (NautilusWindow *window)
 {

Modified: trunk/src/nautilus-window-private.h
==============================================================================
--- trunk/src/nautilus-window-private.h	(original)
+++ trunk/src/nautilus-window-private.h	Tue Dec 16 15:52:40 2008
@@ -165,7 +165,6 @@
 void               nautilus_window_load_view_as_menus                    (NautilusWindow    *window);
 void               nautilus_window_load_extension_menus                  (NautilusWindow    *window);
 void               nautilus_window_initialize_menus                      (NautilusWindow    *window);
-void               nautilus_window_initialize_menus_constructed          (NautilusWindow    *window);
 void               nautilus_menus_append_bookmark_to_menu                (NautilusWindow    *window, 
                                                                           NautilusBookmark  *bookmark, 
                                                                           const char        *parent_path,

Modified: trunk/src/nautilus-window.c
==============================================================================
--- trunk/src/nautilus-window.c	(original)
+++ trunk/src/nautilus-window.c	Tue Dec 16 15:52:40 2008
@@ -649,8 +649,6 @@
 	slot = nautilus_window_open_slot (window, 0);
 	nautilus_window_set_active_slot (window, slot);
 
-	nautilus_window_initialize_menus_constructed (window);
-
 	return object;
 }