Commit a72923da authored by Darin Adler's avatar Darin Adler

reviewed by: John Sullivan <sullivan@eazel.com>

	Add a new command-line option "--no-desktop" as requested by
	fcrozat on behalf of people who want to run Nautilus under KDE as
	well as under GNOME. The option has no effect if Nautilus is
	already running, but if it's the first invocation of Nautilus,
	then no desktop-related preferences show up and the desktop is
	not shown regardless of the setting of those preferences.

	* src/nautilus-main.c: (main): Add the no-desktop option. Make the
	desktop-related preferences invisible if it's on, and pass it down
	to the NautilusApplication.

	* src/nautilus-application.h:
	* src/nautilus-application.c: (nautilus_application_startup):
	Don't start the desktop if no_desktop is passed in. Otherwise
	decide based on the preference.

	* libnautilus-extensions/nautilus-preferences-box.c:
	(preferences_box_find_row): Mark this private function static.
	(preferences_box_populate_pane): Get rid of code that would
	translate the pane_name twice.
	(nautilus_preferences_dialog_new): Simplified this code a bit.

	* libnautilus-extensions/nautilus-preferences.h:
	* libnautilus-extensions/nautilus-preferences.c:
	(preferences_make_user_level_filtered_key),
	(nautilus_preferences_get_is_invisible),
	(nautilus_preferences_set_is_invisible),
	(preferences_key_make_for_getter),
	(nautilus_preferences_visible_in_current_user_level),
	(nautilus_preferences_is_visible): Added new flag to make a
	preference invisible.

	* src/nautilus-first-time-druid.h:
	* src/nautilus-first-time-druid.c: (set_up_gmc_transition_page),
	(nautilus_first_time_druid_show): Removed code that used to make
	the druid default based on the desktop preference.

	Fixed the Tinderbox.

	* libnautilus-extensions/nautilus-global-preferences.c:
	(default_default_folder_viewer_callback): Allow NULL because that
	happens during self-check.
