diff options
Diffstat (limited to 'openembedded/packages/gtkhtml2/files/fix-recreation2.patch')
-rw-r--r-- | openembedded/packages/gtkhtml2/files/fix-recreation2.patch | 93 |
1 files changed, 0 insertions, 93 deletions
diff --git a/openembedded/packages/gtkhtml2/files/fix-recreation2.patch b/openembedded/packages/gtkhtml2/files/fix-recreation2.patch deleted file mode 100644 index 92a8c8fd21..0000000000 --- a/openembedded/packages/gtkhtml2/files/fix-recreation2.patch +++ /dev/null | |||
@@ -1,93 +0,0 @@ | |||
1 | Index: libgtkhtml/view/htmlview.c | ||
2 | =================================================================== | ||
3 | --- libgtkhtml/view/htmlview.c.orig 2006-02-11 05:06:22.000000000 +0000 | ||
4 | +++ libgtkhtml/view/htmlview.c 2006-02-11 05:07:01.000000000 +0000 | ||
5 | @@ -2135,38 +2135,31 @@ html_view_style_updated (HtmlDocument *d | ||
6 | HtmlBox *new_box = NULL; | ||
7 | |||
8 | /* Don't replace boxes where display: none has been set */ | ||
9 | - if (style->display == HTML_DISPLAY_NONE) { | ||
10 | - html_view_removed (document, node, view); | ||
11 | + if (!style || style->display == HTML_DISPLAY_NONE) | ||
12 | break; | ||
13 | - } | ||
14 | |||
15 | new_box = html_box_factory_new_box (view, node, TRUE); | ||
16 | g_assert (new_box); | ||
17 | |||
18 | new_box->dom_node = node; | ||
19 | g_object_add_weak_pointer (G_OBJECT (node), (gpointer *)&(new_box->dom_node)); | ||
20 | + html_box_handle_html_properties (new_box, node->xmlnode); | ||
21 | new_box->next = box->next; | ||
22 | new_box->prev = box->prev; | ||
23 | new_box->parent = box->parent; | ||
24 | - new_box->children = box->children; | ||
25 | |||
26 | - if (box->next) box->next->prev = new_box; | ||
27 | - if (box->prev) box->prev->next = new_box; | ||
28 | - if (box->parent) | ||
29 | + if (box->parent) { | ||
30 | if (box->parent->children == box) | ||
31 | box->parent->children = new_box; | ||
32 | + } | ||
33 | + if (box->next) box->next->prev = new_box; | ||
34 | + if (box->prev) box->prev->next = new_box; | ||
35 | if (box->children) { | ||
36 | HtmlBox *child = box->children; | ||
37 | while (child) { | ||
38 | - if (child->parent == box) | ||
39 | - child->parent = new_box; | ||
40 | - child = child->prev; | ||
41 | - } | ||
42 | - child = box->children->next; | ||
43 | - while (child) { | ||
44 | - if (child->parent == box) | ||
45 | - child->parent = new_box; | ||
46 | - child = child->next; | ||
47 | + HtmlBox *temp = child->next; | ||
48 | + html_box_append_child (new_box, child); | ||
49 | + child = temp; | ||
50 | } | ||
51 | } | ||
52 | |||
53 | @@ -2176,7 +2169,6 @@ html_view_style_updated (HtmlDocument *d | ||
54 | html_view_remove_layout_box (view, node); | ||
55 | g_object_unref (box); | ||
56 | |||
57 | - html_box_handle_html_properties (new_box, node->xmlnode); | ||
58 | html_view_add_layout_box (view, node, new_box); | ||
59 | html_view_relayout_callback (document, node, view); | ||
60 | break; | ||
61 | Index: libgtkhtml/graphics/htmlimage.c | ||
62 | =================================================================== | ||
63 | --- libgtkhtml/graphics/htmlimage.c.orig 2006-02-11 05:06:22.000000000 +0000 | ||
64 | +++ libgtkhtml/graphics/htmlimage.c 2006-02-11 05:06:34.000000000 +0000 | ||
65 | @@ -142,6 +142,7 @@ static void | ||
66 | html_image_init (HtmlImage *image) | ||
67 | { | ||
68 | image->pixbuf = NULL; | ||
69 | + image->stream = NULL; | ||
70 | image->broken = FALSE; | ||
71 | image->loading = FALSE; | ||
72 | image->loader = gdk_pixbuf_loader_new (); | ||
73 | Index: libgtkhtml/graphics/htmlimagefactory.c | ||
74 | =================================================================== | ||
75 | --- libgtkhtml/graphics/htmlimagefactory.c.orig 2006-02-11 05:06:22.000000000 +0000 | ||
76 | +++ libgtkhtml/graphics/htmlimagefactory.c 2006-02-11 05:07:43.000000000 +0000 | ||
77 | @@ -146,7 +146,7 @@ html_image_factory_get_image (HtmlImageF | ||
78 | |||
79 | image = HTML_IMAGE (g_object_new (HTML_IMAGE_TYPE, NULL)); | ||
80 | |||
81 | - g_object_weak_ref (G_OBJECT (image), (GWeakNotify)html_image_shutdown, image_factory); | ||
82 | + g_signal_connect_swapped (G_OBJECT (image), "last_unref", G_CALLBACK (html_image_shutdown), image_factory); | ||
83 | |||
84 | image->loading = TRUE; | ||
85 | |||
86 | @@ -154,6 +154,7 @@ html_image_factory_get_image (HtmlImageF | ||
87 | image); | ||
88 | |||
89 | image->stream = stream; | ||
90 | + g_object_add_weak_pointer (G_OBJECT (stream), (gpointer *) &(image->stream)); | ||
91 | g_object_add_weak_pointer (G_OBJECT (image), (gpointer *) &(stream->user_data)); | ||
92 | |||
93 | g_signal_emit (G_OBJECT (image_factory), image_factory_signals [REQUEST_IMAGE], 0, uri, stream); | ||