Commit a74d095f authored by Darin Adler's avatar Darin Adler

Update for 1.1.3 release. Bump version.

	* NEWS: Update for 1.1.3 release.
	* configure.in: Bump version.

	* src/file-manager/fm-directory-view.c:
	(fm_directory_view_finalize), (real_merge_menus):
	Use a weak pointer so we don't retain a pointer to the UI component
	if the BonoboControl goes away, but we don't. This doesn't really
	fix anything, but it also does no harm.
parent 499a149b
2002-01-29 Darin Adler <darin@bentspoon.com>
* NEWS: Update for 1.1.3 release.
* configure.in: Bump version.
* src/file-manager/fm-directory-view.c:
(fm_directory_view_finalize), (real_merge_menus):
Use a weak pointer so we don't retain a pointer to the UI component
if the BonoboControl goes away, but we don't. This doesn't really
fix anything, but it also does no harm.
2002-01-28 Seth Nickell <snickell@stanford.edu> 2002-01-28 Seth Nickell <snickell@stanford.edu>
* data/applications.desktop.in: * data/applications.desktop.in:
......
This is nautilus 1.1.2, a tiny build fix for nautilus This is nautilus 1.1.3, an interim version in the process of
1.1.1, the first release in the process of porting nautilus porting nautilus from the Gnome 1 platform to the Gnome 2 platform.
from the Gnome 1 platform to the Gnome 2 platform.
A later release will document the changes since Gnome 1.
The port is still underway, and many aspects of the program The port is still underway, and many aspects of the program
are quite rough. Please send feedback to the Nautilus are quite rough. Please send feedback to the Nautilus
......
...@@ -26,7 +26,7 @@ AC_SUBST(XML_REQUIRED) ...@@ -26,7 +26,7 @@ AC_SUBST(XML_REQUIRED)
dnl =========================================================================== dnl ===========================================================================
AM_INIT_AUTOMAKE(nautilus, 1.1.2) AM_INIT_AUTOMAKE(nautilus, 1.1.3)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AM_SANITY_CHECK AM_SANITY_CHECK
......
...@@ -1369,6 +1369,11 @@ fm_directory_view_finalize (GObject *object) ...@@ -1369,6 +1369,11 @@ fm_directory_view_finalize (GObject *object)
g_hash_table_destroy (view->details->non_ready_files); g_hash_table_destroy (view->details->non_ready_files);
if (view->details->ui != NULL) {
g_object_remove_weak_pointer (G_OBJECT (view->details->ui),
(gpointer *) &view->details->ui);
}
g_free (view->details); g_free (view->details);
EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object)); EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
...@@ -4148,13 +4153,12 @@ real_merge_menus (FMDirectoryView *view) ...@@ -4148,13 +4153,12 @@ real_merge_menus (FMDirectoryView *view)
BONOBO_UI_VERB_END BONOBO_UI_VERB_END
}; };
/* This BonoboUIComponent is made automatically, and its lifetime is
* controlled automatically. We don't need to explicitly ref or unref it.
*/
view->details->ui = nautilus_view_set_up_ui (view->details->nautilus_view, view->details->ui = nautilus_view_set_up_ui (view->details->nautilus_view,
DATADIR, DATADIR,
"nautilus-directory-view-ui.xml", "nautilus-directory-view-ui.xml",
"nautilus"); "nautilus");
g_object_add_weak_pointer (G_OBJECT (view->details->ui),
(gpointer *) &view->details->ui);
bonobo_ui_component_add_verb_list_with_data (view->details->ui, verbs, view); bonobo_ui_component_add_verb_list_with_data (view->details->ui, verbs, view);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment