← Back to branch summary

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

« back to all changes in this revision

Viewing changes to gtkhtml/htmlengine-edit-cursor.c

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2010-11-02 14:34:48 UTC
  • mfrom: (1.6.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20101102143448-3cxzy1h4oh5v7igz
Tags: 1:3.32.0-0ubuntu1
https://launchpad.net/bugs/178959
https://launchpad.net/bugs/284060
https://launchpad.net/bugs/562633
* New upstream release 3.32.0
  - Crash after closing inline view of text attachment (LP: #178959, #284060)
  - Translations not working in Emoticons, Find/Replace dialogs (LP: #562633)
* debian/patches/gtkhtml3.14_ftbfs.patch: dropped.
* debian/rules: append API_VER for libgtkhtml-editor chrpath as well
* debian/libgtkhtml-editor-dev.install: append api version to pkgconfig
  file name.
* debian/*.shlibs: update shlibs files for new version with same soname, also
  rename libgtkhtml-editor to libgtkhtml-editor-3.14
* debian/control: Replaces/Conflicts gtkhtml3.14 (<< 3.32.0)
* debian/control: bump libgtk2.0-dev and libgail-dev Build-Depends to 2.20
* debian/rules: disable deprecation warnings so the build completes

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtkhtml/htmlengine-edit-cursor.c
121
121
{
122
122
        GdkGC *gc;
123
123
        GdkColor color;
124
 
        gint8 dashes [2] = { 1, 3 };
 
124
        gint8 dashes[2] = { 1, 3 };
125
125
 
126
126
        if (x1 > x2 || y1 > y2 || !e->window)
127
127
                return;
266
266
 
267
267
                html_object_calc_abs_position (to, &cr->x1, &cr->y2);
268
268
                cr->x2 = cr->x1 + to->width - 1;
269
 
                cr->y2 --;
 
269
                cr->y2--;
270
270
                cr->y1 = cr->y2 - (to->ascent + to->descent - 1);
271
271
 
272
272
                animate = HTML_IS_TABLE (e->cursor->object) && !html_engine_get_table_cell (e);