patches/gtk-vnc-02-ff3.6.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 17428 36708f49361a
child 22219 c3f6964387bd
child 22246 7e10c53aae92
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:
17428
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
     1
--- a/plugin/gtk-vnc-plugin.h	Mon Jan 25 16:33:36 2010
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
     2
+++ b/plugin/gtk-vnc-plugin.h	Mon Jan 25 16:26:54 2010
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
     3
@@ -44,6 +44,11 @@
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
     4
 #define MIME_TYPES_HANDLED  "application/x-gtk-vnc:gtk-vnc:VNC viewer"
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
     5
 #define PLUGIN_DESCRIPTION  "VNC (remote desktop) viewer plugin"
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
     6
 
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
     7
+#define uint16 uint16_t
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
     8
+#define int16 int16_t
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
     9
+#define uint32 uint32_t
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    10
+#define int32 int32_t
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    11
+
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    12
 typedef struct {
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    13
   uint16 mode;
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    14
   NPWindow *window;
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    15
--- a/plugin/npshell.c	Mon Jan 25 16:24:38 2010
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    16
+++ b/plugin/npshell.c	Mon Jan 25 16:30:51 2010
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    17
@@ -81,8 +81,13 @@
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    18
 #include <string.h>
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    19
 
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    20
 #include <npapi.h>
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    21
-#include <npupp.h>
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    22
 
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    23
+#include <nspr.h>
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    24
+#define uint16 uint16_t
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    25
+#define int16 int16_t
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    26
+#define uint32 uint32_t
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    27
+#define int32 int32_t
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    28
+
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    29
 #include "gtk-vnc-plugin.h"
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    30
 
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    31
 /***********************************************************************
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    32
--- a/plugin/npunix.c	Mon Jan 25 16:24:31 2010
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    33
+++ b/plugin/npunix.c	Mon Jan 25 16:30:58 2010
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    34
@@ -55,8 +55,13 @@
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    35
 
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    36
 #include <stdio.h>
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    37
 #include <npapi.h>
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    38
-#include <npupp.h>
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    39
 
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    40
+#include <npfunctions.h>
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    41
+#define uint16 uint16_t
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    42
+#define int16 int16_t
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    43
+#define uint32 uint32_t
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    44
+#define int32 int32_t
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    45
+
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    46
 #include <glib.h>               /* just for G_GNUC_UNUSED */
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    47
 
36708f49361a 2010-01-25 Ginn Chen <[email protected]>
ginnchen
parents:
diff changeset
    48
 /*