~ubuntu-branches/ubuntu/oneiric/tuxguitar/oneiric

« back to all changes in this revision

Viewing changes to misc/swt-3.3-gtk-linux-x86.patch

  • Committer: Bazaar Package Importer
  • Author(s): Philippe Coval
  • Date: 2008-06-19 00:30:30 UTC
  • mto: (5.1.2 sid)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20080619003030-h719szrhsngou7c6
Tags: upstream-1.0
ImportĀ upstreamĀ versionĀ 1.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
diff -Naur src-orig/org/eclipse/swt/internal/gtk/OS.java src-updated/org/eclipse/swt/internal/gtk/OS.java
 
2
--- src-orig/org/eclipse/swt/internal/gtk/OS.java       2007-05-31 18:04:38.000000000 -0300
 
3
+++ src-updated/org/eclipse/swt/internal/gtk/OS.java    2007-10-12 15:13:09.000000000 -0300
 
4
@@ -6145,6 +6145,15 @@
 
5
                lock.unlock();
 
6
        }
 
7
 }
 
8
+public static final native int _gtk_paper_size_free(int paper_size);
 
9
+public static final int gtk_paper_size_free(int paper_size) {
 
10
+       lock.lock();
 
11
+       try {
 
12
+               return _gtk_paper_size_free(paper_size);
 
13
+       } finally {
 
14
+               lock.unlock();
 
15
+       }
 
16
+}
 
17
 public static final native int /*long*/ _gtk_paper_size_get_name(int /*long*/ size);
 
18
 public static final int /*long*/ gtk_paper_size_get_name(int /*long*/ size) {
 
19
        lock.lock();
 
20
diff -Naur src-orig/org/eclipse/swt/printing/Printer.java src-updated/org/eclipse/swt/printing/Printer.java
 
21
--- src-orig/org/eclipse/swt/printing/Printer.java      2007-05-31 18:04:28.000000000 -0300
 
22
+++ src-updated/org/eclipse/swt/printing/Printer.java   2007-10-12 15:14:23.000000000 -0300
 
23
@@ -691,7 +691,7 @@
 
24
                        paper_size = OS.gtk_paper_size_new(name);
 
25
                }
 
26
                OS.gtk_page_setup_set_paper_size(pageSetup, paper_size);
 
27
-               OS.g_free(paper_size);
 
28
+               OS.gtk_paper_size_free(paper_size);
 
29
        }
 
30
        
 
31
        /* Set values of settings from PrinterData. */
 
32
diff -Naur src-orig/os.c src-updated/os.c
 
33
--- src-orig/os.c       2007-04-26 14:03:00.000000000 -0300
 
34
+++ src-updated/os.c    2007-10-12 14:57:59.000000000 -0300
 
35
@@ -10321,6 +10321,16 @@
 
36
 }
 
37
 #endif
 
38
 
 
39
+#ifndef NO__1gtk_1paper_1size_1free
 
40
+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1paper_1size_1free)
 
41
+       (JNIEnv *env, jclass that, jint arg0)
 
42
+{
 
43
+       OS_NATIVE_ENTER(env, that, _1gtk_1paper_1size_1free_FUNC);
 
44
+       gtk_paper_size_free( (GtkPaperSize *)arg0 );
 
45
+       OS_NATIVE_EXIT(env, that, _1gtk_1paper_1size_1free_FUNC);
 
46
+}
 
47
+#endif
 
48
+
 
49
 #ifndef NO__1gtk_1plug_1get_1id
 
50
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1plug_1get_1id)
 
51
        (JNIEnv *env, jclass that, jint arg0)
 
52
diff -Naur src-orig/os_custom.h src-updated/os_custom.h
 
53
--- src-orig/os_custom.h        2007-05-31 18:04:22.000000000 -0300
 
54
+++ src-updated/os_custom.h     2007-10-12 14:27:50.000000000 -0300
 
55
@@ -133,6 +133,7 @@
 
56
 #define gtk_paper_size_new_LIB "libgtk-x11-2.0.so.0"
 
57
 #define gtk_paper_size_new_custom_LIB "libgtk-x11-2.0.so.0"
 
58
 #define gtk_paper_size_new_from_ppd_LIB "libgtk-x11-2.0.so.0"
 
59
+#define gtk_paper_size_free_LIB "libgtk-x11-2.0.so.0"
 
60
 #define gtk_print_job_get_printer_LIB "libgtk-x11-2.0.so.0"
 
61
 #define gtk_print_job_get_settings_LIB "libgtk-x11-2.0.so.0"
 
62
 #define gtk_print_job_get_status_LIB "libgtk-x11-2.0.so.0"
 
63
diff -Naur src-orig/os_stats.c src-updated/os_stats.c
 
64
--- src-orig/os_stats.c 2007-04-26 14:03:00.000000000 -0300
 
65
+++ src-updated/os_stats.c      2007-10-12 14:22:08.000000000 -0300
 
66
@@ -725,6 +725,7 @@
 
67
        "_1gtk_1paper_1size_1new",
 
68
        "_1gtk_1paper_1size_1new_1custom",
 
69
        "_1gtk_1paper_1size_1new_1from_1ppd",
 
70
+       "_1gtk_1paper_1size_1free",
 
71
        "_1gtk_1plug_1get_1id",
 
72
        "_1gtk_1plug_1new",
 
73
        "_1gtk_1print_1job_1get_1printer",
 
74
diff -Naur src-orig/os_stats.h src-updated/os_stats.h
 
75
--- src-orig/os_stats.h 2007-04-26 14:03:00.000000000 -0300
 
76
+++ src-updated/os_stats.h      2007-10-12 14:20:47.000000000 -0300
 
77
@@ -733,6 +733,7 @@
 
78
        _1gtk_1paper_1size_1new_FUNC,
 
79
        _1gtk_1paper_1size_1new_1custom_FUNC,
 
80
        _1gtk_1paper_1size_1new_1from_1ppd_FUNC,
 
81
+       _1gtk_1paper_1size_1free_FUNC,
 
82
        _1gtk_1plug_1get_1id_FUNC,
 
83
        _1gtk_1plug_1new_FUNC,
 
84
        _1gtk_1print_1job_1get_1printer_FUNC,