Fix a bug where text copied from Mozilla or Galeon could not be pasted

into The GtkHTML editor (e.g. into Evolution's mail composer).

Approved by:	portmgr (lioux)
This commit is contained in:
Joe Marcus Clarke 2002-12-24 17:59:15 +00:00
parent e075458eec
commit 5beaf51b8b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=71836
6 changed files with 114 additions and 3 deletions

View file

@ -7,7 +7,7 @@
PORTNAME= gtkhtml
PORTVERSION= 1.1.6
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1

View file

@ -0,0 +1,37 @@
--- src/gtkhtml.c.orig Tue Nov 5 15:56:58 2002
+++ src/gtkhtml.c Tue Dec 17 12:29:33 2002
@@ -1653,9 +1653,9 @@
be = swap ? be : !be;
if (be)
- return "ucs2-be";
+ return "ucs-2be";
else
- return "ucs2-le";
+ return "ucs-2le";
}
@@ -1733,7 +1733,7 @@
html_object_save (selection_object, state);
d_s (g_warning ("text/html buffer = %s", buffer->str);)
- selection_string = e_utf8_to_charset_string_sized ("ucs2", buffer->str, buffer->len);
+ selection_string = e_utf8_to_charset_string_sized ("ucs-2", buffer->str, buffer->len);
if (selection_string)
gtk_selection_data_set (selection_data,
@@ -1897,11 +1897,11 @@
len -= 2;
break;
default:
- tocode = "ucs2";
+ tocode = ucs2_order(1);
break;
}
- utf8 = e_utf8_from_charset_string_sized ("ucs2",
+ utf8 = e_utf8_from_charset_string_sized (tocode,
data,
len);

View file

@ -7,7 +7,7 @@
PORTNAME= gtkhtml
PORTVERSION= 1.1.6
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1

View file

@ -0,0 +1,37 @@
--- src/gtkhtml.c.orig Tue Nov 5 15:56:58 2002
+++ src/gtkhtml.c Tue Dec 17 12:29:33 2002
@@ -1653,9 +1653,9 @@
be = swap ? be : !be;
if (be)
- return "ucs2-be";
+ return "ucs-2be";
else
- return "ucs2-le";
+ return "ucs-2le";
}
@@ -1733,7 +1733,7 @@
html_object_save (selection_object, state);
d_s (g_warning ("text/html buffer = %s", buffer->str);)
- selection_string = e_utf8_to_charset_string_sized ("ucs2", buffer->str, buffer->len);
+ selection_string = e_utf8_to_charset_string_sized ("ucs-2", buffer->str, buffer->len);
if (selection_string)
gtk_selection_data_set (selection_data,
@@ -1897,11 +1897,11 @@
len -= 2;
break;
default:
- tocode = "ucs2";
+ tocode = ucs2_order(1);
break;
}
- utf8 = e_utf8_from_charset_string_sized ("ucs2",
+ utf8 = e_utf8_from_charset_string_sized (tocode,
data,
len);

View file

@ -7,7 +7,7 @@
PORTNAME= gtkhtml
PORTVERSION= 1.1.6
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1

View file

@ -0,0 +1,37 @@
--- src/gtkhtml.c.orig Tue Nov 5 15:56:58 2002
+++ src/gtkhtml.c Tue Dec 17 12:29:33 2002
@@ -1653,9 +1653,9 @@
be = swap ? be : !be;
if (be)
- return "ucs2-be";
+ return "ucs-2be";
else
- return "ucs2-le";
+ return "ucs-2le";
}
@@ -1733,7 +1733,7 @@
html_object_save (selection_object, state);
d_s (g_warning ("text/html buffer = %s", buffer->str);)
- selection_string = e_utf8_to_charset_string_sized ("ucs2", buffer->str, buffer->len);
+ selection_string = e_utf8_to_charset_string_sized ("ucs-2", buffer->str, buffer->len);
if (selection_string)
gtk_selection_data_set (selection_data,
@@ -1897,11 +1897,11 @@
len -= 2;
break;
default:
- tocode = "ucs2";
+ tocode = ucs2_order(1);
break;
}
- utf8 = e_utf8_from_charset_string_sized ("ucs2",
+ utf8 = e_utf8_from_charset_string_sized (tocode,
data,
len);