14845
|
1 |
Index: trunk/server/vino-input.c
|
|
2 |
===================================================================
|
|
3 |
--- trunk/server/vino-input.c (revision 1041)
|
|
4 |
+++ trunk/server/vino-input.c (working copy)
|
|
5 |
@@ -1134,7 +1134,6 @@
|
14677
|
6 |
VinoServer *server)
|
|
7 |
{
|
|
8 |
GtkClipboard *cb;
|
|
9 |
- gsize a, b;
|
|
10 |
GtkTargetEntry targets[] = {
|
|
11 |
{"UTF8_STRING", 0, 0},
|
|
12 |
{"COMPOUND_TEXT", 0, 0},
|
14845
|
13 |
@@ -1146,7 +1145,7 @@
|
14677
|
14 |
return;
|
|
15 |
|
|
16 |
g_free (cb_str);
|
|
17 |
- cb_str = g_convert (text, len, "utf-8", "iso8859-1", &a, &b, NULL);
|
|
18 |
+ cb_str = g_strdup (text);
|
|
19 |
if (cb_str)
|
|
20 |
{
|
|
21 |
cb = gtk_clipboard_get_for_display (gdk_screen_get_display (screen),
|
14845
|
22 |
Index: trunk/server/vino-server.c
|
|
23 |
===================================================================
|
|
24 |
--- trunk/server/vino-server.c (revision 1041)
|
|
25 |
+++ trunk/server/vino-server.c (working copy)
|
|
26 |
@@ -889,8 +889,7 @@
|
14677
|
27 |
GdkEvent *event,
|
|
28 |
VinoServer *server)
|
|
29 |
{
|
|
30 |
- gchar *text, *out;
|
|
31 |
- size_t a, b;
|
|
32 |
+ gchar *text;
|
|
33 |
|
14845
|
34 |
if (!server->priv->clients)
|
14677
|
35 |
return;
|
14845
|
36 |
@@ -905,14 +904,9 @@
|
14677
|
37 |
if (!text)
|
|
38 |
return;
|
|
39 |
|
|
40 |
- out = g_convert (text, -1, "iso8859-1", "utf-8", &a, &b, NULL);
|
|
41 |
- if (out)
|
|
42 |
- {
|
|
43 |
- rfbSendServerCutText (server->priv->rfb_screen,
|
|
44 |
- out,
|
|
45 |
- strlen (out));
|
|
46 |
- g_free (out);
|
|
47 |
- }
|
|
48 |
+ rfbSendServerCutText (server->priv->rfb_screen,
|
|
49 |
+ text,
|
|
50 |
+ strlen (text));
|
|
51 |
|
|
52 |
g_free (text);
|
14845
|
53 |
}
|