Commit b2ab30a8 authored by Alexander Larsson's avatar Alexander Larsson Committed by Alexander Larsson
Browse files

Remove extra comma in enum. Fixes bug #142351 Patch from Christian

2004-08-16  Alexander Larsson  <alexl@redhat.com>

	* libnautilus-extension/nautilus-extension-types.h:
	Remove extra comma in enum. Fixes bug #142351
	Patch from Christian Neumair.

	* libnautilus-private/apps_nautilus_preferences.schemas.in:
	Add computer_icon_name schema entry. Fixes bug #144728.
	Patch from Christian Neumair.

	Remove add_to_session schema entry.

	* src/nautilus-application.c: (update_session), (init_session):
	* libnautilus-private/nautilus-global-preferences.c:
	* libnautilus-private/nautilus-global-preferences.h:
	Remove add_to_session preference. Fixes bug #91543
	Patch from Havoc Pennington

	* nautilus.desktop.in:
	Rename file browser entry. Fixes bug #131272.
	Patch from Michael Terry.

	* src/file-manager/fm-directory-view.c:
	(warn_mismatched_mime_types):
	Don't show (null) for mimetypes with no description.
	Fixes bug #141509.
	Patch from Christian Neumair.

	* src/file-manager/fm-properties-window.c:
	(create_properties_window):
	Allow properties dialog to be resized.
	Fixed bug #147918
	Patch from Christian Neumair.

	* src/nautilus-window-menus.c:
	(help_menu_nautilus_manual_callback):
	Fix help link. Fixes bug #143927
	Patch from Kaushal Kumar
