patches/vino-02-cp-utf8.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 14845 2a4157c32e79
child 22313 24230eb18550
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
14845
2a4157c32e79 2009-01-06 Halton Huo <[email protected]>
halton
parents: 14677
diff changeset
     1
Index: trunk/server/vino-input.c
2a4157c32e79 2009-01-06 Halton Huo <[email protected]>
halton
parents: 14677
diff changeset
     2
===================================================================
2a4157c32e79 2009-01-06 Halton Huo <[email protected]>
halton
parents: 14677
diff changeset
     3
--- trunk/server/vino-input.c	(revision 1041)
2a4157c32e79 2009-01-06 Halton Huo <[email protected]>
halton
parents: 14677
diff changeset
     4
+++ trunk/server/vino-input.c	(working copy)
2a4157c32e79 2009-01-06 Halton Huo <[email protected]>
halton
parents: 14677
diff changeset
     5
@@ -1134,7 +1134,6 @@
14677
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
     6
 				   VinoServer *server)
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
     7
 {
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
     8
   GtkClipboard *cb;
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
     9
-  gsize a, b;
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    10
   GtkTargetEntry targets[] = {
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    11
 				{"UTF8_STRING", 0, 0},
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    12
 				{"COMPOUND_TEXT", 0, 0},
14845
2a4157c32e79 2009-01-06 Halton Huo <[email protected]>
halton
parents: 14677
diff changeset
    13
@@ -1146,7 +1145,7 @@
14677
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    14
     return;
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    15
 
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    16
   g_free (cb_str);
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    17
-  cb_str = g_convert (text, len, "utf-8", "iso8859-1", &a, &b, NULL);
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    18
+  cb_str = g_strdup (text);
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    19
   if (cb_str)
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    20
     {
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    21
       cb = gtk_clipboard_get_for_display (gdk_screen_get_display (screen),
14845
2a4157c32e79 2009-01-06 Halton Huo <[email protected]>
halton
parents: 14677
diff changeset
    22
Index: trunk/server/vino-server.c
2a4157c32e79 2009-01-06 Halton Huo <[email protected]>
halton
parents: 14677
diff changeset
    23
===================================================================
2a4157c32e79 2009-01-06 Halton Huo <[email protected]>
halton
parents: 14677
diff changeset
    24
--- trunk/server/vino-server.c	(revision 1041)
2a4157c32e79 2009-01-06 Halton Huo <[email protected]>
halton
parents: 14677
diff changeset
    25
+++ trunk/server/vino-server.c	(working copy)
2a4157c32e79 2009-01-06 Halton Huo <[email protected]>
halton
parents: 14677
diff changeset
    26
@@ -889,8 +889,7 @@
14677
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    27
                           GdkEvent     *event,
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    28
                           VinoServer   *server)
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    29
 {
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    30
-  gchar *text, *out;
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    31
-  size_t a, b;
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    32
+  gchar *text;
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    33
 
14845
2a4157c32e79 2009-01-06 Halton Huo <[email protected]>
halton
parents: 14677
diff changeset
    34
   if (!server->priv->clients)
14677
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    35
     return;
14845
2a4157c32e79 2009-01-06 Halton Huo <[email protected]>
halton
parents: 14677
diff changeset
    36
@@ -905,14 +904,9 @@
14677
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    37
   if (!text)
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    38
     return;
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    39
 
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    40
-  out = g_convert (text, -1, "iso8859-1", "utf-8", &a, &b, NULL);
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    41
-  if (out)
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    42
-    {
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    43
-      rfbSendServerCutText (server->priv->rfb_screen,
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    44
-                            out,
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    45
-                            strlen (out));
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    46
-      g_free (out);
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    47
-    }
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    48
+  rfbSendServerCutText (server->priv->rfb_screen,
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    49
+                        text,
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    50
+                        strlen (text));
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    51
 
62651f354cec 2008-11-28 Takao Fujiwara <[email protected]>
fujiwara
parents:
diff changeset
    52
   g_free (text);
14845
2a4157c32e79 2009-01-06 Halton Huo <[email protected]>
halton
parents: 14677
diff changeset
    53
 }