gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-11-05 16:04:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

try to debug some mozilla-related pbs. add debugging output. NULL freed'

Browse source 
2000-09-26  Mathieu Lacage  <mathieu@eazel.com>

	try to debug some mozilla-related pbs.
	* src/nautilus-view-frame-corba.c:
	(impl_Nautilus_ViewFrame_open_location),
	(impl_Nautilus_ViewFrame_open_location_in_new_window),
	(impl_Nautilus_ViewFrame_open_in_new_window_and_select),
	(impl_Nautilus_ViewFrame_report_location_change),
	(impl_Nautilus_ViewFrame_report_selection_change),
	(impl_Nautilus_ViewFrame_report_status),
	(impl_Nautilus_ViewFrame_report_load_underway),
	(impl_Nautilus_ViewFrame_report_load_progress),
	(impl_Nautilus_ViewFrame_report_load_complete),
	(impl_Nautilus_ViewFrame_report_load_failed),
	(impl_Nautilus_ViewFrame_set_title):
	add debugging output.
	* src/nautilus-view-frame.c: (nautilus_view_frame_destroy_client),
	(nautilus_view_frame_destroy), (nautilus_view_frame_load_client):
	NULL freed' fields.
	* src/nautilus-window.c: (nautilus_window_real_set_content_view):
	idem.
This commit is contained in:
Mathieu Lacage 2000-09-26 18:43:22 +00:00 committed by Mathieu Lacage
parent 8ae60adc4f
commit 96a067583d
7 changed files with 74 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ChangeLog
View file

