Commit 814058c1 authored by Pavel Cisler's avatar Pavel Cisler Committed by Pavel Cisler
Browse files

Convert a bunch of illegal mime types "special/*" to legal equivalents.

2000-06-15  Pavel Cisler  <pavel@eazel.com>

	* components/hardware/nautilus-hardware-view.c:
	* components/html/ntl-web-browser.oafinfo:
	* components/mozilla/nautilus-mozilla-content-view.oafinfo:
	* components/music/nautilus-music-view.c:
	* components/music/nautilus-music-view.oafinfo:
	* components/rpmview/nautilus-rpm-view.c:
	* components/shell/shell.oafinfo:
	* libnautilus-extensions/nautilus-drag.c:
	(nautilus_drag_build_selection_list):
	* libnautilus-extensions/nautilus-drag.h:
	* libnautilus-extensions/nautilus-file.c:
	(nautilus_file_get_type_as_string):
	* src/nautilus-sidebar.c:
	* src/nautilus.oafinfo:
	Convert a bunch of illegal mime types "special/*" to
	legal equivalents.
parent b074345f
2000-06-15 Pavel Cisler <pavel@eazel.com>
* components/hardware/nautilus-hardware-view.c:
* components/html/ntl-web-browser.oafinfo:
* components/mozilla/nautilus-mozilla-content-view.oafinfo:
* components/music/nautilus-music-view.c:
* components/music/nautilus-music-view.oafinfo:
* components/rpmview/nautilus-rpm-view.c:
* components/shell/shell.oafinfo:
* libnautilus-extensions/nautilus-drag.c:
(nautilus_drag_build_selection_list):
* libnautilus-extensions/nautilus-drag.h:
* libnautilus-extensions/nautilus-file.c:
(nautilus_file_get_type_as_string):
* src/nautilus-sidebar.c:
* src/nautilus.oafinfo:
Convert a bunch of illegal mime types "special/*" to
legal equivalents.
2000-06-15 Robin * Slomkowski <rslomkow@eazel.com>
 
