← Back to branch summary

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

« back to all changes in this revision

Viewing changes to gtkhtml/htmlframe.c

  • 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:
gtkhtml/htmlframe.c
168
168
        HTMLEngine   *e       = GTK_HTML (frame->html)->engine;
169
169
        GdkRectangle paint;
170
170
 
171
 
        if (G_OBJECT_TYPE (e->painter) == HTML_TYPE_PRINTER) {
 
171
        if (GTK_OBJECT_TYPE (e->painter) == HTML_TYPE_PRINTER) {
172
172
                gint pixel_size = html_painter_get_pixel_size (e->painter);
173
173
 
174
174
                if (!html_object_intersect (o, &paint, x, y, width, height))
194
194
        }
195
195
 
196
196
        html_engine_set_painter (GTK_HTML (frame->html)->engine,
197
 
                                 G_OBJECT_TYPE (painter) != HTML_TYPE_PRINTER ? frame->gdk_painter : painter);
 
197
                                 GTK_OBJECT_TYPE (painter) != HTML_TYPE_PRINTER ? frame->gdk_painter : painter);
198
198
}
199
199
 
200
200
static void