parent 26158b55
2004-08-16 Alexander Larsson <alexl@redhat.com>
* libnautilus-extension/nautilus-extension-types.h:
Remove extra comma in enum. Fixes bug #142351
Patch from Christian Neumair.
* libnautilus-private/apps_nautilus_preferences.schemas.in:
Add computer_icon_name schema entry. Fixes bug #144728.
Patch from Christian Neumair.
Remove add_to_session schema entry.
* src/nautilus-application.c: (update_session), (init_session):
* libnautilus-private/nautilus-global-preferences.c:
* libnautilus-private/nautilus-global-preferences.h:
Remove add_to_session preference. Fixes bug #91543
Patch from Havoc Pennington
* nautilus.desktop.in:
Rename file browser entry. Fixes bug #131272.
Patch from Michael Terry.
* src/file-manager/fm-directory-view.c:
(warn_mismatched_mime_types):
Don't show (null) for mimetypes with no description.
Fixes bug #141509.
Patch from Christian Neumair.
* src/file-manager/fm-properties-window.c:
(create_properties_window):
Allow properties dialog to be resized.
Fixed bug #147918
Patch from Christian Neumair.
* src/nautilus-window-menus.c:
(help_menu_nautilus_manual_callback):
Fix help link. Fixes bug #143927
Patch from Kaushal Kumar
2004-08-16 Alexander Larsson <alexl@redhat.com>
* src/nautilus-connect-server-dialog.c:
......
......@@ -52,7 +52,7 @@ typedef enum {
* If this is returned, the extension must set the handle
* parameter and call the callback closure when the
* operation is complete. */
NAUTILUS_OPERATION_IN_PROGRESS,
NAUTILUS_OPERATION_IN_PROGRESS
} NautilusOperationResult;
GType nautilus_operation_result_get_type (void);
......
......@@ -761,22 +761,6 @@
</locale>
</schema>
<schema>
<key>/schemas/apps/nautilus/preferences/add_to_session</key>
<applyto>/apps/nautilus/preferences/add_to_session</applyto>
<owner>nautilus</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Add Nautilus to session</short>
<long>
If this is set to true, Nautilus adds itself to the session
when it starts up. This means it will be started the next
time you log in.
</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/nautilus/desktop/home_icon_visible</key>
<applyto>/apps/nautilus/desktop/home_icon_visible</applyto>
......@@ -837,6 +821,20 @@
</locale>
</schema>
<schema>
<key>/schemas/apps/nautilus/desktop/computer_icon_name</key>
<applyto>/apps/nautilus/desktop/computer_icon_name</applyto>
<owner>nautilus</owner>
<type>string</type>
<locale name="C">
<short>Desktop computer icon name</short>
<long>
This name can be set if you want a custom name
for the computer icon on the desktop.
</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/nautilus/desktop/home_icon_name</key>
<applyto>/apps/nautilus/desktop/home_icon_name</applyto>
......
......@@ -513,12 +513,6 @@ static const PreferenceDefault preference_defaults[] = {
default_trash_link_name, g_free,
},
/* non-visible preferences */
{ NAUTILUS_PREFERENCES_ADD_TO_SESSION,
PREFERENCE_BOOLEAN,
GINT_TO_POINTER (TRUE)
},
{ NULL }
};
......
......@@ -176,9 +176,6 @@ typedef enum
NAUTILUS_SIMPLE_SEARCH_BAR
} NautilusSearchBarMode;
/* Gnome session management */
#define NAUTILUS_PREFERENCES_ADD_TO_SESSION "preferences/add_to_session"
#define NAUTILUS_PREFERENCES_DESKTOP_HOME_VISIBLE "desktop/home_icon_visible"
#define NAUTILUS_PREFERENCES_DESKTOP_HOME_NAME "desktop/home_icon_name"
#define NAUTILUS_PREFERENCES_DESKTOP_COMPUTER_VISIBLE "desktop/computer_icon_visible"
......
[Desktop Entry]
Encoding=UTF-8
_Name=Browse Filesystem
_Name=File Browser
_Comment=Browse the filesystem with the file manager
TryExec=nautilus
Exec=nautilus --no-desktop --browser
......
......@@ -4104,9 +4104,6 @@ warn_mismatched_mime_types (FMDirectoryView *view,
guessed_description = gnome_vfs_mime_get_description (guessed_mime_type);
real_description = gnome_vfs_mime_get_description (mime_type);
g_free (guessed_mime_type);
g_free (mime_type);
name = nautilus_file_get_name (file);
primary = g_strdup_printf (_("Cannot open %s"), name);
......@@ -4121,10 +4118,13 @@ warn_mismatched_mime_types (FMDirectoryView *view,
"Alternatively, use the Open With menu to choose a specific application "
"for the file. "),
name,
guessed_description,
real_description,
real_description);
guessed_description ? guessed_description : guessed_mime_type,
real_description ? real_description : mime_type,
real_description ? real_description : mime_type);
g_free (guessed_mime_type);
g_free (mime_type);
dialog = eel_alert_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view))),
0,
GTK_MESSAGE_ERROR,
......
......@@ -3308,7 +3308,6 @@ create_properties_window (StartupData *startup_data)
window->details->target_files = nautilus_file_list_copy (startup_data->target_files);
gtk_window_set_wmclass (GTK_WINDOW (window), "file_properties", "Nautilus");
gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
gtk_window_set_screen (GTK_WINDOW (window),
gtk_widget_get_screen (startup_data->parent_widget));
......
......@@ -1211,12 +1211,11 @@ static void
update_session (gpointer callback_data)
{
set_session_restart (callback_data,
eel_preferences_get_boolean (NAUTILUS_PREFERENCES_ADD_TO_SESSION)
/* Only ever add ourselves to the session
* if we have a desktop window. Prevents the
* session thrashing that's seen otherwise
*/
&& nautilus_application_desktop_windows != NULL);
nautilus_application_desktop_windows != NULL);
}
static void
......@@ -1232,10 +1231,6 @@ init_session (void)
g_signal_connect (client, "die",
G_CALLBACK (removed_from_session), NULL);
eel_preferences_add_callback
(NAUTILUS_PREFERENCES_ADD_TO_SESSION,
update_session, client);
update_session (client);
}
......
......@@ -617,7 +617,7 @@ help_menu_nautilus_manual_callback (BonoboUIComponent *component,
"gnome-help", &error);
} else {
gnome_help_display_desktop_on_screen (
NULL, "user-guide", "user-guide.xml", "gosnautilus-21",
NULL, "user-guide", "user-guide.xml", "gosnautilus-1",
gtk_window_get_screen (GTK_WINDOW (window)), &error);
}
......
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