@ -1,3 +1,25 @@
2000-09-26 Mathieu Lacage <mathieu@eazel.com>
try to debug some mozilla-related pbs.
* src/nautilus-view-frame-corba.c:
(impl_Nautilus_ViewFrame_open_location),
(impl_Nautilus_ViewFrame_open_location_in_new_window),
(impl_Nautilus_ViewFrame_open_in_new_window_and_select),
(impl_Nautilus_ViewFrame_report_location_change),
(impl_Nautilus_ViewFrame_report_selection_change),
(impl_Nautilus_ViewFrame_report_status),
(impl_Nautilus_ViewFrame_report_load_underway),
(impl_Nautilus_ViewFrame_report_load_progress),
(impl_Nautilus_ViewFrame_report_load_complete),
(impl_Nautilus_ViewFrame_report_load_failed),
(impl_Nautilus_ViewFrame_set_title):
add debugging output.
* src/nautilus-view-frame.c: (nautilus_view_frame_destroy_client),
(nautilus_view_frame_destroy), (nautilus_view_frame_load_client):
NULL freed' fields.
* src/nautilus-window.c: (nautilus_window_real_set_content_view):
idem.
2000-09-26 John Sullivan <sullivan@eazel.com>
Fixed bug 382 (Deleting file viewed in other window leaves

1
src/nautilus-navigation-window.c
View file

@ -1544,6 +1544,7 @@ nautilus_window_real_set_content_view (NautilusWindow *window, NautilusViewFrame
if (window->content_view != NULL) {
gtk_container_remove (GTK_CONTAINER (window->content_hbox),
GTK_WIDGET (window->content_view));
window->content_view = NULL;
}
/* Here's an explicit check for a problem that happens all too often. */

1
src/nautilus-object-window.c
View file

@ -1544,6 +1544,7 @@ nautilus_window_real_set_content_view (NautilusWindow *window, NautilusViewFrame
if (window->content_view != NULL) {
gtk_container_remove (GTK_CONTAINER (window->content_hbox),
GTK_WIDGET (window->content_view));
window->content_view = NULL;
}
/* Here's an explicit check for a problem that happens all too often. */

1
src/nautilus-spatial-window.c
View file

@ -1544,6 +1544,7 @@ nautilus_window_real_set_content_view (NautilusWindow *window, NautilusViewFrame
if (window->content_view != NULL) {
gtk_container_remove (GTK_CONTAINER (window->content_hbox),
GTK_WIDGET (window->content_view));
window->content_view = NULL;
}
/* Here's an explicit check for a problem that happens all too often. */

42
src/nautilus-view-frame-corba.c
View file

@ -27,6 +27,8 @@
/* nautilus-view-frame-corba.c: CORBA server implementation of the object
representing a data view frame. */
#define DEBUG_MATHIEU 1
#include <config.h>
#include "nautilus-view-frame-private.h"
@ -136,6 +138,9 @@ impl_Nautilus_ViewFrame_open_location (PortableServer_Servant servant,
Nautilus_URI location,
CORBA_Environment *ev)
{
#if DEBUG_MATHIEU
g_print ("open location \n");
#endif /* DEBUG_MATHIEU */
nautilus_view_frame_open_location
(((impl_POA_Nautilus_ViewFrame *) servant)->view, location);
}
@ -145,6 +150,9 @@ impl_Nautilus_ViewFrame_open_location_in_new_window (PortableServer_Servant serv
Nautilus_URI location,
CORBA_Environment *ev)
{
#if DEBUG_MATHIEU
g_print ("open location in new window\n");
#endif /* DEBUG_MATHIEU */
nautilus_view_frame_open_location_in_new_window
(((impl_POA_Nautilus_ViewFrame *) servant)->view, location);
}
@ -156,7 +164,9 @@ impl_Nautilus_ViewFrame_open_in_new_window_and_select (PortableServer_Servant se
CORBA_Environment *ev)
{
GList *selection_as_g_list;
#if DEBUG_MATHIEU
g_print ("open location in new window and select\n");
#endif /* DEBUG_MATHIEU */
selection_as_g_list = nautilus_shallow_g_list_from_uri_list (selection);
nautilus_view_frame_open_in_new_window_and_select
(((impl_POA_Nautilus_ViewFrame *) servant)->view, location, selection_as_g_list);
@ -168,6 +178,9 @@ impl_Nautilus_ViewFrame_report_location_change (PortableServer_Servant servant,
Nautilus_URI location,
CORBA_Environment *ev)
{
#if DEBUG_MATHIEU
g_print ("report location change \n");
#endif /* DEBUG_MATHIEU */
nautilus_view_frame_report_location_change
(((impl_POA_Nautilus_ViewFrame *) servant)->view, location);
}
@ -178,6 +191,9 @@ impl_Nautilus_ViewFrame_report_selection_change (PortableServer_Servant servant,
CORBA_Environment *ev)
{
GList *selection_as_g_list;
#if DEBUG_MATHIEU
g_print ("selection change \n");
#endif /* DEBUG_MATHIEU */
selection_as_g_list = nautilus_shallow_g_list_from_uri_list (selection);
nautilus_view_frame_report_selection_change
@ -190,6 +206,10 @@ impl_Nautilus_ViewFrame_report_status (PortableServer_Servant servant,
const CORBA_char *status,
CORBA_Environment *ev)
{
#if DEBUG_MATHIEU
g_print ("report status \n");
#endif /* DEBUG_MATHIEU */
nautilus_view_frame_report_status
(((impl_POA_Nautilus_ViewFrame *) servant)->view, status);
}
@ -198,6 +218,10 @@ static void
impl_Nautilus_ViewFrame_report_load_underway (PortableServer_Servant servant,
CORBA_Environment *ev)
{
#if DEBUG_MATHIEU
g_print ("report load underway \n");
#endif /* DEBUG_MATHIEU */
nautilus_view_frame_report_load_underway
(((impl_POA_Nautilus_ViewFrame *) servant)->view);
}
@ -207,6 +231,10 @@ impl_Nautilus_ViewFrame_report_load_progress (PortableServer_Servant servant,
CORBA_float fraction_done,
CORBA_Environment *ev)
{
#if DEBUG_MATHIEU
g_print ("report load progress \n");
#endif /* DEBUG_MATHIEU */
nautilus_view_frame_report_load_progress
(((impl_POA_Nautilus_ViewFrame *) servant)->view, fraction_done);
}
@ -215,6 +243,10 @@ static void
impl_Nautilus_ViewFrame_report_load_complete (PortableServer_Servant servant,
CORBA_Environment *ev)
{
#if DEBUG_MATHIEU
g_print ("report load complete \n");
#endif /* DEBUG_MATHIEU */
nautilus_view_frame_report_load_complete
(((impl_POA_Nautilus_ViewFrame *) servant)->view);
}
@ -223,6 +255,10 @@ static void
impl_Nautilus_ViewFrame_report_load_failed (PortableServer_Servant servant,
CORBA_Environment *ev)
{
#if DEBUG_MATHIEU
g_print ("report load failed \n");
#endif /* DEBUG_MATHIEU */
nautilus_view_frame_report_load_failed
(((impl_POA_Nautilus_ViewFrame *) servant)->view);
}
@ -232,6 +268,10 @@ impl_Nautilus_ViewFrame_set_title (PortableServer_Servant servant,
const CORBA_char *title,
CORBA_Environment *ev)
{
#if DEBUG_MATHIEU
g_print ("set title \n");
#endif /* DEBUG_MATHIEU */
nautilus_view_frame_set_title
(((impl_POA_Nautilus_ViewFrame *) servant)->view, title);
}

8
src/nautilus-view-frame.c
View file

@ -250,7 +250,11 @@ nautilus_view_frame_destroy_client (NautilusViewFrame *view)
bonobo_object_unref (view->view_frame);
view->view_frame = NULL;
/* we can NULL those since we just unref'ed them
with the aggregate view frame. */
view->history_frame = CORBA_OBJECT_NIL;
view->zoomable_frame = CORBA_OBJECT_NIL;
CORBA_exception_free (&ev);
if (view->details->check_if_view_is_gone_timeout_id != 0) {
@ -271,6 +275,7 @@ nautilus_view_frame_destroy (GtkObject *object)
g_free (frame->details->title);
g_free (frame->details->label);
g_free (frame->details);
frame->details = NULL;
NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object));
}
@ -534,6 +539,7 @@ nautilus_view_frame_load_client (NautilusViewFrame *view, const char *iid)
bonobo_object_release_unref (control, NULL);
view->iid = g_strdup (iid);
g_print ("IID: %s, view frame: %p\n", view->iid, view);
gtk_signal_connect_while_alive
(GTK_OBJECT (view->client_object), "destroy",

1
src/nautilus-window.c
View file

@ -1544,6 +1544,7 @@ nautilus_window_real_set_content_view (NautilusWindow *window, NautilusViewFrame
if (window->content_view != NULL) {
gtk_container_remove (GTK_CONTAINER (window->content_hbox),
GTK_WIDGET (window->content_view));
window->content_view = NULL;
}
/* Here's an explicit check for a problem that happens all too often. */