Commit 346de152 authored by Darin Adler's avatar Darin Adler
Browse files

[removed] [removed]

	* components/hardware/nautilus-hardware-view.c:
	(nautilus_hardware_view_initialize),
	(hardware_view_notify_location_change_callback):
	* components/hardware/nautilus-hardware-view.h:
	* components/help/hyperbola-nav-index.c:
	(hyperbola_navigation_index_select_row):
	* components/help/hyperbola-nav-search.c:
	(hyperbola_navigation_search_select_row),
	(hyperbola_navigation_search_new):
	* components/html/ntl-web-browser.c: (browser_url_load_done),
	(browser_vfs_callback), (browser_goto_url_real),
	(browser_goto_url), (browser_select_url), (browser_title_changed),
	(browser_notify_location_change), (make_obj):
	* components/loser/content/main.c: (loser_make_object):
	* components/loser/content/nautilus-content-loser.c:
	(nautilus_content_loser_initialize),
	(loser_notify_location_change_callback):
	* components/loser/content/nautilus-content-loser.h:
	* components/loser/sidebar/main.c: (loser_make_object):
	* components/loser/sidebar/nautilus-sidebar-loser.c:
	(nautilus_sidebar_loser_initialize),
	(loser_notify_location_change_callback):
	* components/mozilla/main.c: (mozilla_make_object):
	* components/mozilla/nautilus-mozilla-content-view.c:
	(nautilus_mozilla_content_view_initialize),
	(mozilla_content_view_request_progress_change),
	(mozilla_content_view_request_location_change),
	(mozilla_notify_location_change_callback),
	(mozilla_title_changed_callback), (mozilla_link_message_callback):
	* components/mozilla/nautilus-mozilla-content-view.h:
	* components/music/main.c: (music_view_make_object):
	* components/music/nautilus-music-view.c:
	(nautilus_music_view_initialize), (click_column_callback),
	(music_view_notify_location_change_callback),
	(nautilus_music_view_drag_data_received):
	* components/music/nautilus-music-view.h:
	* components/rpmview/main.c: (rpm_view_make_object):
	* components/rpmview/nautilus-rpm-view.c:
	(nautilus_rpm_view_initialize),
	(rpm_view_notify_location_change_callback):
	* components/rpmview/nautilus-rpm-view.h:
	* components/sample/main.c: (sample_make_object):
	* components/sample/nautilus-sample-content-view.c:
	(nautilus_sample_content_view_initialize),
	(sample_notify_location_change_callback):
	* components/sample/nautilus-sample-content-view.h:
	* components/services/startup/nautilus-view/main.c:
	(services_make_object):
	* components/services/startup/nautilus-view/nautilus-service-startup-view.c:
	(go_to_uri), (nautilus_service_startup_view_initialize),
	(service_main_notify_location_change_cb):
	* components/services/startup/nautilus-view/nautilus-service-startup-view.h:
	* libnautilus/Makefile.am:
	* libnautilus/libnautilus.h:
	* libnautilus/nautilus-content-view-frame.c: [removed]
	* libnautilus/nautilus-content-view-frame.h: [removed]
	* libnautilus/nautilus-view-component.idl:
	* libnautilus/nautilus-view-frame-private.h:
	* libnautilus/nautilus-view-frame.c:
	(impl_Nautilus_View_save_state), (impl_Nautilus_View_load_state),
	(impl_Nautilus_View_notify_location_change),
	(impl_Nautilus_View_show_properties),
	(impl_Nautilus_View_notify_selection_change),
	(impl_Nautilus_View_stop_location_change),
	(impl_Nautilus_View__destroy), (impl_Nautilus_View__create),
	(nautilus_view_initialize_class), (nautilus_view_initialize),
	(nautilus_view_new), (nautilus_view_new_from_bonobo_control),
	(get_view_frame), (nautilus_view_request_location_change),
	(nautilus_view_request_selection_change),
	(nautilus_view_request_status_change),
	(nautilus_view_request_progress_change),
	(nautilus_view_request_title_change),
	(nautilus_view_get_bonobo_control),
	(nautilus_view_get_main_window):
	* libnautilus/nautilus-view-frame.h:
	* src/Makefile.am:
	* src/file-manager/fm-directory-view.c: (get_bonobo_control),
	(fm_directory_view_initialize), (display_selection_info),
	(fm_directory_view_send_selection_change),
	(notify_location_change_callback), (stop_location_change_callback),
	(done_loading), (fm_directory_view_activate_file_internal),
	(finish_loading_uri):
	* src/file-manager/fm-directory-view.h:
	* src/ntl-app.c: (impl_Nautilus_Application_create_object):
	* src/ntl-content-view.c: [removed]
	* src/ntl-content-view.h: [removed]
	* src/ntl-uri-map.c: (make_oaf_query_with_known_mime_type),
	(make_oaf_query_with_uri_scheme_only):
	* src/ntl-view-frame-svr.c: (impl_Nautilus_ViewFrame__destroy),
	(impl_Nautilus_ViewFrame__create),
	(impl_Nautilus_ViewFrame__get_main_window),
	(impl_Nautilus_ViewFrame_request_location_change),
	(impl_Nautilus_ViewFrame_request_selection_change),
	(impl_Nautilus_ViewFrame_request_status_change),
	(impl_Nautilus_ViewFrame_request_progress_change),
	(impl_Nautilus_ViewFrame_request_title_change):
	* src/ntl-view-private.h:
	* src/ntl-view.c: (nautilus_view_frame_class_init),
	(nautilus_view_frame_set_arg), (nautilus_view_frame_get_arg),
	(nautilus_view_frame_request_location_change),
	(nautilus_view_frame_request_selection_change),
	(nautilus_view_frame_request_status_change),
	(nautilus_view_frame_request_progress_change),
	(nautilus_view_frame_request_title_change),
	(nautilus_view_frame_set_label), (nautilus_view_frame_activate):
	* src/ntl-view.h:
	* src/ntl-window-msgs.c: (nautilus_window_request_title_change),
	(nautilus_window_load_meta_view),
	(nautilus_window_request_location_change),
	(nautilus_window_load_content_view):
	* src/ntl-window-msgs.h:
	* src/ntl-window-private.h:
	* src/ntl-window.c:
	(nautilus_window_request_title_change_callback),
	(nautilus_window_connect_content_view),
	(nautilus_window_real_set_content_view):
	Got rid of ContentView and ContentViewFrame.
