← Back to branch summary

~ubuntu-branches/ubuntu/natty/gtkhtml3.14/natty

« back to all changes in this revision

Viewing changes to debian/patches/01_use_gtk_widget_is_toplevel.patch

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2010-01-25 16:47:41 UTC
  • mfrom: (1.6.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20100125164741-0yjpj0hijgo8a8k2
Tags: 1:3.29.6.is.3.28.2-0ubuntu1
* Revert upload as incompatible with evolution 2.28
* drop << in debian/libgtkhtml3.14-19.shlibs and
  debian/libgtkhtml3.14-19.shlibs
* take debian/patches/01_use_gtk_widget_is_toplevel.patch from
  upstream to build with gtk > 2.18

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01_use_gtk_widget_is_toplevel.patch
 
1
diff -Nur -x '*.orig' -x '*~' gtkhtml3.14-3.28.2/components/editor/gtkhtml-color-combo.c gtkhtml3.14-3.28.2.new/components/editor/gtkhtml-color-combo.c
 
2
--- gtkhtml3.14-3.28.2/components/editor/gtkhtml-color-combo.c  2009-11-28 21:26:10.000000000 +0100
 
3
+++ gtkhtml3.14-3.28.2.new/components/editor/gtkhtml-color-combo.c      2010-01-25 16:39:36.168424642 +0100
 
4
@@ -276,7 +276,7 @@
 
5
                GTK_COLOR_SELECTION_DIALOG (dialog));
 
6
        toplevel = gtk_widget_get_toplevel (GTK_WIDGET (combo));
 
7
 
 
8
-       if (GTK_WIDGET_TOPLEVEL (toplevel))
 
9
+       if (gtk_widget_is_toplevel (toplevel))
 
10
                gtk_window_set_transient_for (
 
11
                        GTK_WINDOW (dialog), GTK_WINDOW (toplevel));
 
12
 
 
13
@@ -895,7 +895,7 @@
 
14
        gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 
15
        gtk_window_set_type_hint (
 
16
                GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_COMBO);
 
