Commit 3ad55ff4 authored by Michael Meeks's avatar Michael Meeks Committed by Michael Meeks

move re-enterant CORBA stuff (fm_icon_view_init): to here.

2002-02-04  Michael Meeks  <michael@ximian.com>

	* src/file-manager/fm-icon-view.c
	(fm_icon_view_class_init): move re-enterant CORBA stuff
	(fm_icon_view_init): to here.

	* src/nautilus-shell-ui.xml: add a default placeholder.

	* configure.in (BONOBO_UI_REQUIRED): require a fixed
	libbonoboui that can cope with default placeholders.
parent 942deb4a
2002-02-04 Michael Meeks <michael@ximian.com>
* src/file-manager/fm-icon-view.c
(fm_icon_view_class_init): move re-enterant CORBA stuff
(fm_icon_view_init): to here.
* src/nautilus-shell-ui.xml: add a default placeholder.
* configure.in (BONOBO_UI_REQUIRED): require a fixed
libbonoboui that can cope with default placeholders.
2002-02-04 Darin Adler <darin@bentspoon.com>
* src/nautilus-shell-ui.xml: Put a placeholder in so that component
......
......@@ -4,8 +4,8 @@ dnl ===========================================================================
ART_REQUIRED=2.3.6
BONOBO_ACTIVATION_REQUIRED=0.9.3
BONOBO_REQUIRED=1.108
BONOBO_UI_REQUIRED=1.108.1
BONOBO_REQUIRED=1.110
BONOBO_UI_REQUIRED=1.110.2
EEL_REQUIRED=1.1.3
ESOUND_REQUIRED=0.2.23
GLIB_REQUIRED=1.3.10
......
......@@ -2739,14 +2739,12 @@ fm_icon_view_class_init (FMIconViewClass *klass)
klass->set_directory_sort_by = fm_icon_view_real_set_directory_sort_by;
klass->set_directory_sort_reversed = fm_icon_view_real_set_directory_sort_reversed;
klass->set_directory_tighter_layout = fm_icon_view_real_set_directory_tighter_layout;
eel_preferences_add_auto_integer (NAUTILUS_PREFERENCES_PREVIEW_SOUND,
&preview_sound_auto_value);
}
static void
fm_icon_view_init (FMIconView *icon_view)
{
static gboolean setup_sound_preview = FALSE;
NautilusIconContainer *icon_container;
g_return_if_fail (GTK_BIN (icon_view)->child == NULL);
......@@ -2756,6 +2754,12 @@ fm_icon_view_init (FMIconView *icon_view)
create_icon_container (icon_view);
if (!setup_sound_preview) {
eel_preferences_add_auto_integer (NAUTILUS_PREFERENCES_PREVIEW_SOUND,
&preview_sound_auto_value);
setup_sound_preview = TRUE;
}
eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_ICON_VIEW_FONT,
font_changed_callback,
icon_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