* nautilus.spec.in: added a requirment for ORbit 0.5.1
......
......@@ -67,7 +67,7 @@ enum {
static GtkTargetEntry hardware_dnd_target_table[] = {
{ "text/uri-list", 0, TARGET_URI_LIST },
{ "application/x-color", 0, TARGET_COLOR },
{ "special/x-gnome-icon-list", 0, TARGET_GNOME_URI_LIST }
{ "x-special/gnome-icon-list", 0, TARGET_GNOME_URI_LIST }
};
static void nautilus_hardware_view_drag_data_received (GtkWidget *widget,
......
......@@ -20,7 +20,7 @@
<oaf_attribute name="bonobo:editable" type="boolean" value="false"/>
<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
<item value="text/html"/>
<item value="special/webdav-directory"/>
<item value="x-special/webdav-directory"/>
</oaf_attribute>
<oaf_attribute name="nautilus:view_as_name" type="string" value="Web Page"/>
</oaf_server>
......
......@@ -23,7 +23,7 @@
</oaf_attribute>
<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
<item value="text/html"/>
<item value="special/webdav-directory"/>
<item value="x-special/webdav-directory"/>
</oaf_attribute>
<oaf_attribute name="nautilus:view_as_name" type="string" value="Web Page (Mozilla)"/>
......
......@@ -23,7 +23,7 @@
</oaf_attribute>
<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
<item value="text/html"/>
<item value="special/webdav-directory"/>
<item value="x-special/webdav-directory"/>
</oaf_attribute>
<oaf_attribute name="nautilus:view_as_name" type="string" value="Web Page (Mozilla)"/>
......
......@@ -23,7 +23,7 @@
</oaf_attribute>
<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
<item value="text/html"/>
<item value="special/webdav-directory"/>
<item value="x-special/webdav-directory"/>
</oaf_attribute>
<oaf_attribute name="nautilus:view_as_name" type="string" value="Web Page (Mozilla)"/>
......
......@@ -18,8 +18,8 @@
<oaf_attribute name="name" type="string" value="Music view"/>
<oaf_attribute name="description" type="string" value="Music view"/>
<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
<item value="special/directory"/>
<item value="special/webdav-directory"/>
<item value="x-special/directory"/>
<item value="x-special/webdav-directory"/>
</oaf_attribute>
<oaf_attribute name="nautilus:required_directory_content_mime_types" type="stringv">
<item value="audio/x-mpeg"/>
......
......@@ -18,8 +18,8 @@
<oaf_attribute name="name" type="string" value="Music view"/>
<oaf_attribute name="description" type="string" value="Music view"/>
<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
<item value="special/directory"/>
<item value="special/webdav-directory"/>
<item value="x-special/directory"/>
<item value="x-special/webdav-directory"/>
</oaf_attribute>
<oaf_attribute name="nautilus:required_directory_content_mime_types" type="stringv">
<item value="audio/x-mpeg"/>
......
......@@ -18,8 +18,8 @@
<oaf_attribute name="name" type="string" value="Music view"/>
<oaf_attribute name="description" type="string" value="Music view"/>
<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
<item value="special/directory"/>
<item value="special/webdav-directory"/>
<item value="x-special/directory"/>
<item value="x-special/webdav-directory"/>
</oaf_attribute>
<oaf_attribute name="nautilus:required_directory_content_mime_types" type="stringv">
<item value="audio/x-mpeg"/>
......
......@@ -138,7 +138,7 @@ static GtkTargetEntry music_dnd_target_table[] = {
{ "text/uri-list", 0, TARGET_URI_LIST },
{ "application/x-color", 0, TARGET_COLOR },
{ "property/bgimage", 0, TARGET_BGIMAGE },
{ "special/x-gnome-icon-list", 0, TARGET_GNOME_URI_LIST }
{ "x-special/gnome-icon-list", 0, TARGET_GNOME_URI_LIST }
};
#define DEFAULT_BACKGROUND_COLOR "rgb:DDDD/DDDD/BBBB"
......
......@@ -18,8 +18,8 @@
<oaf_attribute name="name" type="string" value="Music view"/>
<oaf_attribute name="description" type="string" value="Music view"/>
<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
<item value="special/directory"/>
<item value="special/webdav-directory"/>
<item value="x-special/directory"/>
<item value="x-special/webdav-directory"/>
</oaf_attribute>
<oaf_attribute name="nautilus:required_directory_content_mime_types" type="stringv">
<item value="audio/x-mpeg"/>
......
......@@ -93,7 +93,7 @@ enum {
static GtkTargetEntry rpm_dnd_target_table[] = {
{ "text/uri-list", 0, TARGET_URI_LIST },
{ "application/x-color", 0, TARGET_COLOR },
{ "special/x-gnome-icon-list", 0, TARGET_GNOME_URI_LIST }
{ "x-special/gnome-icon-list", 0, TARGET_GNOME_URI_LIST }
};
/*
......
......@@ -18,7 +18,7 @@
<oaf_attribute name="name" type="string" value="Martin-Demo-Hack"/>
<oaf_attribute name="description" type="string" value="Martin-Demo-Hack"/>
<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
<item value="special/directory"/>
<item value="x-special/directory"/>
</oaf_attribute>
<oaf_attribute name="nautilus:view_as_name" type="string" value="Shell"/>
</oaf_server>
......
......@@ -18,7 +18,7 @@
<oaf_attribute name="name" type="string" value="Martin-Demo-Hack"/>
<oaf_attribute name="description" type="string" value="Martin-Demo-Hack"/>
<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
<item value="special/directory"/>
<item value="x-special/directory"/>
</oaf_attribute>
<oaf_attribute name="nautilus:view_as_name" type="string" value="Shell"/>
</oaf_server>
......
......@@ -18,7 +18,7 @@
<oaf_attribute name="name" type="string" value="Martin-Demo-Hack"/>
<oaf_attribute name="description" type="string" value="Martin-Demo-Hack"/>
<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
<item value="special/directory"/>
<item value="x-special/directory"/>
</oaf_attribute>
<oaf_attribute name="nautilus:view_as_name" type="string" value="Shell"/>
</oaf_server>
......
......@@ -128,7 +128,7 @@ nautilus_drag_build_selection_list (GtkSelectionData *data)
if (*p == '\n' || *p == '\0') {
result = g_list_prepend (result, item);
if (p == 0) {
g_warning ("Invalid special/x-gnome-icon-list data received: "
g_warning ("Invalid x-special/gnome-icon-list data received: "
"missing newline character.");
break;
} else {
......@@ -146,7 +146,7 @@ nautilus_drag_build_selection_list (GtkSelectionData *data)
&item->icon_x, &item->icon_y,
&item->icon_width, &item->icon_height) == 4;
if (!item->got_icon_position) {
g_warning ("Invalid special/x-gnome-icon-list data received: "
g_warning ("Invalid x-special/gnome-icon-list data received: "
"invalid icon position specification.");
}
......@@ -154,7 +154,7 @@ nautilus_drag_build_selection_list (GtkSelectionData *data)
p = memchr (p, '\r', size);
if (p == NULL || p[1] != '\n') {
g_warning ("Invalid special/x-gnome-icon-list data received: "
g_warning ("Invalid x-special/gnome-icon-list data received: "
"missing newline character.");
if (p == NULL) {
break;
......@@ -243,7 +243,7 @@ nautilus_drag_can_accept_items (NautilusFile *drop_target_item,
}
/* Encode a "special/x-gnome-icon-list" selection.
/* Encode a "x-special/gnome-icon-list" selection.
Along with the URIs of the dragged files, this encodes
the location and size of each icon relative to the cursor.
*/
......
......@@ -70,7 +70,7 @@ typedef struct {
/* Drag & Drop target names. */
#define NAUTILUS_ICON_DND_GNOME_ICON_LIST_TYPE "special/x-gnome-icon-list"
#define NAUTILUS_ICON_DND_GNOME_ICON_LIST_TYPE "x-special/gnome-icon-list"
#define NAUTILUS_ICON_DND_URI_LIST_TYPE "text/uri-list"
#define NAUTILUS_ICON_DND_URL_TYPE "_NETSCAPE_URL"
#define NAUTILUS_ICON_DND_COLOR_TYPE "application/x-color"
......
......@@ -1738,8 +1738,8 @@ nautilus_file_get_type_as_string (NautilusFile *file)
/* We want to update nautilus/data/nautilus.keys to include
* English (& localizable) versions of every mime type anyone ever sees.
*/
if (strcmp (mime_type, "special/directory") == 0) {
g_warning ("Can't find description even for \"special/directory\". This "
if (strcasecmp (mime_type, "x-special/directory") == 0) {
g_warning ("Can't find description even for \"x-special/directory\". This "
"probably means that your gnome-vfs.keys file is in the wrong place "
"or isn't being found for some other reason.");
......
......@@ -128,7 +128,7 @@ nautilus_drag_build_selection_list (GtkSelectionData *data)
if (*p == '\n' || *p == '\0') {
result = g_list_prepend (result, item);
if (p == 0) {
g_warning ("Invalid special/x-gnome-icon-list data received: "
g_warning ("Invalid x-special/gnome-icon-list data received: "
"missing newline character.");
break;
} else {
......@@ -146,7 +146,7 @@ nautilus_drag_build_selection_list (GtkSelectionData *data)
&item->icon_x, &item->icon_y,
&item->icon_width, &item->icon_height) == 4;
if (!item->got_icon_position) {
g_warning ("Invalid special/x-gnome-icon-list data received: "
g_warning ("Invalid x-special/gnome-icon-list data received: "
"invalid icon position specification.");
}
......@@ -154,7 +154,7 @@ nautilus_drag_build_selection_list (GtkSelectionData *data)
p = memchr (p, '\r', size);
if (p == NULL || p[1] != '\n') {
g_warning ("Invalid special/x-gnome-icon-list data received: "
g_warning ("Invalid x-special/gnome-icon-list data received: "
"missing newline character.");
if (p == NULL) {
break;
......@@ -243,7 +243,7 @@ nautilus_drag_can_accept_items (NautilusFile *drop_target_item,
}
/* Encode a "special/x-gnome-icon-list" selection.
/* Encode a "x-special/gnome-icon-list" selection.
Along with the URIs of the dragged files, this encodes
the location and size of each icon relative to the cursor.
*/
......
......@@ -70,7 +70,7 @@ typedef struct {
/* Drag & Drop target names. */
#define NAUTILUS_ICON_DND_GNOME_ICON_LIST_TYPE "special/x-gnome-icon-list"
#define NAUTILUS_ICON_DND_GNOME_ICON_LIST_TYPE "x-special/gnome-icon-list"
#define NAUTILUS_ICON_DND_URI_LIST_TYPE "text/uri-list"
#define NAUTILUS_ICON_DND_URL_TYPE "_NETSCAPE_URL"
#define NAUTILUS_ICON_DND_COLOR_TYPE "application/x-color"
......
Supports Markdown
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