parent dc5c20a6
2001-04-23 Darin Adler <darin@eazel.com>
reviewed by: John Sullivan <sullivan@eazel.com>
Add a new command-line option "--no-desktop" as requested by
fcrozat on behalf of people who want to run Nautilus under KDE as
well as under GNOME. The option has no effect if Nautilus is
already running, but if it's the first invocation of Nautilus,
then no desktop-related preferences show up and the desktop is
not shown regardless of the setting of those preferences.
* src/nautilus-main.c: (main): Add the no-desktop option. Make the
desktop-related preferences invisible if it's on, and pass it down
to the NautilusApplication.
* src/nautilus-application.h:
* src/nautilus-application.c: (nautilus_application_startup):
Don't start the desktop if no_desktop is passed in. Otherwise
decide based on the preference.
* libnautilus-extensions/nautilus-preferences-box.c:
(preferences_box_find_row): Mark this private function static.
(preferences_box_populate_pane): Get rid of code that would
translate the pane_name twice.
(nautilus_preferences_dialog_new): Simplified this code a bit.
* libnautilus-extensions/nautilus-preferences.h:
* libnautilus-extensions/nautilus-preferences.c:
(preferences_make_user_level_filtered_key),
(nautilus_preferences_get_is_invisible),
(nautilus_preferences_set_is_invisible),
(preferences_key_make_for_getter),
(nautilus_preferences_visible_in_current_user_level),
(nautilus_preferences_is_visible): Added new flag to make a
preference invisible.
* src/nautilus-first-time-druid.h:
* src/nautilus-first-time-druid.c: (set_up_gmc_transition_page),
(nautilus_first_time_druid_show): Removed code that used to make
the druid default based on the desktop preference.
Fixed the Tinderbox.
* libnautilus-extensions/nautilus-global-preferences.c:
(default_default_folder_viewer_callback): Allow NULL because that
happens during self-check.
2001-04-23 Andy Hertzfeld <andy@eazel.com>
* components/news/nautilus-news.c: (has_matching_uri),
......
......@@ -824,13 +824,15 @@ default_default_folder_viewer_callback (int user_level)
int result;
oaf_info = gnome_vfs_mime_get_default_component ("x-directory/normal");
g_return_val_if_fail (oaf_info != NULL, NAUTILUS_DEFAULT_FOLDER_VIEWER_ICON_VIEW);
result = get_default_folder_viewer_preference_from_iid (oaf_info->iid);
if (result == NAUTILUS_DEFAULT_FOLDER_VIEWER_OTHER) {
if (oaf_info == NULL) {
result = NAUTILUS_DEFAULT_FOLDER_VIEWER_ICON_VIEW;
} else {
result = get_default_folder_viewer_preference_from_iid (oaf_info->iid);
if (result == NAUTILUS_DEFAULT_FOLDER_VIEWER_OTHER) {
result = NAUTILUS_DEFAULT_FOLDER_VIEWER_ICON_VIEW;
}
CORBA_free (oaf_info);
}
CORBA_free (oaf_info);
return GINT_TO_POINTER (result);
}
......
......@@ -2,7 +2,7 @@
/* nautilus-prefs-box.h - Implementation for preferences box component.
Copyright (C) 1999, 2000 Eazel, Inc.
Copyright (C) 1999, 2000, 2001 Eazel, Inc.
The Gnome Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
......@@ -81,10 +81,9 @@ static void category_list_select_row_callback (GtkCList
gpointer user_data);
/* Convience functions */
int preferences_box_find_row (GtkCList *clist,
static int preferences_box_find_row (GtkCList *clist,
char *pane_name);
static void user_level_changed_callback (gpointer callback_data);
static void user_level_changed_callback (gpointer callback_data);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusPreferencesBox, nautilus_preferences_box, GTK_TYPE_HBOX)
......@@ -186,7 +185,7 @@ preferences_box_select_pane (NautilusPreferencesBox *preferences_box,
g_warning ("Pane '%s' could not be found.", pane_name);
}
int
static int
preferences_box_find_row (GtkCList *clist, char *pane_name)
{
int i;
......@@ -430,6 +429,7 @@ preferences_box_populate_pane (NautilusPreferencesBox *preferences_box,
NautilusPreferencesGroup *group;
NautilusPreferencesItem *item;
EelStringList *group_names;
const char *translated_group_name;
guint i;
g_return_if_fail (NAUTILUS_IS_PREFERENCES_BOX (preferences_box));
......@@ -437,18 +437,19 @@ preferences_box_populate_pane (NautilusPreferencesBox *preferences_box,
g_return_if_fail (items != NULL);
/* Create the pane if needed */
pane = preferences_box_find_pane (preferences_box, _(pane_name));
pane = preferences_box_find_pane (preferences_box, pane_name);
if (pane == NULL) {
pane = NAUTILUS_PREFERENCES_PANE (preferences_box_add_pane (preferences_box, _(pane_name)));
pane = NAUTILUS_PREFERENCES_PANE (preferences_box_add_pane (preferences_box, pane_name));
}
group_names = eel_string_list_new (TRUE);
for (i = 0; items[i].group_name != NULL; i++) {
if (!eel_string_list_contains (group_names, _(items[i].group_name))) {
eel_string_list_insert (group_names, _(items[i].group_name));
translated_group_name = _(items[i].group_name);
if (!eel_string_list_contains (group_names, translated_group_name)) {
eel_string_list_insert (group_names, translated_group_name);
nautilus_preferences_pane_add_group (pane,
_(items[i].group_name));
translated_group_name);
}
}
......@@ -457,12 +458,12 @@ preferences_box_populate_pane (NautilusPreferencesBox *preferences_box,
_(items[i].group_name)));
g_return_if_fail (NAUTILUS_IS_PREFERENCES_GROUP (group));
if (items[i].preference_description != NULL) {
nautilus_preferences_set_description (items[i].preference_name,
_(items[i].preference_description));
}
if (items[i].preference_name != NULL) {
if (items[i].preference_description != NULL) {
nautilus_preferences_set_description (items[i].preference_name,
_(items[i].preference_description));
}
item = NAUTILUS_PREFERENCES_ITEM (nautilus_preferences_group_add_item (group,
items[i].preference_name,
items[i].item_type,
......@@ -473,11 +474,9 @@ preferences_box_populate_pane (NautilusPreferencesBox *preferences_box,
nautilus_preferences_item_set_control_preference (item,
items[i].control_preference_name);
nautilus_preferences_item_set_control_action (item,
items[i].control_action);
items[i].control_action);
nautilus_preferences_pane_add_control_preference (pane,
items[i].control_preference_name);
}
/* Install exceptions to enum lists uniqueness rule */
......@@ -524,17 +523,14 @@ user_level_changed_callback (gpointer callback_data)
nautilus_preferences_box_update (NAUTILUS_PREFERENCES_BOX (callback_data));
}
static const gchar *stock_buttons[] = {
GNOME_STOCK_BUTTON_OK,
NULL
};
#define DEFAULT_BUTTON 0
GtkWidget *
nautilus_preferences_dialog_new (const char *title,
const NautilusPreferencesPaneDescription *panes)
{
static const char *stock_buttons[] = {
GNOME_STOCK_BUTTON_OK,
NULL
};
GtkWidget *dialog;
GtkWidget *preference_box;
GtkWidget *vbox;
......@@ -550,9 +546,9 @@ nautilus_preferences_dialog_new (const char *title,
TRUE, /* allow_grow */
FALSE); /* auto_shrink */
gtk_container_set_border_width (GTK_CONTAINER(dialog), 0);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 0);
gnome_dialog_set_default (GNOME_DIALOG(dialog), DEFAULT_BUTTON);
gnome_dialog_set_default (GNOME_DIALOG(dialog), 0);
eel_gtk_window_set_up_close_accelerator (GTK_WINDOW (dialog));
......
......@@ -65,6 +65,7 @@ typedef struct {
char *name;
char *description;
PreferenceType type;
gboolean invisible;
GList *callback_list;
gboolean callbacks_blocked;
GList *auto_storage_list;
......@@ -320,7 +321,7 @@ preferences_make_user_level_filtered_key (const char *name)
g_return_val_if_fail (name != NULL, NULL);
if (nautilus_preferences_is_visible (name)) {
if (nautilus_preferences_visible_in_current_user_level (name)) {
key = preferences_key_make (name);
} else {
key = preferences_key_make_for_default (name, nautilus_preferences_get_user_level ());
......@@ -388,6 +389,25 @@ nautilus_preferences_set_visible_user_level (const char *name,
g_free (visible_key);
}
gboolean
nautilus_preferences_get_is_invisible (const char *name)
{
g_return_val_if_fail (name != NULL, FALSE);
g_return_val_if_fail (preferences_is_initialized (), FALSE);
return preferences_global_table_lookup_or_insert (name)->invisible;
}
void
nautilus_preferences_set_is_invisible (const char *name,
gboolean is_invisible)
{
g_return_if_fail (name != NULL);
g_return_if_fail (preferences_is_initialized ());
preferences_global_table_lookup_or_insert (name)->invisible = is_invisible;
}
void
nautilus_preferences_set_boolean (const char *name,
gboolean boolean_value)
......@@ -412,7 +432,7 @@ preferences_key_make_for_getter (const char *name)
g_return_val_if_fail (name != NULL, NULL);
g_return_val_if_fail (preferences_is_initialized (), NULL);
if (preferences_preference_is_default (name) || !nautilus_preferences_is_visible (name)) {
if (preferences_preference_is_default (name) || !nautilus_preferences_visible_in_current_user_level (name)) {
key = preferences_key_make_for_default_getter (name, nautilus_preferences_get_user_level ());
} else {
key = preferences_make_user_level_filtered_key (name);
......@@ -1730,7 +1750,7 @@ nautilus_preferences_monitor_directory (const char *directory)
}
gboolean
nautilus_preferences_is_visible (const char *name)
nautilus_preferences_visible_in_current_user_level (const char *name)
{
int user_level;
int visible_user_level;
......@@ -1744,6 +1764,19 @@ nautilus_preferences_is_visible (const char *name)
return visible_user_level <= user_level;
}
gboolean
nautilus_preferences_is_visible (const char *name)
{
g_return_val_if_fail (name != NULL, FALSE);
g_return_val_if_fail (preferences_is_initialized (), FALSE);
if (!nautilus_preferences_visible_in_current_user_level (name)) {
return FALSE;
}
return !preferences_global_table_lookup_or_insert (name)->invisible;
}
static void
preferences_remove_user_level_notice (void)
{
......
......@@ -123,6 +123,9 @@ void nautilus_preferences_remove_auto_boolean (const char
int nautilus_preferences_get_visible_user_level (const char *name);
void nautilus_preferences_set_visible_user_level (const char *name,
int visible_user_level);
gboolean nautilus_preferences_get_is_invisible (const char *name);
void nautilus_preferences_set_is_invisible (const char *name,
gboolean invisible);
char * nautilus_preferences_get_description (const char *name);
void nautilus_preferences_set_description (const char *name,
const char *description);
......@@ -130,6 +133,7 @@ char * nautilus_preferences_get_enumeration_id (const char
void nautilus_preferences_set_enumeration_id (const char *name,
const char *enumeration_id);
gboolean nautilus_preferences_monitor_directory (const char *directory);
gboolean nautilus_preferences_visible_in_current_user_level (const char *name);
gboolean nautilus_preferences_is_visible (const char *name);
void nautilus_preferences_initialize (const char *storage_path);
......
......@@ -824,13 +824,15 @@ default_default_folder_viewer_callback (int user_level)
int result;
oaf_info = gnome_vfs_mime_get_default_component ("x-directory/normal");
g_return_val_if_fail (oaf_info != NULL, NAUTILUS_DEFAULT_FOLDER_VIEWER_ICON_VIEW);
result = get_default_folder_viewer_preference_from_iid (oaf_info->iid);
if (result == NAUTILUS_DEFAULT_FOLDER_VIEWER_OTHER) {
if (oaf_info == NULL) {
result = NAUTILUS_DEFAULT_FOLDER_VIEWER_ICON_VIEW;
} else {
result = get_default_folder_viewer_preference_from_iid (oaf_info->iid);
if (result == NAUTILUS_DEFAULT_FOLDER_VIEWER_OTHER) {
result = NAUTILUS_DEFAULT_FOLDER_VIEWER_ICON_VIEW;
}
CORBA_free (oaf_info);
}
CORBA_free (oaf_info);
return GINT_TO_POINTER (result);
}
......
......@@ -2,7 +2,7 @@
/* nautilus-prefs-box.h - Implementation for preferences box component.
Copyright (C) 1999, 2000 Eazel, Inc.
Copyright (C) 1999, 2000, 2001 Eazel, Inc.
The Gnome Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
......@@ -81,10 +81,9 @@ static void category_list_select_row_callback (GtkCList
gpointer user_data);
/* Convience functions */
int preferences_box_find_row (GtkCList *clist,
static int preferences_box_find_row (GtkCList *clist,
char *pane_name);
static void user_level_changed_callback (gpointer callback_data);
static void user_level_changed_callback (gpointer callback_data);
EEL_DEFINE_CLASS_BOILERPLATE (NautilusPreferencesBox, nautilus_preferences_box, GTK_TYPE_HBOX)
......@@ -186,7 +185,7 @@ preferences_box_select_pane (NautilusPreferencesBox *preferences_box,
g_warning ("Pane '%s' could not be found.", pane_name);
}
int
static int
preferences_box_find_row (GtkCList *clist, char *pane_name)
{
int i;
......@@ -430,6 +429,7 @@ preferences_box_populate_pane (NautilusPreferencesBox *preferences_box,
NautilusPreferencesGroup *group;
NautilusPreferencesItem *item;
EelStringList *group_names;
const char *translated_group_name;
guint i;
g_return_if_fail (NAUTILUS_IS_PREFERENCES_BOX (preferences_box));
......@@ -437,18 +437,19 @@ preferences_box_populate_pane (NautilusPreferencesBox *preferences_box,
g_return_if_fail (items != NULL);
/* Create the pane if needed */
pane = preferences_box_find_pane (preferences_box, _(pane_name));
pane = preferences_box_find_pane (preferences_box, pane_name);
if (pane == NULL) {
pane = NAUTILUS_PREFERENCES_PANE (preferences_box_add_pane (preferences_box, _(pane_name)));
pane = NAUTILUS_PREFERENCES_PANE (preferences_box_add_pane (preferences_box, pane_name));
}
group_names = eel_string_list_new (TRUE);
for (i = 0; items[i].group_name != NULL; i++) {
if (!eel_string_list_contains (group_names, _(items[i].group_name))) {
eel_string_list_insert (group_names, _(items[i].group_name));
translated_group_name = _(items[i].group_name);
if (!eel_string_list_contains (group_names, translated_group_name)) {
eel_string_list_insert (group_names, translated_group_name);
nautilus_preferences_pane_add_group (pane,
_(items[i].group_name));
translated_group_name);
}
}
......@@ -457,12 +458,12 @@ preferences_box_populate_pane (NautilusPreferencesBox *preferences_box,
_(items[i].group_name)));
g_return_if_fail (NAUTILUS_IS_PREFERENCES_GROUP (group));
if (items[i].preference_description != NULL) {
nautilus_preferences_set_description (items[i].preference_name,
_(items[i].preference_description));
}
if (items[i].preference_name != NULL) {
if (items[i].preference_description != NULL) {
nautilus_preferences_set_description (items[i].preference_name,
_(items[i].preference_description));
}
item = NAUTILUS_PREFERENCES_ITEM (nautilus_preferences_group_add_item (group,
items[i].preference_name,
items[i].item_type,
......@@ -473,11 +474,9 @@ preferences_box_populate_pane (NautilusPreferencesBox *preferences_box,
nautilus_preferences_item_set_control_preference (item,
items[i].control_preference_name);
nautilus_preferences_item_set_control_action (item,
items[i].control_action);
items[i].control_action);
nautilus_preferences_pane_add_control_preference (pane,
items[i].control_preference_name);
}
/* Install exceptions to enum lists uniqueness rule */
......@@ -524,17 +523,14 @@ user_level_changed_callback (gpointer callback_data)
nautilus_preferences_box_update (NAUTILUS_PREFERENCES_BOX (callback_data));
}
static const gchar *stock_buttons[] = {
GNOME_STOCK_BUTTON_OK,
NULL
};
#define DEFAULT_BUTTON 0
GtkWidget *
nautilus_preferences_dialog_new (const char *title,
const NautilusPreferencesPaneDescription *panes)
{
static const char *stock_buttons[] = {
GNOME_STOCK_BUTTON_OK,
NULL
};
GtkWidget *dialog;
GtkWidget *preference_box;
GtkWidget *vbox;
......@@ -550,9 +546,9 @@ nautilus_preferences_dialog_new (const char *title,
TRUE, /* allow_grow */
FALSE); /* auto_shrink */
gtk_container_set_border_width (GTK_CONTAINER(dialog), 0);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 0);
gnome_dialog_set_default (GNOME_DIALOG(dialog), DEFAULT_BUTTON);
gnome_dialog_set_default (GNOME_DIALOG(dialog), 0);
eel_gtk_window_set_up_close_accelerator (GTK_WINDOW (dialog));
......
......@@ -65,6 +65,7 @@ typedef struct {
char *name;
char *description;
PreferenceType type;
gboolean invisible;
GList *callback_list;
gboolean callbacks_blocked;
GList *auto_storage_list;
......@@ -320,7 +321,7 @@ preferences_make_user_level_filtered_key (const char *name)
g_return_val_if_fail (name != NULL, NULL);
if (nautilus_preferences_is_visible (name)) {
if (nautilus_preferences_visible_in_current_user_level (name)) {
key = preferences_key_make (name);
} else {
key = preferences_key_make_for_default (name, nautilus_preferences_get_user_level ());
......@@ -388,6 +389,25 @@ nautilus_preferences_set_visible_user_level (const char *name,
g_free (visible_key);
}
gboolean
nautilus_preferences_get_is_invisible (const char *name)
{
g_return_val_if_fail (name != NULL, FALSE);
g_return_val_if_fail (preferences_is_initialized (), FALSE);
return preferences_global_table_lookup_or_insert (name)->invisible;
}
void
nautilus_preferences_set_is_invisible (const char *name,
gboolean is_invisible)
{
g_return_if_fail (name != NULL);
g_return_if_fail (preferences_is_initialized ());
preferences_global_table_lookup_or_insert (name)->invisible = is_invisible;
}
void
nautilus_preferences_set_boolean (const char *name,
gboolean boolean_value)
......@@ -412,7 +432,7 @@ preferences_key_make_for_getter (const char *name)
g_return_val_if_fail (name != NULL, NULL);
g_return_val_if_fail (preferences_is_initialized (), NULL);
if (preferences_preference_is_default (name) || !nautilus_preferences_is_visible (name)) {
if (preferences_preference_is_default (name) || !nautilus_preferences_visible_in_current_user_level (name)) {
key = preferences_key_make_for_default_getter (name, nautilus_preferences_get_user_level ());
} else {
key = preferences_make_user_level_filtered_key (name);
......@@ -1730,7 +1750,7 @@ nautilus_preferences_monitor_directory (const char *directory)
}
gboolean
nautilus_preferences_is_visible (const char *name)
nautilus_preferences_visible_in_current_user_level (const char *name)
{
int user_level;
int visible_user_level;
......@@ -1744,6 +1764,19 @@ nautilus_preferences_is_visible (const char *name)
return visible_user_level <= user_level;
}
gboolean
nautilus_preferences_is_visible (const char *name)
{
g_return_val_if_fail (name != NULL, FALSE);
g_return_val_if_fail (preferences_is_initialized (), FALSE);
if (!nautilus_preferences_visible_in_current_user_level (name)) {
return FALSE;
}
return !preferences_global_table_lookup_or_insert (name)->invisible;
}
static void
preferences_remove_user_level_notice (void)
{
......
......@@ -123,6 +123,9 @@ void nautilus_preferences_remove_auto_boolean (const char
int nautilus_preferences_get_visible_user_level (const char *name);
void nautilus_preferences_set_visible_user_level (const char *name,
int visible_user_level);
gboolean nautilus_preferences_get_is_invisible (const char *name);
void nautilus_preferences_set_is_invisible (const char *name,
gboolean invisible);
char * nautilus_preferences_get_description (const char *name);
void nautilus_preferences_set_description (const char *name,
const char *description);
......@@ -130,6 +133,7 @@ char * nautilus_preferences_get_enumeration_id (const char
void nautilus_preferences_set_enumeration_id (const char *name,
const char *enumeration_id);
gboolean nautilus_preferences_monitor_directory (const char *directory);
gboolean nautilus_preferences_visible_in_current_user_level (const char *name);
gboolean nautilus_preferences_is_visible (const char *name);
void nautilus_preferences_initialize (const char *storage_path);
......
......@@ -338,8 +338,8 @@ void
nautilus_application_startup (NautilusApplication *application,
gboolean kill_shell,
gboolean restart_shell,
gboolean start_desktop,
gboolean no_default_window,
gboolean no_desktop,
gboolean do_first_time_druid_check,
const char *geometry,
const char *urls[])
......@@ -371,7 +371,7 @@ nautilus_application_startup (NautilusApplication *application,
/* Run the first time startup druid if needed. */
if (do_first_time_druid_check && need_to_show_first_time_druid ()) {
nautilus_first_time_druid_show (application, start_desktop, urls);
nautilus_first_time_druid_show (application, urls);
return;
}
......@@ -489,7 +489,7 @@ nautilus_application_startup (NautilusApplication *application,
} else if (restart_shell) {
Nautilus_Shell_restart (shell, &ev);
} else {
if (start_desktop) {
if (!no_desktop && nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_DESKTOP)) {
Nautilus_Shell_start_desktop (shell, &ev);
}
......
......@@ -57,8 +57,8 @@ NautilusApplication *nautilus_application_new (void);
void nautilus_application_startup (NautilusApplication *application,
gboolean kill_shell,
gboolean restart_shell,
gboolean start_desktop,
gboolean no_default_window,
gboolean no_desktop,
gboolean do_first_time_druid_check,
const char *default_geometry,
const char *urls[]);
......
......@@ -97,7 +97,6 @@ enum {
/* globals */
static NautilusApplication *save_application;
static gboolean save_manage_desktop;
static GtkWidget *start_page;
static GtkWidget *finish_page;
......@@ -292,7 +291,7 @@ set_up_background (NautilusDruidPageEazel *page, const char *background_color)
}
static void
update_draw_desktop_checkbox_state ()
update_draw_desktop_checkbox_state (void)
{
if (current_user_level == NAUTILUS_USER_LEVEL_NOVICE) {
gtk_widget_hide (draw_desktop_checkbox_widget);
......@@ -897,7 +896,7 @@ set_up_gmc_transition_page (NautilusDruidPageEazel *page)
GtkWidget *checkbox, *label;
GtkWidget *container, *main_box, *hbox;
draw_desktop = save_manage_desktop;
draw_desktop = TRUE;
add_to_session = TRUE;
transfer_gmc_icons = TRUE;
......@@ -1037,7 +1036,7 @@ update_finished_label (void)
}
GtkWidget *
nautilus_first_time_druid_show (NautilusApplication *application, gboolean manage_desktop, const char *urls[])
nautilus_first_time_druid_show (NautilusApplication *application, const char *urls[])
{
GtkWidget *dialog;