libnautilus-extension: remove the ability to add toolbar items

We want to fully control our toolbar now.

3 files changed, 1 insertions, 23 deletions

diff --git a/configure.in b/configure.in
index 16fa9202d..7724ec222 100644
--- a/configure.in
+++ b/configure.in
@@ -14,7 +14,7 @@ m4_define(exempi_minver,               1.99.5)
 dnl 1. If the library code has changed at all since last release, then increment revision.
 dnl 2. If any interfaces have been added, then increment current and set revision to 0.
 dnl Interface break is not allowed.
-m4_define(nautilus_extension_current,  4)
+m4_define(nautilus_extension_current,  5)
 m4_define(nautilus_extension_revision, 0)
 
 AC_INIT(nautilus, 2.91.9, http://bugzilla.gnome.org/enter_bug.cgi?product=nautilus)
diff --git a/libnautilus-extension/nautilus-menu-provider.c b/libnautilus-extension/nautilus-menu-provider.c
index 09e14d7b4..83bca1589 100644
--- a/libnautilus-extension/nautilus-menu-provider.c
+++ b/libnautilus-extension/nautilus-menu-provider.c
@@ -105,22 +105,6 @@ nautilus_menu_provider_get_background_items (NautilusMenuProvider *provider,
 	}
 }
 
-GList *
-nautilus_menu_provider_get_toolbar_items (NautilusMenuProvider *provider,
-					  GtkWidget *window,
-					  NautilusFileInfo *current_folder)
-{
-	g_return_val_if_fail (NAUTILUS_IS_MENU_PROVIDER (provider), NULL);
-	g_return_val_if_fail (NAUTILUS_IS_FILE_INFO (current_folder), NULL);
-
-	if (NAUTILUS_MENU_PROVIDER_GET_IFACE (provider)->get_toolbar_items) {
-		return NAUTILUS_MENU_PROVIDER_GET_IFACE (provider)->get_toolbar_items 
-			(provider, window, current_folder);
-	} else {
-		return NULL;
-	}
-}
-
 /* This function emit a signal to inform nautilus that its item list has changed */
 void
 nautilus_menu_provider_emit_items_updated_signal (NautilusMenuProvider* provider)
diff --git a/libnautilus-extension/nautilus-menu-provider.h b/libnautilus-extension/nautilus-menu-provider.h
index a4dec122b..fc9686f49 100644
--- a/libnautilus-extension/nautilus-menu-provider.h
+++ b/libnautilus-extension/nautilus-menu-provider.h
@@ -55,9 +55,6 @@ struct _NautilusMenuProviderIface {
 	GList *(*get_background_items) (NautilusMenuProvider *provider,
 					GtkWidget            *window,
 					NautilusFileInfo     *current_folder);
-	GList *(*get_toolbar_items)    (NautilusMenuProvider *provider,
-					GtkWidget            *window,
-				        NautilusFileInfo     *current_folder);
 };
 
 /* Interface Functions */
@@ -68,9 +65,6 @@ GList                  *nautilus_menu_provider_get_file_items       (NautilusMen
 GList                  *nautilus_menu_provider_get_background_items (NautilusMenuProvider *provider,
 								     GtkWidget            *window,
 								     NautilusFileInfo     *current_folder);
-GList                  *nautilus_menu_provider_get_toolbar_items    (NautilusMenuProvider *provider,
-								     GtkWidget            *window,
-								     NautilusFileInfo     *current_folder);
 
 /* This function emit a signal to inform nautilus that its item list has changed. */
 void                    nautilus_menu_provider_emit_items_updated_signal (NautilusMenuProvider *provider);