17
-       if (GTK_WIDGET_TOPLEVEL (toplevel)) {
 
18
+       if (gtk_widget_is_toplevel (toplevel)) {
 
19
                gtk_window_group_add_window (
 
20
                        gtk_window_get_group (GTK_WINDOW (toplevel)),
 
21
                        GTK_WINDOW (window));
 
22
diff -Nur -x '*.orig' -x '*~' gtkhtml3.14-3.28.2/components/editor/gtkhtml-face-tool-button.c gtkhtml3.14-3.28.2.new/components/editor/gtkhtml-face-tool-button.c
 
23
--- gtkhtml3.14-3.28.2/components/editor/gtkhtml-face-tool-button.c     2009-11-28 21:26:10.000000000 +0100
 
24
+++ gtkhtml3.14-3.28.2.new/components/editor/gtkhtml-face-tool-button.c 2010-01-25 16:39:36.168424642 +0100
 
25
@@ -522,7 +522,7 @@
 
26
        gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 
27
        gtk_window_set_type_hint (
 
28
                GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_COMBO);
 
29
-       if (GTK_WIDGET_TOPLEVEL (toplevel)) {
 
30
+       if (gtk_widget_is_toplevel (toplevel)) {
 
31
                gtk_window_group_add_window (
 
32
                        gtk_window_get_group (GTK_WINDOW (toplevel)),
 
33
                        GTK_WINDOW (window));
 
34
diff -Nur -x '*.orig' -x '*~' gtkhtml3.14-3.28.2/configure.ac gtkhtml3.14-3.28.2.new/configure.ac
 
35
--- gtkhtml3.14-3.28.2/configure.ac     2009-12-12 04:07:27.000000000 +0100
 
36
+++ gtkhtml3.14-3.28.2.new/configure.ac 2010-01-25 16:39:36.168424642 +0100
 
37
@@ -9,7 +9,7 @@
 
38
 PACKAGE=gtkhtml
 
39
 
 
40
 # Required Package Versions
 
41
-m4_define([gtk_minimum_version], [2.16.0])
 
42
+m4_define([gtk_minimum_version], [2.18.0])
 
43
 m4_define([gail_minimum_version], [1.1.0])
 
44
 m4_define([gnome_icon_theme_minimum_version], [2.22.0])
 
45
 
 
46
diff -Nur -x '*.orig' -x '*~' gtkhtml3.14-3.28.2/gtkhtml/gtkhtml.c gtkhtml3.14-3.28.2.new/gtkhtml/gtkhtml.c
 
47
--- gtkhtml3.14-3.28.2/gtkhtml/gtkhtml.c        2009-12-12 04:07:27.000000000 +0100
 
48
+++ gtkhtml3.14-3.28.2.new/gtkhtml/gtkhtml.c    2010-01-25 16:39:36.172432833 +0100
 
49
@@ -1806,7 +1806,7 @@
 
50
 
 
51
        toplevel = gtk_widget_get_toplevel (widget);
 
52
 
 
53
-       if (GTK_WIDGET_TOPLEVEL (toplevel) && priv->toplevel_unmap_handler == 0) {
 
54
+       if (gtk_widget_is_toplevel (toplevel) && priv->toplevel_unmap_handler == 0) {
 
55
                priv->toplevel_unmap_handler = g_signal_connect (G_OBJECT (toplevel), "unmap-event",
 
56
                                                                 G_CALLBACK (toplevel_unmap), widget);
 
57
        }
 
58
diff -Nur -x '*.orig' -x '*~' gtkhtml3.14-3.28.2/gtkhtml/htmlframe.c gtkhtml3.14-3.28.2.new/gtkhtml/htmlframe.c
 
59
--- gtkhtml3.14-3.28.2/gtkhtml/htmlframe.c      2009-11-28 21:26:13.000000000 +0100
 
60
+++ gtkhtml3.14-3.28.2.new/gtkhtml/htmlframe.c  2010-01-25 16:39:36.172432833 +0100
 
61
@@ -168,7 +168,7 @@
 
62
        HTMLEngine   *e       = GTK_HTML (frame->html)->engine;
 
63
        GdkRectangle paint;
 
64
 
 
65
-       if (GTK_OBJECT_TYPE (e->painter) == HTML_TYPE_PRINTER) {
 
66
+       if (G_OBJECT_TYPE (e->painter) == HTML_TYPE_PRINTER) {
 
67
                gint pixel_size = html_painter_get_pixel_size (e->painter);
 
68
 
 
69
                if (!html_object_intersect (o, &paint, x, y, width, height))
 
70
@@ -194,7 +194,7 @@
 
71
        }
 
72
 
 
73
        html_engine_set_painter (GTK_HTML (frame->html)->engine,
 
74
-                                GTK_OBJECT_TYPE (painter) != HTML_TYPE_PRINTER ? frame->gdk_painter : painter);
 
75
+                                G_OBJECT_TYPE (painter) != HTML_TYPE_PRINTER ? frame->gdk_painter : painter);
 
76
 }
 
77
 
 
78
 static void
 
79
diff -Nur -x '*.orig' -x '*~' gtkhtml3.14-3.28.2/gtkhtml/htmliframe.c gtkhtml3.14-3.28.2.new/gtkhtml/htmliframe.c
 
80
--- gtkhtml3.14-3.28.2/gtkhtml/htmliframe.c     2009-11-28 21:26:13.000000000 +0100
 
81
+++ gtkhtml3.14-3.28.2.new/gtkhtml/htmliframe.c 2010-01-25 16:39:36.172432833 +0100
 
82
@@ -169,7 +169,7 @@
 
83
        HTMLEngine   *e       = GTK_HTML (iframe->html)->engine;
 
84
        GdkRectangle paint;
 
85
 
 
86
-       if (GTK_OBJECT_TYPE (e->painter) == HTML_TYPE_PRINTER) {
 
87
+       if (G_OBJECT_TYPE (e->painter) == HTML_TYPE_PRINTER) {
 
88
                gint pixel_size = html_painter_get_pixel_size (e->painter);
 
89
 
 
90
                if (!html_object_intersect (o, &paint, x, y, width, height))