diff options
| author | Alexander Larsson <alexl@redhat.com> | 2004-01-06 16:10:54 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2004-01-06 16:10:54 +0000 |
| commit | 4dc86e45cb8df02bbcbb50ad11dc09442a5c83d8 (patch) | |
| tree | 64cc960a1fd7d85b102949b3a0b69a8a84942f6f | |
| parent | c1757d480e1637acf71f2d2fd09a48014ed9ae0b (diff) | |
| download | nautilus-4dc86e45cb8df02bbcbb50ad11dc09442a5c83d8.tar.gz | |
Turn on home icon on desktop by default
2004-01-06 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/apps_nautilus_preferences.schemas.in:
Turn on home icon on desktop by default
* libnautilus-private/nautilus-icon-dnd.c:
* src/nautilus-property-browser.c:
Handle new svg mime type
* src/nautilus-navigation-window-ui.xml:
* src/nautilus-spatial-window-ui.xml:
Don't use computer icon for templates
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | libnautilus-private/apps_nautilus_preferences.schemas.in | 2 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-icon-dnd.c | 1 | ||||
| -rw-r--r-- | src/nautilus-navigation-window-ui.xml | 1 | ||||
| -rw-r--r-- | src/nautilus-property-browser.c | 3 | ||||
| -rw-r--r-- | src/nautilus-spatial-window-ui.xml | 1 |
6 files changed, 17 insertions, 4 deletions
@@ -1,5 +1,18 @@ 2004-01-06 Alexander Larsson <alexl@redhat.com> + * libnautilus-private/apps_nautilus_preferences.schemas.in: + Turn on home icon on desktop by default + + * libnautilus-private/nautilus-icon-dnd.c: + * src/nautilus-property-browser.c: + Handle new svg mime type + + * src/nautilus-navigation-window-ui.xml: + * src/nautilus-spatial-window-ui.xml: + Don't use computer icon for templates + +2004-01-06 Alexander Larsson <alexl@redhat.com> + * src/file-manager/fm-directory-view.[ch]: Add get_item_count virtual method. Add item count and free space to status bar diff --git a/libnautilus-private/apps_nautilus_preferences.schemas.in b/libnautilus-private/apps_nautilus_preferences.schemas.in index 254914457..3671bc39b 100644 --- a/libnautilus-private/apps_nautilus_preferences.schemas.in +++ b/libnautilus-private/apps_nautilus_preferences.schemas.in @@ -722,7 +722,7 @@ <applyto>/apps/nautilus/desktop/home_icon_visible</applyto> <owner>nautilus</owner> <type>bool</type> - <default>false</default> + <default>true</default> <locale name="C"> <short>Home icon visible on desktop</short> <long> diff --git a/libnautilus-private/nautilus-icon-dnd.c b/libnautilus-private/nautilus-icon-dnd.c index 0d4cffd81..ccccaf87c 100644 --- a/libnautilus-private/nautilus-icon-dnd.c +++ b/libnautilus-private/nautilus-icon-dnd.c @@ -961,6 +961,7 @@ selection_is_image_file (GList *selection_list) mime_type = gnome_vfs_get_mime_type (selected_item->uri); result = (g_ascii_strcasecmp (mime_type, "image/svg") != 0 && + g_ascii_strcasecmp (mime_type, "image/svg+xml") != 0 && eel_istr_has_prefix (mime_type, "image/")); g_free (mime_type); diff --git a/src/nautilus-navigation-window-ui.xml b/src/nautilus-navigation-window-ui.xml index ab3ce0565..71f5ecf01 100644 --- a/src/nautilus-navigation-window-ui.xml +++ b/src/nautilus-navigation-window-ui.xml @@ -84,7 +84,6 @@ <menuitem name="Go to Templates" _label="_Templates" _tip="Go to templates folder" - pixtype="stock" pixname="gnome-fs-client" verb="Go to Templates"/> <menuitem name="Go to Trash" _label="_Trash" diff --git a/src/nautilus-property-browser.c b/src/nautilus-property-browser.c index 6aa1c957b..81cf4fcb0 100644 --- a/src/nautilus-property-browser.c +++ b/src/nautilus-property-browser.c @@ -678,7 +678,8 @@ ensure_uri_is_image (const char *uri) GNOME_VFS_FILE_INFO_GET_MIME_TYPE | GNOME_VFS_FILE_INFO_FOLLOW_LINKS); is_image = eel_istr_has_prefix (file_info->mime_type, "image/") - && eel_strcasecmp (file_info->mime_type, "image/svg") != 0; + && eel_strcasecmp (file_info->mime_type, "image/svg") != 0 + && eel_strcasecmp (file_info->mime_type, "image/svg+xml") != 0; gnome_vfs_file_info_unref (file_info); return is_image; } diff --git a/src/nautilus-spatial-window-ui.xml b/src/nautilus-spatial-window-ui.xml index e789e918d..686ebd269 100644 --- a/src/nautilus-spatial-window-ui.xml +++ b/src/nautilus-spatial-window-ui.xml @@ -47,7 +47,6 @@ <menuitem name="Go to Templates" _label="_Templates" _tip="Go to templates folder" - pixtype="stock" pixname="gnome-fs-client" verb="Go to Templates"/> <menuitem name="Go to Trash" _label="_Trash" |