diff options
32 files changed, 132 insertions, 270 deletions
@@ -1,3 +1,46 @@ +2000-05-24 Darin Adler <darin@eazel.com> + + * libnautilus/Makefile.am: + * libnautilus/libnautilus.h: + * libnautilus/nautilus-meta-view-frame.c: [deleted] + * libnautilus/nautilus-meta-view-frame.h: [deleted] + * libnautilus/nautilus-view-component.idl: + * po/POTFILES.in: + * src/ntl-index-panel.c: (nautilus_index_panel_add_meta_view): + * src/ntl-window.c: (nautilus_window_add_meta_view): + Removed Nautilus::MetaView and all the related classes. + We still have Nautilus::MetaViewFrame (will go soon). + + * components/help/hyperbola-nav-index.c: + (hyperbola_navigation_index_new): + * components/help/hyperbola-nav-search.c: + (hyperbola_navigation_search_new): + * components/help/hyperbola-nav-tree.c: + (hyperbola_navigation_tree_new): + * components/history/ntl-history-view.c: (make_obj): + * components/loser/sidebar/nautilus-sidebar-loser.c: + (nautilus_sidebar_loser_initialize), + (loser_notify_location_change_callback): + * components/loser/sidebar/nautilus-sidebar-loser.h: + * components/notes/ntl-notes.c: (make_notes_view): + * components/websearch/ntl-web-search.c: (make_obj): + Changed to use just plain view insetad of meta_view. + + * libnautilus-extensions/nautilus-global-preferences.h: + * libnautilus-extensions/nautilus-global-preferences.c: + (global_preferences_create_dialog), + (nautilus_global_preferences_get_sidebar_panel_view_identifiers), + (nautilus_global_preferences_get_sidebar_view_iids), + (nautilus_preferences_register_sidebar_view_preferences_for_ui), + (global_preferences_register_for_ui): + Changed naming to call them sidebar views instead of meta views, + and got rid of code that depends on MetaView interface. We now + use the sidebar_panel_name to determine if a view should show + up in the sidebar. + + * src/ntl-view.h: Fixed a comment to reflect the future + instead of the past. + 2000-05-24 John Sullivan <sullivan@eazel.com> * libnautilus-extensions/nautilus-program-chooser.c: @@ -25,8 +25,6 @@ src/ntl-content-view.h -> src/nautilus-content-view-frame.h src/ntl-index-panel.c -> src/nautilus-sidebar.c src/ntl-index-panel.h -> src/nautilus-sidebar.h src/ntl-main.c -> src/nautilus-main.c -src/ntl-meta-view.c -> src/nautilus-meta-view-frame.c -src/ntl-meta-view.h -> src/nautilus-meta-view-frame.h src/ntl-miniicon.c -> libnautilus-extensions/nautilus-mini-icon.c src/ntl-miniicon.h -> libnautilus-extensions/nautilus-mini-icon.h src/ntl-uri-map.c -> src/nautilus-applicable-views.c diff --git a/components/help/hyperbola-nav-index.c b/components/help/hyperbola-nav-index.c index 6b3857dc2..110ea4f36 100644 --- a/components/help/hyperbola-nav-index.c +++ b/components/help/hyperbola-nav-index.c @@ -717,7 +717,7 @@ BonoboObject *hyperbola_navigation_index_new(void) gtk_clist_thaw(GTK_CLIST(hni->clist)); gtk_widget_show_all(vbox); - hni->view_frame = NAUTILUS_VIEW (nautilus_meta_view_new (vbox)); + hni->view_frame = nautilus_view_new (vbox); return BONOBO_OBJECT (hni->view_frame); } diff --git a/components/help/hyperbola-nav-search.c b/components/help/hyperbola-nav-search.c index c1eb3389f..38ace7132 100644 --- a/components/help/hyperbola-nav-search.c +++ b/components/help/hyperbola-nav-search.c @@ -174,7 +174,7 @@ BonoboObject *hyperbola_navigation_search_new(void) gtk_clist_thaw(GTK_CLIST(hns->clist)); gtk_widget_show_all(vbox); - hns->view_frame = NAUTILUS_VIEW (nautilus_meta_view_new (vbox)); + hns->view_frame = nautilus_view_new (vbox); return BONOBO_OBJECT (hns->view_frame); } diff --git a/components/help/hyperbola-nav-tree.c b/components/help/hyperbola-nav-tree.c index e47066abd..9898e2679 100644 --- a/components/help/hyperbola-nav-tree.c +++ b/components/help/hyperbola-nav-tree.c @@ -91,7 +91,7 @@ hyperbola_navigation_tree_new(void) gtk_widget_show(view->ctree); gtk_widget_show(wtmp); - view->view_frame = NAUTILUS_VIEW (nautilus_meta_view_new (wtmp)); + view->view_frame = nautilus_view_new (wtmp); gtk_signal_connect (GTK_OBJECT(view->view_frame), "notify_location_change", hyperbola_navigation_tree_notify_location_change, view); diff --git a/components/history/nautilus-history-view.c b/components/history/nautilus-history-view.c index f77569d61..5d35a4d68 100644 --- a/components/history/nautilus-history-view.c +++ b/components/history/nautilus-history-view.c @@ -236,7 +236,7 @@ make_obj(BonoboGenericFactory *Factory, const char *goad_id, gpointer closure) gtk_widget_show_all(wtmp); /* create object */ - hview->view = NAUTILUS_VIEW (nautilus_meta_view_new (wtmp)); + hview->view = nautilus_view_new (wtmp); gtk_signal_connect (GTK_OBJECT (hview->view), "destroy", do_destroy, hview); object_count++; diff --git a/components/history/ntl-history-view.c b/components/history/ntl-history-view.c index f77569d61..5d35a4d68 100644 --- a/components/history/ntl-history-view.c +++ b/components/history/ntl-history-view.c @@ -236,7 +236,7 @@ make_obj(BonoboGenericFactory *Factory, const char *goad_id, gpointer closure) gtk_widget_show_all(wtmp); /* create object */ - hview->view = NAUTILUS_VIEW (nautilus_meta_view_new (wtmp)); + hview->view = nautilus_view_new (wtmp); gtk_signal_connect (GTK_OBJECT (hview->view), "destroy", do_destroy, hview); object_count++; diff --git a/components/loser/sidebar/nautilus-sidebar-loser.c b/components/loser/sidebar/nautilus-sidebar-loser.c index e908885f0..4b6fc93f4 100644 --- a/components/loser/sidebar/nautilus-sidebar-loser.c +++ b/components/loser/sidebar/nautilus-sidebar-loser.c @@ -42,7 +42,7 @@ /* A NautilusSidebarLoser's private information. */ struct NautilusSidebarLoserDetails { char *uri; - NautilusMetaView *nautilus_view; + NautilusView *nautilus_view; }; static void nautilus_sidebar_loser_initialize_class (NautilusSidebarLoserClass *klass); @@ -51,7 +51,7 @@ static void nautilus_sidebar_loser_destroy (GtkObject NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusSidebarLoser, nautilus_sidebar_loser, GTK_TYPE_LABEL) -static void loser_notify_location_change_callback (NautilusMetaView *nautilus_view, +static void loser_notify_location_change_callback (NautilusView *nautilus_view, Nautilus_NavigationInfo *navinfo, NautilusSidebarLoser *view); static void loser_merge_bonobo_items_callback (BonoboObject *control, @@ -80,7 +80,7 @@ nautilus_sidebar_loser_initialize (NautilusSidebarLoser *view) gtk_label_set_text (GTK_LABEL (view), g_strdup ("(none)")); - view->details->nautilus_view = nautilus_meta_view_new (GTK_WIDGET (view)); + view->details->nautilus_view = nautilus_view_new (GTK_WIDGET (view)); gtk_signal_connect (GTK_OBJECT (view->details->nautilus_view), "notify_location_change", @@ -123,7 +123,7 @@ nautilus_sidebar_loser_destroy (GtkObject *object) * @view: NautilusSidebarLoser to get the nautilus_view from.. * **/ -NautilusMetaView * +NautilusView * nautilus_sidebar_loser_get_nautilus_view (NautilusSidebarLoser *view) { return view->details->nautilus_view; @@ -151,7 +151,7 @@ nautilus_sidebar_loser_load_uri (NautilusSidebarLoser *view, } static void -loser_notify_location_change_callback (NautilusMetaView *nautilus_view, +loser_notify_location_change_callback (NautilusView *nautilus_view, Nautilus_NavigationInfo *navinfo, NautilusSidebarLoser *view) { diff --git a/components/loser/sidebar/nautilus-sidebar-loser.h b/components/loser/sidebar/nautilus-sidebar-loser.h index 98c486939..e8caee1d5 100644 --- a/components/loser/sidebar/nautilus-sidebar-loser.h +++ b/components/loser/sidebar/nautilus-sidebar-loser.h @@ -28,7 +28,7 @@ #ifndef NAUTILUS_SIDEBAR_LOSER_H #define NAUTILUS_SIDEBAR_LOSER_H -#include <libnautilus/nautilus-meta-view-frame.h> +#include <libnautilus/nautilus-view-frame.h> #include <gtk/gtklabel.h> typedef struct NautilusSidebarLoser NautilusSidebarLoser; @@ -52,17 +52,17 @@ struct NautilusSidebarLoserClass { }; /* GtkObject support */ -GtkType nautilus_sidebar_loser_get_type (void); +GtkType nautilus_sidebar_loser_get_type (void); /* Component embedding support */ -NautilusMetaView *nautilus_sidebar_loser_get_nautilus_view (NautilusSidebarLoser *view); +NautilusView *nautilus_sidebar_loser_get_nautilus_view (NautilusSidebarLoser *view); /* URI handling */ -void nautilus_sidebar_loser_load_uri (NautilusSidebarLoser *view, - const char *uri); +void nautilus_sidebar_loser_load_uri (NautilusSidebarLoser *view, + const char *uri); /* Failing on command. */ -void nautilus_sidebar_loser_maybe_fail (const char *location); +void nautilus_sidebar_loser_maybe_fail (const char *location); #endif /* NAUTILUS_SIDEBAR_LOSER_H */ diff --git a/components/notes/nautilus-notes.c b/components/notes/nautilus-notes.c index 9387fd0fb..7c8527f45 100644 --- a/components/notes/nautilus-notes.c +++ b/components/notes/nautilus-notes.c @@ -195,7 +195,7 @@ make_notes_view (BonoboGenericFactory *Factory, const char *goad_id, gpointer cl gtk_widget_show_all (vbox); /* Create CORBA object. */ - notes->view = NAUTILUS_VIEW (nautilus_meta_view_new (vbox)); + notes->view = nautilus_view_new (vbox); gtk_signal_connect (GTK_OBJECT (notes->view), "destroy", do_destroy, notes); notes_object_count++; diff --git a/components/notes/ntl-notes.c b/components/notes/ntl-notes.c index 9387fd0fb..7c8527f45 100644 --- a/components/notes/ntl-notes.c +++ b/components/notes/ntl-notes.c @@ -195,7 +195,7 @@ make_notes_view (BonoboGenericFactory *Factory, const char *goad_id, gpointer cl gtk_widget_show_all (vbox); /* Create CORBA object. */ - notes->view = NAUTILUS_VIEW (nautilus_meta_view_new (vbox)); + notes->view = nautilus_view_new (vbox); gtk_signal_connect (GTK_OBJECT (notes->view), "destroy", do_destroy, notes); notes_object_count++; diff --git a/components/websearch/ntl-web-search.c b/components/websearch/ntl-web-search.c index fd31a7a30..c62e99d79 100644 --- a/components/websearch/ntl-web-search.c +++ b/components/websearch/ntl-web-search.c @@ -214,7 +214,7 @@ make_obj(BonoboGenericFactory *Factory, const char *goad_id, gpointer closure) /* create CORBA object */ - hview->view = NAUTILUS_VIEW (nautilus_meta_view_new (vbox)); + hview->view = nautilus_view_new (vbox); gtk_signal_connect(GTK_OBJECT (hview->view), "destroy", do_destroy, NULL); object_count++; diff --git a/libnautilus-extensions/nautilus-global-preferences.c b/libnautilus-extensions/nautilus-global-preferences.c index e14c0448e..aac507c50 100644 --- a/libnautilus-extensions/nautilus-global-preferences.c +++ b/libnautilus-extensions/nautilus-global-preferences.c @@ -63,7 +63,7 @@ global_preferences_create_dialog (void) NautilusPreferencesBox *preference_box; GtkWidget *user_level_pane; GtkWidget *directory_views_pane; - GtkWidget *meta_view_pane; + GtkWidget *sidebar_view_pane; GtkWidget *appearance_pane; @@ -123,14 +123,14 @@ global_preferences_create_dialog (void) /* * Meta view pane */ - meta_view_pane = nautilus_preferences_box_add_pane (preference_box, + sidebar_view_pane = nautilus_preferences_box_add_pane (preference_box, "Meta Views", "Meta Views Something"); - nautilus_preferences_pane_add_group (NAUTILUS_PREFERENCES_PANE (meta_view_pane), "Meta Views"); + nautilus_preferences_pane_add_group (NAUTILUS_PREFERENCES_PANE (sidebar_view_pane), "Meta Views"); { - char *meta_view_pref; + char *sidebar_view_pref; GList *view_identifiers; GList *p; NautilusViewIdentifier *identifier; @@ -141,17 +141,17 @@ global_preferences_create_dialog (void) for (p = view_identifiers; p != NULL; p = p->next) { identifier = (NautilusViewIdentifier *) (p->data); - meta_view_pref = g_strconcat ("/nautilus/metaviews/", + sidebar_view_pref = g_strconcat ("/nautilus/metaviews/", identifier->iid, NULL); nautilus_preferences_pane_add_item_to_nth_group - (NAUTILUS_PREFERENCES_PANE (meta_view_pane), + (NAUTILUS_PREFERENCES_PANE (sidebar_view_pane), 0, - meta_view_pref, + sidebar_view_pref, NAUTILUS_PREFERENCE_ITEM_BOOLEAN); - g_free (meta_view_pref); + g_free (sidebar_view_pref); } @@ -188,28 +188,27 @@ global_preferences_create_dialog (void) GList * nautilus_global_preferences_get_sidebar_panel_view_identifiers (void) { - OAF_ServerInfoList *oaf_result; - const char *query; CORBA_Environment ev; + const char *query; + OAF_ServerInfoList *oaf_result; int i; + NautilusViewIdentifier *id; GList *view_identifiers; CORBA_exception_init (&ev); - view_identifiers = NULL; + query = "nautilus:sidebar_panel_name.defined() AND repo_ids.has ('IDL:Bonobo/Control:1.0')"; - oaf_result = NULL; - - query = "repo_ids.has_all (['IDL:Nautilus/MetaView:1.0','IDL:Bonobo/Control:1.0'])"; - - oaf_result = oaf_query (query, NULL /* alphabetize by name in the future */, &ev); + oaf_result = oaf_query (query, NULL /* FIXME: alphabetize by name in the future? */, &ev); - if (ev._major == CORBA_NO_EXCEPTION && oaf_result != NULL && oaf_result->_length > 0) { + view_identifiers = NULL; + if (ev._major == CORBA_NO_EXCEPTION && oaf_result != NULL) { for (i = 0; i < oaf_result->_length; i++) { - view_identifiers = g_list_append (view_identifiers, - nautilus_view_identifier_new_from_sidebar_panel - (&oaf_result->_buffer[i])); + id = nautilus_view_identifier_new_from_sidebar_panel + (&oaf_result->_buffer[i]); + view_identifiers = g_list_prepend (view_identifiers, id); } + view_identifiers = g_list_reverse (view_identifiers); } if (oaf_result != NULL) { @@ -223,7 +222,7 @@ nautilus_global_preferences_get_sidebar_panel_view_identifiers (void) /* - * Presummably, the following would be registered + * Presumably, the following would be registered * only if the component was present. Once we * have smarter activation, that will be case. * @@ -231,27 +230,27 @@ nautilus_global_preferences_get_sidebar_panel_view_identifiers (void) */ NautilusStringList * -nautilus_global_preferences_get_meta_view_iids (void) +nautilus_global_preferences_get_sidebar_view_iids (void) { - NautilusStringList *meta_view_names; + NautilusStringList *sidebar_view_names; GList *view_identifiers; GList *p; NautilusViewIdentifier *identifier; view_identifiers = nautilus_global_preferences_get_sidebar_panel_view_identifiers (); - meta_view_names = nautilus_string_list_new (); + sidebar_view_names = nautilus_string_list_new (); for (p = view_identifiers; p != NULL; p = p->next) { identifier = (NautilusViewIdentifier *) (p->data); - nautilus_string_list_insert (meta_view_names, + nautilus_string_list_insert (sidebar_view_names, identifier->iid); } nautilus_view_identifier_free_list (view_identifiers); - return meta_view_names; + return sidebar_view_names; } static GtkWidget * @@ -271,7 +270,7 @@ global_preferences_get_dialog (void) static void -nautilus_preferences_register_meta_view_preferences_for_ui (void) +nautilus_preferences_register_sidebar_view_preferences_for_ui (void) { GList *view_identifiers; GList *p; @@ -283,7 +282,7 @@ nautilus_preferences_register_meta_view_preferences_for_ui (void) for (p = view_identifiers; p != NULL; p = p->next) { identifier = (NautilusViewIdentifier *) (p->data); - preference_key = g_strconcat ("/nautilus/metaviews/", identifier->iid, NULL); + preference_key = g_strconcat ("/nautilus/sidebar-views/", identifier->iid, NULL); nautilus_preferences_set_info (preference_key, identifier->name, @@ -370,9 +369,9 @@ global_preferences_register_for_ui () "Hacker", NAUTILUS_USER_LEVEL_HACKER); - /* Meta views */ + /* Sidebar views */ - nautilus_preferences_register_meta_view_preferences_for_ui (); + nautilus_preferences_register_sidebar_view_preferences_for_ui (); /* Appearance options */ diff --git a/libnautilus-extensions/nautilus-global-preferences.h b/libnautilus-extensions/nautilus-global-preferences.h index 28e71f012..2acb5e755 100644 --- a/libnautilus-extensions/nautilus-global-preferences.h +++ b/libnautilus-extensions/nautilus-global-preferences.h @@ -69,7 +69,7 @@ enum void nautilus_global_preferences_startup (void); void nautilus_global_preferences_shutdown (void); void nautilus_global_preferences_show_dialog (void); -NautilusStringList *nautilus_global_preferences_get_meta_view_iids (void); +NautilusStringList *nautilus_global_preferences_get_sidebar_view_iids (void); GList *nautilus_global_preferences_get_sidebar_panel_view_identifiers (void); BEGIN_GNOME_DECLS diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c index e14c0448e..aac507c50 100644 --- a/libnautilus-private/nautilus-global-preferences.c +++ b/libnautilus-private/nautilus-global-preferences.c @@ -63,7 +63,7 @@ global_preferences_create_dialog (void) NautilusPreferencesBox *preference_box; GtkWidget *user_level_pane; GtkWidget *directory_views_pane; - GtkWidget *meta_view_pane; + GtkWidget *sidebar_view_pane; GtkWidget *appearance_pane; @@ -123,14 +123,14 @@ global_preferences_create_dialog (void) /* * Meta view pane */ - meta_view_pane = nautilus_preferences_box_add_pane (preference_box, + sidebar_view_pane = nautilus_preferences_box_add_pane (preference_box, "Meta Views", "Meta Views Something"); - nautilus_preferences_pane_add_group (NAUTILUS_PREFERENCES_PANE (meta_view_pane), "Meta Views"); + nautilus_preferences_pane_add_group (NAUTILUS_PREFERENCES_PANE (sidebar_view_pane), "Meta Views"); { - char *meta_view_pref; + char *sidebar_view_pref; GList *view_identifiers; GList *p; NautilusViewIdentifier *identifier; @@ -141,17 +141,17 @@ global_preferences_create_dialog (void) for (p = view_identifiers; p != NULL; p = p->next) { identifier = (NautilusViewIdentifier *) (p->data); - meta_view_pref = g_strconcat ("/nautilus/metaviews/", + sidebar_view_pref = g_strconcat ("/nautilus/metaviews/", identifier->iid, NULL); nautilus_preferences_pane_add_item_to_nth_group - (NAUTILUS_PREFERENCES_PANE (meta_view_pane), + (NAUTILUS_PREFERENCES_PANE (sidebar_view_pane), 0, - meta_view_pref, + sidebar_view_pref, NAUTILUS_PREFERENCE_ITEM_BOOLEAN); - g_free (meta_view_pref); + g_free (sidebar_view_pref); } @@ -188,28 +188,27 @@ global_preferences_create_dialog (void) GList * nautilus_global_preferences_get_sidebar_panel_view_identifiers (void) { - OAF_ServerInfoList *oaf_result; - const char *query; CORBA_Environment ev; + const char *query; + OAF_ServerInfoList *oaf_result; int i; + NautilusViewIdentifier *id; GList *view_identifiers; CORBA_exception_init (&ev); - view_identifiers = NULL; + query = "nautilus:sidebar_panel_name.defined() AND repo_ids.has ('IDL:Bonobo/Control:1.0')"; - oaf_result = NULL; - - query = "repo_ids.has_all (['IDL:Nautilus/MetaView:1.0','IDL:Bonobo/Control:1.0'])"; - - oaf_result = oaf_query (query, NULL /* alphabetize by name in the future */, &ev); + oaf_result = oaf_query (query, NULL /* FIXME: alphabetize by name in the future? */, &ev); - if (ev._major == CORBA_NO_EXCEPTION && oaf_result != NULL && oaf_result->_length > 0) { + view_identifiers = NULL; + if (ev._major == CORBA_NO_EXCEPTION && oaf_result != NULL) { for (i = 0; i < oaf_result->_length; i++) { - view_identifiers = g_list_append (view_identifiers, - nautilus_view_identifier_new_from_sidebar_panel - (&oaf_result->_buffer[i])); + id = nautilus_view_identifier_new_from_sidebar_panel + (&oaf_result->_buffer[i]); + view_identifiers = g_list_prepend (view_identifiers, id); } + view_identifiers = g_list_reverse (view_identifiers); } if (oaf_result != NULL) { @@ -223,7 +222,7 @@ nautilus_global_preferences_get_sidebar_panel_view_identifiers (void) /* - * Presummably, the following would be registered + * Presumably, the following would be registered * only if the component was present. Once we * have smarter activation, that will be case. * @@ -231,27 +230,27 @@ nautilus_global_preferences_get_sidebar_panel_view_identifiers (void) */ NautilusStringList * -nautilus_global_preferences_get_meta_view_iids (void) +nautilus_global_preferences_get_sidebar_view_iids (void) { - NautilusStringList *meta_view_names; + NautilusStringList *sidebar_view_names; GList *view_identifiers; GList *p; NautilusViewIdentifier *identifier; view_identifiers = nautilus_global_preferences_get_sidebar_panel_view_identifiers (); - meta_view_names = nautilus_string_list_new (); + sidebar_view_names = nautilus_string_list_new (); for (p = view_identifiers; p != NULL; p = p->next) { identifier = (NautilusViewIdentifier *) (p->data); - nautilus_string_list_insert (meta_view_names, + nautilus_string_list_insert (sidebar_view_names, identifier->iid); } nautilus_view_identifier_free_list (view_identifiers); - return meta_view_names; + return sidebar_view_names; } static GtkWidget * @@ -271,7 +270,7 @@ global_preferences_get_dialog (void) static void -nautilus_preferences_register_meta_view_preferences_for_ui (void) +nautilus_preferences_register_sidebar_view_preferences_for_ui (void) { GList *view_identifiers; GList *p; @@ -283,7 +282,7 @@ nautilus_preferences_register_meta_view_preferences_for_ui (void) for (p = view_identifiers; p != NULL; p = p->next) { identifier = (NautilusViewIdentifier *) (p->data); - preference_key = g_strconcat ("/nautilus/metaviews/", identifier->iid, NULL); + preference_key = g_strconcat ("/nautilus/sidebar-views/", identifier->iid, NULL); nautilus_preferences_set_info (preference_key, identifier->name, @@ -370,9 +369,9 @@ global_preferences_register_for_ui () "Hacker", NAUTILUS_USER_LEVEL_HACKER); - /* Meta views */ + /* Sidebar views */ - nautilus_preferences_register_meta_view_preferences_for_ui (); + nautilus_preferences_register_sidebar_view_preferences_for_ui (); /* Appearance options */ diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h index 28e71f012..2acb5e755 100644 --- a/libnautilus-private/nautilus-global-preferences.h +++ b/libnautilus-private/nautilus-global-preferences.h @@ -69,7 +69,7 @@ enum void nautilus_global_preferences_startup (void); void nautilus_global_preferences_shutdown (void); void nautilus_global_preferences_show_dialog (void); -NautilusStringList *nautilus_global_preferences_get_meta_view_iids (void); +NautilusStringList *nautilus_global_preferences_get_sidebar_view_iids (void); GList *nautilus_global_preferences_get_sidebar_panel_view_identifiers (void); BEGIN_GNOME_DECLS diff --git a/libnautilus/Makefile.am b/libnautilus/Makefile.am index c5159f154..56dbd9521 100644 --- a/libnautilus/Makefile.am +++ b/libnautilus/Makefile.am @@ -44,7 +44,6 @@ libnautilusinclude_HEADERS= \ nautilus-bonobo-ui.h \ nautilus-clipboard.h \ nautilus-content-view-frame.h \ - nautilus-meta-view-frame.h \ nautilus-view-component.h \ nautilus-view-frame.h \ nautilus-undo-context.h \ @@ -61,7 +60,6 @@ libnautilus_la_SOURCES= \ $(nautilus_undo_idl_sources) \ nautilus-clipboard.c \ nautilus-content-view-frame.c \ - nautilus-meta-view-frame.c \ nautilus-view-frame.c \ nautilus-undo-context.c \ nautilus-undo-manager.c \ diff --git a/libnautilus/libnautilus.h b/libnautilus/libnautilus.h index 5706048d3..84df61177 100644 --- a/libnautilus/libnautilus.h +++ b/libnautilus/libnautilus.h @@ -32,7 +32,6 @@ #include <bonobo.h> #include <libnautilus/nautilus-view-component.h> #include <libnautilus/nautilus-view-frame.h> -#include <libnautilus/nautilus-meta-view-frame.h> #include <libnautilus/nautilus-content-view-frame.h> #endif /* LIBNAUTILUS_H */ diff --git a/libnautilus/nautilus-meta-view-frame.c b/libnautilus/nautilus-meta-view-frame.c deleted file mode 100644 index d97167e10..000000000 --- a/libnautilus/nautilus-meta-view-frame.c +++ /dev/null @@ -1,112 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * libnautilus: A library for nautilus view implementations. - * - * Copyright (C) 1999, 2000 Red Hat, Inc. - * Copyright (C) 2000 Eazel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Author: Elliot Lee <sopwith@redhat.com> - * - */ - -/* nautilus-meta-view-frame.c: Implementation for object that represents a - nautilus meta view implementation. */ - -#include <config.h> -#include "nautilus-meta-view-frame.h" - -#include <libgnome/gnome-i18n.h> -#include <bonobo/bonobo-control.h> -#include <libnautilus-extensions/nautilus-gtk-macros.h> - -typedef struct { - POA_Nautilus_View servant; - gpointer bonobo_object; - - NautilusMetaView *view; -} impl_POA_Nautilus_MetaView; - -extern POA_Nautilus_View__epv libnautilus_Nautilus_View_epv; -static POA_Nautilus_MetaView__epv impl_Nautilus_MetaView_epv; -static PortableServer_ServantBase__epv base_epv; -static POA_Nautilus_MetaView__vepv impl_Nautilus_MetaView_vepv = -{ - &base_epv, - NULL, - &libnautilus_Nautilus_View_epv, - &impl_Nautilus_MetaView_epv -}; - -static void nautilus_meta_view_initialize (NautilusMetaView *view); -static void nautilus_meta_view_destroy (NautilusMetaView *view); -static void nautilus_meta_view_initialize_class (NautilusMetaViewClass *klass); - -NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusMetaView, nautilus_meta_view, NAUTILUS_TYPE_VIEW) - -static void -nautilus_meta_view_initialize (NautilusMetaView *view) -{ -} - -NautilusMetaView * -nautilus_meta_view_new (GtkWidget *widget) -{ - BonoboControl *control; - - g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); - - control = bonobo_control_new (widget); - return nautilus_meta_view_new_from_bonobo_control (control); -} - - -NautilusMetaView * -nautilus_meta_view_new_from_bonobo_control (BonoboControl *bonobo_control) -{ - NautilusMetaView *view; - - g_return_val_if_fail (BONOBO_IS_CONTROL (bonobo_control), NULL); - - view = NAUTILUS_META_VIEW (gtk_object_new (NAUTILUS_TYPE_META_VIEW, - "bonobo_control", bonobo_control, - NULL)); - - - return view; -} - -static void -nautilus_meta_view_destroy (NautilusMetaView *view) -{ - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, GTK_OBJECT (view)); -} - -static void -nautilus_meta_view_initialize_class (NautilusMetaViewClass *klass) -{ - NautilusViewClass *view_class; - - view_class = NAUTILUS_VIEW_CLASS (klass); - - GTK_OBJECT_CLASS (klass)->destroy = (void (*)(GtkObject *)) nautilus_meta_view_destroy; - - view_class->servant_init_func = POA_Nautilus_MetaView__init; - view_class->servant_destroy_func = POA_Nautilus_MetaView__fini; - view_class->vepv = &impl_Nautilus_MetaView_vepv; -} - diff --git a/libnautilus/nautilus-meta-view-frame.h b/libnautilus/nautilus-meta-view-frame.h deleted file mode 100644 index 16e39c10e..000000000 --- a/libnautilus/nautilus-meta-view-frame.h +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * libnautilus: A library for nautilus view implementations. - * - * Copyright (C) 1999, 2000 Red Hat, Inc. - * Copyright (C) 2000 Eazel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Author: Elliot Lee <sopwith@redhat.com> - * - */ -/* nautilus-meta-view-frame.h: Interface for object that represents the - frame a nautilus meta view plugs into. */ - -#ifndef NAUTILUS_META_VIEW_FRAME_H -#define NAUTILUS_META_VIEW_FRAME_H - -#include <libnautilus/nautilus-view-frame.h> -#include <bonobo/bonobo-control.h> - -#define NAUTILUS_TYPE_META_VIEW (nautilus_meta_view_get_type ()) -#define NAUTILUS_META_VIEW(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_META_VIEW, NautilusMetaView)) -#define NAUTILUS_META_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_META_VIEW, NautilusMetaViewClass)) -#define NAUTILUS_IS_META_VIEW(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_META_VIEW)) -#define NAUTILUS_IS_META_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_META_VIEW)) - -typedef struct NautilusMetaView NautilusMetaView; -typedef struct NautilusMetaViewClass NautilusMetaViewClass; - -struct NautilusMetaView { - NautilusView base; -}; - -struct NautilusMetaViewClass { - NautilusViewClass base; -}; - -GtkType nautilus_meta_view_get_type (void); -NautilusMetaView *nautilus_meta_view_new (GtkWidget *widget); -NautilusMetaView *nautilus_meta_view_new_from_bonobo_control (BonoboControl *control); - -#endif diff --git a/libnautilus/nautilus-view-component.idl b/libnautilus/nautilus-view-component.idl index d5552fb26..02e9721fe 100644 --- a/libnautilus/nautilus-view-component.idl +++ b/libnautilus/nautilus-view-component.idl @@ -52,9 +52,6 @@ module Nautilus { oneway void show_properties (); // Requests that the client show its properties }; - interface MetaView : View { - }; - interface ContentView : View { }; diff --git a/po/POTFILES.in b/po/POTFILES.in index c353aa496..12f73cb65 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -17,7 +17,6 @@ src/file-manager/fm-properties-window.c nautilus-widgets/nautilus-preferences-dialog.c libnautilus-extensions/nautilus-file.c libnautilus-extensions/nautilus-global-preferences.c -libnautilus/nautilus-meta-view-frame.c components/help/hyperbola-filefmt.c components/help/hyperbola-nav-index.c components/history/ntl-history-view.c diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c index 6484455ca..04b5591b7 100644 --- a/src/nautilus-information-panel.c +++ b/src/nautilus-information-panel.c @@ -471,7 +471,7 @@ nautilus_index_panel_add_meta_view (NautilusIndexPanel *index_panel, NautilusVie int page_num; g_return_if_fail (NAUTILUS_IS_INDEX_PANEL (index_panel)); - g_return_if_fail (NAUTILUS_IS_META_VIEW_FRAME (meta_view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (meta_view)); description = nautilus_meta_view_frame_get_label (NAUTILUS_META_VIEW_FRAME (meta_view)); if (description == NULL) { diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c index eba6b06ae..741e8b85f 100644 --- a/src/nautilus-navigation-window.c +++ b/src/nautilus-navigation-window.c @@ -880,7 +880,7 @@ void nautilus_window_add_meta_view(NautilusWindow *window, NautilusViewFrame *meta_view) { g_return_if_fail (!g_list_find (window->meta_views, meta_view)); - g_return_if_fail (NAUTILUS_IS_META_VIEW_FRAME (meta_view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (meta_view)); nautilus_index_panel_add_meta_view (window->index_panel, meta_view); window->meta_views = g_list_prepend (window->meta_views, meta_view); diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c index eba6b06ae..741e8b85f 100644 --- a/src/nautilus-object-window.c +++ b/src/nautilus-object-window.c @@ -880,7 +880,7 @@ void nautilus_window_add_meta_view(NautilusWindow *window, NautilusViewFrame *meta_view) { g_return_if_fail (!g_list_find (window->meta_views, meta_view)); - g_return_if_fail (NAUTILUS_IS_META_VIEW_FRAME (meta_view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (meta_view)); nautilus_index_panel_add_meta_view (window->index_panel, meta_view); window->meta_views = g_list_prepend (window->meta_views, meta_view); diff --git a/src/nautilus-sidebar.c b/src/nautilus-sidebar.c index 6484455ca..04b5591b7 100644 --- a/src/nautilus-sidebar.c +++ b/src/nautilus-sidebar.c @@ -471,7 +471,7 @@ nautilus_index_panel_add_meta_view (NautilusIndexPanel *index_panel, NautilusVie int page_num; g_return_if_fail (NAUTILUS_IS_INDEX_PANEL (index_panel)); - g_return_if_fail (NAUTILUS_IS_META_VIEW_FRAME (meta_view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (meta_view)); description = nautilus_meta_view_frame_get_label (NAUTILUS_META_VIEW_FRAME (meta_view)); if (description == NULL) { diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c index eba6b06ae..741e8b85f 100644 --- a/src/nautilus-spatial-window.c +++ b/src/nautilus-spatial-window.c @@ -880,7 +880,7 @@ void nautilus_window_add_meta_view(NautilusWindow *window, NautilusViewFrame *meta_view) { g_return_if_fail (!g_list_find (window->meta_views, meta_view)); - g_return_if_fail (NAUTILUS_IS_META_VIEW_FRAME (meta_view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (meta_view)); nautilus_index_panel_add_meta_view (window->index_panel, meta_view); window->meta_views = g_list_prepend (window->meta_views, meta_view); diff --git a/src/nautilus-view-frame.h b/src/nautilus-view-frame.h index 2be706f6a..b69ab87d6 100644 --- a/src/nautilus-view-frame.h +++ b/src/nautilus-view-frame.h @@ -25,8 +25,7 @@ */ /* ntl-view.h: Interface of the object representing a data - view. NautilusContentViewFrame and NautilusMetaViewFrame derive from - this class. */ + view. */ #ifndef NTL_VIEW_H #define NTL_VIEW_H diff --git a/src/nautilus-window.c b/src/nautilus-window.c index eba6b06ae..741e8b85f 100644 --- a/src/nautilus-window.c +++ b/src/nautilus-window.c @@ -880,7 +880,7 @@ void nautilus_window_add_meta_view(NautilusWindow *window, NautilusViewFrame *meta_view) { g_return_if_fail (!g_list_find (window->meta_views, meta_view)); - g_return_if_fail (NAUTILUS_IS_META_VIEW_FRAME (meta_view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (meta_view)); nautilus_index_panel_add_meta_view (window->index_panel, meta_view); window->meta_views = g_list_prepend (window->meta_views, meta_view); diff --git a/src/ntl-index-panel.c b/src/ntl-index-panel.c index 6484455ca..04b5591b7 100644 --- a/src/ntl-index-panel.c +++ b/src/ntl-index-panel.c @@ -471,7 +471,7 @@ nautilus_index_panel_add_meta_view (NautilusIndexPanel *index_panel, NautilusVie int page_num; g_return_if_fail (NAUTILUS_IS_INDEX_PANEL (index_panel)); - g_return_if_fail (NAUTILUS_IS_META_VIEW_FRAME (meta_view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (meta_view)); description = nautilus_meta_view_frame_get_label (NAUTILUS_META_VIEW_FRAME (meta_view)); if (description == NULL) { diff --git a/src/ntl-view.h b/src/ntl-view.h index 2be706f6a..b69ab87d6 100644 --- a/src/ntl-view.h +++ b/src/ntl-view.h @@ -25,8 +25,7 @@ */ /* ntl-view.h: Interface of the object representing a data - view. NautilusContentViewFrame and NautilusMetaViewFrame derive from - this class. */ + view. */ #ifndef NTL_VIEW_H #define NTL_VIEW_H diff --git a/src/ntl-window.c b/src/ntl-window.c index eba6b06ae..741e8b85f 100644 --- a/src/ntl-window.c +++ b/src/ntl-window.c @@ -880,7 +880,7 @@ void nautilus_window_add_meta_view(NautilusWindow *window, NautilusViewFrame *meta_view) { g_return_if_fail (!g_list_find (window->meta_views, meta_view)); - g_return_if_fail (NAUTILUS_IS_META_VIEW_FRAME (meta_view)); + g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (meta_view)); nautilus_index_panel_add_meta_view (window->index_panel, meta_view); window->meta_views = g_list_prepend (window->meta_views, meta_view); |