← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gtkhtml3.14/trusty-proposed

« back to all changes in this revision

Viewing changes to gtkhtml/htmlgdkpainter.c

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2009-06-15 17:08:06 UTC
  • mfrom: (1.4.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20090615170806-ud4819pfxq1p1vgm
Tags: 1:3.27.3-0ubuntu1
https://launchpad.net/bugs/387342
* New upstream release (LP: #387342)
  - support cookies if libsoup>2.26 (Denis Pauk)
  - Get rid of deprecated libgnome(ui) (Denis Pauk)
  - Killing libgnome by removing libgnome function by equivalent glib
    functions (Fridrich Strba)
  - Code cleanup (Matthew Barnes)
* debian/control:
  - bump libsoup to 2.26.0
  - remove libgnomeui build-dep
  - add Vcs-Bzr tag
* Update debian/watch to take unstable version

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtkhtml/htmlgdkpainter.c
88
88
 
89
89
 
90
90
static void
91
 
begin (HTMLPainter *painter, int x1, int y1, int x2, int y2)
 
91
begin (HTMLPainter *painter, gint x1, gint y1, gint x2, gint y2)
92
92
{
93
93
        HTMLGdkPainter *gdk_painter;
94
94
 
100
100
        set_clip_rectangle (painter, 0, 0, 0, 0);
101
101
 
102
102
        if (gdk_painter->double_buffer){
103
 
                const int width = x2 - x1 + 1;
104
 
                const int height = y2 - y1 + 1;
 
103
                const gint width = x2 - x1 + 1;
 
104
                const gint height = y2 - y1 + 1;
105
105
 
106
106
 
107
107
                /* FIXME: Ideally it should be NULL before coming here. */
442
442
 
443
443
                gc = gdk_gc_new (gdk_painter->window);
444
444
 
445
 
                if (color || !gdk_pixbuf_get_has_alpha (pixbuf)) {
 
445
                if (color || !gdk_pixbuf_get_has_alpha (pixbuf)) {
446
446
                        pixmap = gdk_pixmap_new (gdk_painter->window, dw, dh, -1);
447
447
 
448
448
                        if (color) {
472
472
                        g_object_unref (pixmap);
473
473
                        g_object_unref (gc);
474
474
                } else {
475
 
                        int incr_x = 0;
476
 
                        int incr_y = 0;
 
475
                        gint incr_x = 0;
 
476
                        gint incr_y = 0;
477
477
 
478
478
                        cy = paint.y;
479
479
                        ch = paint.height;
666
666
}
667
667
 
668
668
static gint
669
 
draw_spell_error (HTMLPainter *painter, int x, int y, int width)
 
669
draw_spell_error (HTMLPainter *painter, gint x, gint y, gint width)
670
670
{
671
671
        HTMLGdkPainter *gdk_painter;
672
672
        GdkGCValues values;