parent 8bea55d8
2000-05-24 Darin Adler <darin@eazel.com>
Eliminated ContentView and ContentViewFrame.
* components/hardware/nautilus-hardware-view.c:
(nautilus_hardware_view_initialize),
(hardware_view_notify_location_change_callback):
* components/hardware/nautilus-hardware-view.h:
* components/help/hyperbola-nav-index.c:
(hyperbola_navigation_index_select_row):
* components/help/hyperbola-nav-search.c:
(hyperbola_navigation_search_select_row),
(hyperbola_navigation_search_new):
* components/html/ntl-web-browser.c: (browser_url_load_done),
(browser_vfs_callback), (browser_goto_url_real),
(browser_goto_url), (browser_select_url), (browser_title_changed),
(browser_notify_location_change), (make_obj):
* components/loser/content/main.c: (loser_make_object):
* components/loser/content/nautilus-content-loser.c:
(nautilus_content_loser_initialize),
(loser_notify_location_change_callback):
* components/loser/content/nautilus-content-loser.h:
* components/loser/sidebar/main.c: (loser_make_object):
* components/loser/sidebar/nautilus-sidebar-loser.c:
(nautilus_sidebar_loser_initialize),
(loser_notify_location_change_callback):
* components/mozilla/main.c: (mozilla_make_object):
* components/mozilla/nautilus-mozilla-content-view.c:
(nautilus_mozilla_content_view_initialize),
(mozilla_content_view_request_progress_change),
(mozilla_content_view_request_location_change),
(mozilla_notify_location_change_callback),
(mozilla_title_changed_callback), (mozilla_link_message_callback):
* components/mozilla/nautilus-mozilla-content-view.h:
* components/music/main.c: (music_view_make_object):
* components/music/nautilus-music-view.c:
(nautilus_music_view_initialize), (click_column_callback),
(music_view_notify_location_change_callback),
(nautilus_music_view_drag_data_received):
* components/music/nautilus-music-view.h:
* components/rpmview/main.c: (rpm_view_make_object):
* components/rpmview/nautilus-rpm-view.c:
(nautilus_rpm_view_initialize),
(rpm_view_notify_location_change_callback):
* components/rpmview/nautilus-rpm-view.h:
* components/sample/main.c: (sample_make_object):
* components/sample/nautilus-sample-content-view.c:
(nautilus_sample_content_view_initialize),
(sample_notify_location_change_callback):
* components/sample/nautilus-sample-content-view.h:
* components/services/startup/nautilus-view/main.c:
(services_make_object):
* components/services/startup/nautilus-view/nautilus-service-startup-view.c:
(go_to_uri), (nautilus_service_startup_view_initialize),
(service_main_notify_location_change_cb):
* components/services/startup/nautilus-view/nautilus-service-startup-view.h:
* libnautilus/Makefile.am:
* libnautilus/libnautilus.h:
* libnautilus/nautilus-content-view-frame.c: [removed]
* libnautilus/nautilus-content-view-frame.h: [removed]
* libnautilus/nautilus-view-component.idl:
* libnautilus/nautilus-view-frame-private.h:
* libnautilus/nautilus-view-frame.c:
(impl_Nautilus_View_save_state), (impl_Nautilus_View_load_state),
(impl_Nautilus_View_notify_location_change),
(impl_Nautilus_View_show_properties),
(impl_Nautilus_View_notify_selection_change),
(impl_Nautilus_View_stop_location_change),
(impl_Nautilus_View__destroy), (impl_Nautilus_View__create),
(nautilus_view_initialize_class), (nautilus_view_initialize),
(nautilus_view_new), (nautilus_view_new_from_bonobo_control),
(get_view_frame), (nautilus_view_request_location_change),
(nautilus_view_request_selection_change),
(nautilus_view_request_status_change),
(nautilus_view_request_progress_change),
(nautilus_view_request_title_change),
(nautilus_view_get_bonobo_control),
(nautilus_view_get_main_window):
* libnautilus/nautilus-view-frame.h:
* src/Makefile.am:
* src/file-manager/fm-directory-view.c: (get_bonobo_control),
(fm_directory_view_initialize), (display_selection_info),
(fm_directory_view_send_selection_change),
(notify_location_change_callback), (stop_location_change_callback),
(done_loading), (fm_directory_view_activate_file_internal),
(finish_loading_uri):
* src/file-manager/fm-directory-view.h:
* src/ntl-app.c: (impl_Nautilus_Application_create_object):
* src/ntl-content-view.c: [removed]
* src/ntl-content-view.h: [removed]
* src/ntl-uri-map.c: (make_oaf_query_with_known_mime_type),
(make_oaf_query_with_uri_scheme_only):
* src/ntl-view-frame-svr.c: (impl_Nautilus_ViewFrame__destroy),
(impl_Nautilus_ViewFrame__create),
(impl_Nautilus_ViewFrame__get_main_window),
(impl_Nautilus_ViewFrame_request_location_change),
(impl_Nautilus_ViewFrame_request_selection_change),
(impl_Nautilus_ViewFrame_request_status_change),
(impl_Nautilus_ViewFrame_request_progress_change),
(impl_Nautilus_ViewFrame_request_title_change):
* src/ntl-view-private.h:
* src/ntl-view.c: (nautilus_view_frame_class_init),
(nautilus_view_frame_set_arg), (nautilus_view_frame_get_arg),
(nautilus_view_frame_request_location_change),
(nautilus_view_frame_request_selection_change),
(nautilus_view_frame_request_status_change),
(nautilus_view_frame_request_progress_change),
(nautilus_view_frame_request_title_change),
(nautilus_view_frame_set_label), (nautilus_view_frame_activate):
* src/ntl-view.h:
* src/ntl-window-msgs.c: (nautilus_window_request_title_change),
(nautilus_window_load_meta_view),
(nautilus_window_request_location_change),
(nautilus_window_load_content_view):
* src/ntl-window-msgs.h:
* src/ntl-window-private.h:
* src/ntl-window.c:
(nautilus_window_request_title_change_callback),
(nautilus_window_connect_content_view),
(nautilus_window_real_set_content_view):
Got rid of ContentView and ContentViewFrame.
2000-05-24 John Sullivan <sullivan@eazel.com>
* src/ntl-app.c: (display_caveat): Made the startup caveat
......
......@@ -51,7 +51,7 @@
struct _NautilusHardwareViewDetails {
char *uri;
NautilusContentView *nautilus_view;
NautilusView *nautilus_view;
GtkWidget *form;
};
......@@ -69,21 +69,19 @@ static GtkTargetEntry hardware_dnd_target_table[] = {
{ "special/x-gnome-icon-list", 0, TARGET_GNOME_URI_LIST }
};
static void nautilus_hardware_view_drag_data_received (GtkWidget *widget,
GdkDragContext *context,
int x,
int y,
GtkSelectionData *selection_data,
guint info,
guint time);
static void nautilus_hardware_view_initialize_class (NautilusHardwareViewClass *klass);
static void nautilus_hardware_view_initialize (NautilusHardwareView *view);
static void nautilus_hardware_view_destroy (GtkObject *object);
static void hardware_view_notify_location_change_callback (NautilusContentView *view,
Nautilus_NavigationInfo *navinfo,
NautilusHardwareView *hardware_view);
static void nautilus_hardware_view_drag_data_received (GtkWidget *widget,
GdkDragContext *context,
int x,
int y,
GtkSelectionData *selection_data,
guint info,
guint time);
static void nautilus_hardware_view_initialize_class (NautilusHardwareViewClass *klass);
static void nautilus_hardware_view_initialize (NautilusHardwareView *view);
static void nautilus_hardware_view_destroy (GtkObject *object);
static void hardware_view_notify_location_change_callback (NautilusView *view,
Nautilus_NavigationInfo *navinfo,
NautilusHardwareView *hardware_view);
NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusHardwareView, nautilus_hardware_view, GTK_TYPE_EVENT_BOX)
......@@ -110,7 +108,7 @@ nautilus_hardware_view_initialize (NautilusHardwareView *hardware_view)
NautilusBackground *background;
hardware_view->details = g_new0 (NautilusHardwareViewDetails, 1);
hardware_view->details->nautilus_view = nautilus_content_view_new (GTK_WIDGET (hardware_view));
hardware_view->details->nautilus_view = nautilus_view_new (GTK_WIDGET (hardware_view));
gtk_signal_connect (GTK_OBJECT (hardware_view->details->nautilus_view),
"notify_location_change",
......@@ -144,7 +142,7 @@ nautilus_hardware_view_destroy (GtkObject *object)
}
/* Component embedding support */
NautilusContentView *
NautilusView *
nautilus_hardware_view_get_nautilus_view (NautilusHardwareView *hardware_view)
{
return hardware_view->details->nautilus_view;
......@@ -446,9 +444,9 @@ nautilus_hardware_view_load_uri (NautilusHardwareView *view, const char *uri)
}
static void
hardware_view_notify_location_change_callback (NautilusContentView *view,
Nautilus_NavigationInfo *navinfo,
NautilusHardwareView *hardware_view)
hardware_view_notify_location_change_callback (NautilusView *view,
Nautilus_NavigationInfo *navinfo,
NautilusHardwareView *hardware_view)
{
Nautilus_ProgressRequestInfo progress;
......@@ -458,7 +456,7 @@ hardware_view_notify_location_change_callback (NautilusContentView *view,
progress.type = Nautilus_PROGRESS_UNDERWAY;
progress.amount = 0.0;
nautilus_view_request_progress_change (NAUTILUS_VIEW (hardware_view->details->nautilus_view), &progress);
nautilus_view_request_progress_change (hardware_view->details->nautilus_view, &progress);
/* do the actual work here */
nautilus_hardware_view_load_uri (hardware_view, navinfo->actual_uri);
......@@ -466,7 +464,7 @@ hardware_view_notify_location_change_callback (NautilusContentView *view,
/* send the required PROGRESS_DONE signal */
progress.type = Nautilus_PROGRESS_DONE_OK;
progress.amount = 100.0;
nautilus_view_request_progress_change (NAUTILUS_VIEW (hardware_view->details->nautilus_view), &progress);
nautilus_view_request_progress_change (hardware_view->details->nautilus_view, &progress);
}
/* handle drag and drop */
......
......@@ -25,7 +25,7 @@
#ifndef NAUTILUS_HARDWARE_VIEW_H
#define NAUTILUS_HARDWARE_VIEW_H
#include <libnautilus/nautilus-content-view-frame.h>
#include <libnautilus/nautilus-view-frame.h>
#include <gtk/gtkeventbox.h>
......@@ -50,13 +50,13 @@ struct _NautilusHardwareViewClass {
};
/* GtkObject support */
GtkType nautilus_hardware_view_get_type (void);
GtkType nautilus_hardware_view_get_type (void);
/* Component embedding support */
NautilusContentView *nautilus_hardware_view_get_nautilus_view (NautilusHardwareView *view);
NautilusView *nautilus_hardware_view_get_nautilus_view (NautilusHardwareView *view);
/* URI handling */
void nautilus_hardware_view_load_uri (NautilusHardwareView *view,
const char *uri);
void nautilus_hardware_view_load_uri (NautilusHardwareView *view,
const char *uri);
#endif /* NAUTILUS_HARDWARE_VIEW_H */
......@@ -243,7 +243,7 @@ hyperbola_navigation_index_select_row(GtkWidget *clist, gint row, gint column, G
memset(&loc, 0, sizeof(loc));
loc.requested_uri = ii->uri;
loc.new_window_requested = FALSE;
nautilus_view_request_location_change(NAUTILUS_VIEW(hni->view_frame), &loc);
nautilus_view_request_location_change(hni->view_frame, &loc);
}
typedef struct {
......
......@@ -10,7 +10,7 @@
#include <ctype.h>
typedef struct {
NautilusView *view_frame;
NautilusView *nautilus_view;
GtkWidget *clist, *ent;
......@@ -140,7 +140,7 @@ hyperbola_navigation_search_select_row(GtkWidget *clist, gint row, gint column,
memset(&loc, 0, sizeof(loc));
loc.requested_uri = uri;
loc.new_window_requested = FALSE;
nautilus_view_request_location_change(NAUTILUS_VIEW(hns->view_frame), &loc);
nautilus_view_request_location_change(hns->nautilus_view, &loc);
}
BonoboObject *hyperbola_navigation_search_new(void)
......@@ -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_new (vbox);
hns->nautilus_view = nautilus_view_new (vbox);
return BONOBO_OBJECT (hns->view_frame);
return BONOBO_OBJECT (hns->nautilus_view);
}
......@@ -29,7 +29,7 @@
#include <libnautilus-extensions/nautilus-debug.h>
typedef struct {
NautilusView *view_frame;
NautilusView *nautilus_view;
GtkWidget *htmlw;
char *base_url, *base_target_url;
......@@ -185,7 +185,7 @@ browser_url_load_done(GtkWidget *htmlw, BrowserInfo *bi)
pri.type = Nautilus_PROGRESS_DONE_OK;
pri.amount = 100.0;
nautilus_view_request_progress_change(bi->view_frame, &pri);
nautilus_view_request_progress_change(bi->nautilus_view, &pri);
}
struct _HTStream {
......@@ -362,7 +362,7 @@ browser_vfs_callback(GnomeVFSAsyncHandle *h, GnomeVFSResult res, gpointer data)
memset(&pri, 0, sizeof(pri));
pri.type = Nautilus_PROGRESS_DONE_ERROR;
nautilus_view_request_progress_change(vfsh->bi->view_frame, &pri);
nautilus_view_request_progress_change(vfsh->bi->nautilus_view, &pri);
gtk_html_end(GTK_HTML(vfsh->bi->htmlw), vfsh->sh, GTK_HTML_STREAM_ERROR);
g_free(vfsh);
......@@ -471,7 +471,7 @@ browser_goto_url_real(GtkWidget *htmlw, const char *url, BrowserInfo *bi)
browser_url_requested(bi->htmlw, url, stream, bi);
nautilus_view_request_progress_change(bi->view_frame, &pri);
nautilus_view_request_progress_change(bi->nautilus_view, &pri);
}
static void
......@@ -486,7 +486,7 @@ browser_goto_url(GtkWidget *htmlw, const char *url, BrowserInfo *bi)
memset(&nri, 0, sizeof(nri));
nri.requested_uri = real_url;
nautilus_view_request_location_change(bi->view_frame, &nri);
nautilus_view_request_location_change(bi->nautilus_view, &nri);
browser_goto_url_real(htmlw, real_url, bi);
g_free(real_url);
}
......@@ -511,9 +511,9 @@ browser_select_url(GtkWidget *htmlw, const char *url, BrowserInfo *bi)
si.selected_uris._length = 0;
}
nautilus_view_request_selection_change(bi->view_frame, &si);
nautilus_view_request_selection_change(bi->nautilus_view, &si);
if(sri.status_string)
nautilus_view_request_status_change(bi->view_frame, &sri);
nautilus_view_request_status_change(bi->nautilus_view, &sri);
g_free(real_url);
bi->prevsel = url?1:0;
}
......@@ -521,7 +521,7 @@ browser_select_url(GtkWidget *htmlw, const char *url, BrowserInfo *bi)
static void
browser_title_changed(GtkWidget *htmlw, const char *new_title, BrowserInfo *bi)
{
nautilus_content_view_request_title_change (NAUTILUS_CONTENT_VIEW (bi->view_frame), new_title);
nautilus_view_request_title_change (bi->nautilus_view, new_title);
}
static void
......@@ -555,7 +555,7 @@ browser_submit(GtkWidget *htmlw, const char *method, const char *url, const char
}
static void
browser_notify_location_change(NautilusView *view_frame,
browser_notify_location_change(NautilusView *nautilus_view,
Nautilus_NavigationInfo *ni,
BrowserInfo *bi)
{
......@@ -603,14 +603,14 @@ make_obj(BonoboGenericFactory *Factory, const char *goad_id, void *closure)
gtk_widget_show(bi->htmlw);
gtk_widget_show(wtmp);
bi->view_frame = NAUTILUS_VIEW (nautilus_content_view_new (wtmp));
bi->nautilus_view = nautilus_view_new (wtmp);
gtk_signal_connect(GTK_OBJECT(bi->view_frame), "notify_location_change", browser_notify_location_change,
gtk_signal_connect(GTK_OBJECT(bi->nautilus_view), "notify_location_change", browser_notify_location_change,
bi);
object_count++;
gtk_signal_connect(GTK_OBJECT(bi->view_frame), "destroy", browser_do_destroy, NULL);
gtk_signal_connect(GTK_OBJECT(bi->nautilus_view), "destroy", browser_do_destroy, NULL);
return BONOBO_OBJECT (bi->view_frame);
return BONOBO_OBJECT (bi->nautilus_view);
}
int main(int argc, char *argv[])
......
......@@ -64,7 +64,7 @@ loser_make_object (BonoboGenericFactory *factory,
object_count++;
nautilus_view = NAUTILUS_VIEW (nautilus_content_loser_get_nautilus_view (view));
nautilus_view = nautilus_content_loser_get_nautilus_view (view);
gtk_signal_connect (GTK_OBJECT (nautilus_view), "destroy", loser_object_destroyed, NULL);
......
......@@ -40,7 +40,7 @@
struct NautilusContentLoserDetails {
char *uri;
NautilusContentView *nautilus_view;
NautilusView *nautilus_view;
};
static void nautilus_content_loser_initialize_class (NautilusContentLoserClass *klass);
......@@ -49,7 +49,7 @@ static void nautilus_content_loser_destroy (GtkObject *
NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusContentLoser, nautilus_content_loser, GTK_TYPE_LABEL)
static void loser_notify_location_change_callback (NautilusContentView *nautilus_view,
static void loser_notify_location_change_callback (NautilusView *nautilus_view,
Nautilus_NavigationInfo *navinfo,
NautilusContentLoser *view);
static void loser_merge_bonobo_items_callback (BonoboObject *control,
......@@ -75,7 +75,7 @@ nautilus_content_loser_initialize (NautilusContentLoser *view)
gtk_label_set_text (GTK_LABEL (view), g_strdup ("(none)"));
view->details->nautilus_view = nautilus_content_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",
......@@ -86,7 +86,7 @@ nautilus_content_loser_initialize (NautilusContentLoser *view)
* can merge menu & toolbar items into Nautilus's UI.
*/
gtk_signal_connect (GTK_OBJECT (nautilus_view_get_bonobo_control
(NAUTILUS_VIEW (view->details->nautilus_view))),
(view->details->nautilus_view)),
"activate",
loser_merge_bonobo_items_callback,
view);
......@@ -117,7 +117,7 @@ nautilus_content_loser_destroy (GtkObject *object)
* @view: NautilusContentLoser to get the nautilus_view from..
*
**/
NautilusContentView *
NautilusView *
nautilus_content_loser_get_nautilus_view (NautilusContentLoser *view)
{
return view->details->nautilus_view;
......@@ -145,9 +145,9 @@ nautilus_content_loser_load_uri (NautilusContentLoser *view,
}
static void
loser_notify_location_change_callback (NautilusContentView *nautilus_view,
Nautilus_NavigationInfo *navinfo,
NautilusContentLoser *view)
loser_notify_location_change_callback (NautilusView *nautilus_view,
Nautilus_NavigationInfo *navinfo,
NautilusContentLoser *view)
{
Nautilus_ProgressRequestInfo request;
......@@ -167,7 +167,7 @@ loser_notify_location_change_callback (NautilusContentView *nautilus_view,
request.type = Nautilus_PROGRESS_UNDERWAY;
request.amount = 0.0;
nautilus_view_request_progress_change (NAUTILUS_VIEW (nautilus_view), &request);
nautilus_view_request_progress_change (nautilus_view, &request);
nautilus_content_loser_maybe_fail ("pre-load");
......@@ -187,7 +187,7 @@ loser_notify_location_change_callback (NautilusContentView *nautilus_view,
request.type = Nautilus_PROGRESS_DONE_OK;
request.amount = 100.0;
nautilus_view_request_progress_change (NAUTILUS_VIEW (nautilus_view), &request);
nautilus_view_request_progress_change (nautilus_view, &request);
nautilus_content_loser_maybe_fail ("post-done");
}
......
......@@ -28,7 +28,7 @@
#ifndef NAUTILUS_CONTENT_LOSER_H
#define NAUTILUS_CONTENT_LOSER_H
#include <libnautilus/nautilus-content-view-frame.h>
#include <libnautilus/nautilus-view-frame.h>
#include <gtk/gtklabel.h>
typedef struct NautilusContentLoser NautilusContentLoser;
......@@ -52,17 +52,17 @@ struct NautilusContentLoserClass {
};
/* GtkObject support */
GtkType nautilus_content_loser_get_type (void);
GtkType nautilus_content_loser_get_type (void);
/* Component embedding support */
NautilusContentView *nautilus_content_loser_get_nautilus_view (NautilusContentLoser *view);
NautilusView *nautilus_content_loser_get_nautilus_view (NautilusContentLoser *view);
/* URI handling */
void nautilus_content_loser_load_uri (NautilusContentLoser *view,
const char *uri);
void nautilus_content_loser_load_uri (NautilusContentLoser *view,
const char *uri);
/* Failing on command. */
void nautilus_content_loser_maybe_fail (const char *location);
void nautilus_content_loser_maybe_fail (const char *location);
#endif /* NAUTILUS_CONTENT_LOSER_H */
......@@ -64,7 +64,7 @@ loser_make_object (BonoboGenericFactory *factory,
object_count++;
nautilus_view = NAUTILUS_VIEW (nautilus_sidebar_loser_get_nautilus_view (view));
nautilus_view = nautilus_sidebar_loser_get_nautilus_view (view);
gtk_signal_connect (GTK_OBJECT (nautilus_view), "destroy", loser_object_destroyed, NULL);
......
......@@ -92,7 +92,7 @@ nautilus_sidebar_loser_initialize (NautilusSidebarLoser *view)
* can merge menu & toolbar items into Nautilus's UI.
*/
gtk_signal_connect (GTK_OBJECT (nautilus_view_get_bonobo_control
(NAUTILUS_VIEW (view->details->nautilus_view))),
(view->details->nautilus_view)),
"activate",
loser_merge_bonobo_items_callback,
view);
......@@ -174,7 +174,7 @@ loser_notify_location_change_callback (NautilusView *nautilus_view,
request.type = Nautilus_PROGRESS_UNDERWAY;
request.amount = 0.0;
nautilus_view_request_progress_change (NAUTILUS_VIEW (nautilus_view), &request);
nautilus_view_request_progress_change (nautilus_view, &request);
nautilus_sidebar_loser_maybe_fail ("pre-load");
......@@ -195,7 +195,7 @@ loser_notify_location_change_callback (NautilusView *nautilus_view,
request.type = Nautilus_PROGRESS_DONE_OK;
request.amount = 100.0;
nautilus_view_request_progress_change (NAUTILUS_VIEW (nautilus_view), &request);
nautilus_view_request_progress_change (nautilus_view, &request);
nautilus_sidebar_loser_maybe_fail ("post-done");
}
......
......@@ -62,7 +62,7 @@ mozilla_make_object (BonoboGenericFactory *factory,
object_count++;
nautilus_view = NAUTILUS_VIEW (nautilus_mozilla_content_view_get_nautilus_view (view));
nautilus_view = nautilus_mozilla_content_view_get_nautilus_view (view);
gtk_signal_connect (GTK_OBJECT (nautilus_view), "destroy", mozilla_object_destroyed, NULL);
......
......@@ -40,18 +40,17 @@
#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-stock.h>
/* A NautilusContentView's private information. */
struct NautilusMozillaContentViewDetails {
char *uri;
GtkWidget *mozilla;
NautilusContentView *nautilus_view;
NautilusView *nautilus_view;
GdkCursor *busy_cursor;
};
static void nautilus_mozilla_content_view_initialize_class (NautilusMozillaContentViewClass *klass);
static void nautilus_mozilla_content_view_initialize (NautilusMozillaContentView *view);
static void nautilus_mozilla_content_view_destroy (GtkObject *object);
static void mozilla_notify_location_change_callback (NautilusContentView *nautilus_view,
static void mozilla_notify_location_change_callback (NautilusView *nautilus_view,
Nautilus_NavigationInfo *navinfo,
NautilusMozillaContentView *view);
static void mozilla_merge_bonobo_items_callback (BonoboObject *control,
......@@ -161,7 +160,7 @@ nautilus_mozilla_content_view_initialize (NautilusMozillaContentView *view)
gtk_widget_show (view->details->mozilla);
view->details->nautilus_view = nautilus_content_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",
......@@ -173,7 +172,7 @@ nautilus_mozilla_content_view_initialize (NautilusMozillaContentView *view)
* can merge menu & toolbar items into Nautilus's UI.
*/
gtk_signal_connect (GTK_OBJECT (nautilus_view_get_bonobo_control
(NAUTILUS_VIEW (view->details->nautilus_view))),
(view->details->nautilus_view)),
"activate",
mozilla_merge_bonobo_items_callback,
view);
......@@ -212,7 +211,7 @@ nautilus_mozilla_content_view_destroy (GtkObject *object)
* @view: NautilusMozillaContentView to get the nautilus_view from..
*
**/
NautilusContentView *
NautilusView *
nautilus_mozilla_content_view_get_nautilus_view (NautilusMozillaContentView *view)
{
return view->details->nautilus_view;
......@@ -278,8 +277,8 @@ mozilla_content_view_request_progress_change (NautilusMozillaContentView *view,
progress_request.type = progress_type;
progress_request.amount = progress_amount;
nautilus_view_request_progress_change (NAUTILUS_VIEW (view->details->nautilus_view),
&progress_request);
nautilus_view_request_progress_change (view->details->nautilus_view,
&progress_request);
}
static void
......@@ -301,8 +300,8 @@ mozilla_content_view_request_location_change (NautilusMozillaContentView *view,
navigation_request.requested_uri = hacked_uri;