15596N/AIndex: trunk/server/vino-input.c

15596N/A===================================================================

15596N/A--- trunk/server/vino-input.c (revision 1041)

15596N/A+++ trunk/server/vino-input.c (working copy)

15596N/A@@ -1134,7 +1134,6 @@

15428N/A VinoServer *server)

15428N/A {

15428N/A GtkClipboard *cb;

15428N/A- gsize a, b;

15428N/A GtkTargetEntry targets[] = {

15428N/A {"UTF8_STRING", 0, 0},

15428N/A {"COMPOUND_TEXT", 0, 0},

15596N/A@@ -1146,7 +1145,7 @@

15428N/A return;

15428N/A

15428N/A g_free (cb_str);

15428N/A- cb_str = g_convert (text, len, "utf-8", "iso8859-1", &a, &b, NULL);

15428N/A+ cb_str = g_strdup (text);

15428N/A if (cb_str)

15428N/A {

15428N/A cb = gtk_clipboard_get_for_display (gdk_screen_get_display (screen),

15596N/AIndex: trunk/server/vino-server.c

15596N/A===================================================================

15596N/A--- trunk/server/vino-server.c (revision 1041)

15596N/A+++ trunk/server/vino-server.c (working copy)

15596N/A@@ -889,8 +889,7 @@

15428N/A GdkEvent *event,

15428N/A VinoServer *server)

15428N/A {

15428N/A- gchar *text, *out;

15428N/A- size_t a, b;

15428N/A+ gchar *text;

15428N/A

15596N/A if (!server->priv->clients)

15428N/A return;

15596N/A@@ -905,14 +904,9 @@

15428N/A if (!text)

15428N/A return;

15428N/A

15428N/A- out = g_convert (text, -1, "iso8859-1", "utf-8", &a, &b, NULL);

15428N/A- if (out)

15428N/A- {

15428N/A- rfbSendServerCutText (server->priv->rfb_screen,

15428N/A- out,

15428N/A- strlen (out));

15428N/A- g_free (out);

15428N/A- }

15428N/A+ rfbSendServerCutText (server->priv->rfb_screen,

15428N/A+ text,

15428N/A+ strlen (text));

15428N/A

15428N/A g_free (text);

15596N/A }