← Back to branch summary

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

« back to all changes in this revision

Viewing changes to gtkhtml/htmlpainter.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/htmlpainter.c
142
142
                gint i;
143
143
                for (list = glyphs; list; list = list->next->next) {
144
144
                        PangoGlyphString *str = (PangoGlyphString *) list->data;
145
 
                        for (i=0; i < str->num_glyphs; i ++)
146
 
                                width += str->glyphs [i].geometry.width;
 
145
                        for (i=0; i < str->num_glyphs; i++)
 
146
                                width += str->glyphs[i].geometry.width;
147
147
                }
148
148
        }
149
149
        if (glyphs)
182
182
                        str = (PangoGlyphString *) gl->data;
183
183
                        gl = gl->next;
184
184
                        ii = GPOINTER_TO_INT (gl->data);
185
 
                        item = pi->entries [ii].glyph_item.item;
 
185
                        item = pi->entries[ii].glyph_item.item;
186
186
                        pango_glyph_string_extents (str, item->analysis.font, NULL, &log_rect);
187
187
                        width += log_rect.width;
188
188
 
197
197
 
198
198
                        c_text = g_utf8_offset_to_pointer (c_text, str->num_glyphs);
199
199
                        if (*text == '\t')
200
 
                                c_text ++;
 
200
                                c_text++;
201
201
                        c_bytes = c_text - text;
202
202
                }
203
203
        }
533
533
                        strncpy (tt, t, tab - t);
534
534
                        tt += tab - t;
535
535
                        *tt = ' ';
536
 
                        tt ++;
 
536
                        tt++;
537
537
                        t = tab + 1;
538
538
                } else
539
539
                        strncpy (tt, t, bytes - (t - text));
1014
1014
 
1015
1015
                for (il = items; il; il = il->next) {
1016
1016
                        item = (PangoItem *) il->data;
1017
 
                        pi->entries [i].glyph_item.item = item;
 
1017
                        pi->entries[i].glyph_item.item = item;
1018
1018
                        end = g_utf8_offset_to_pointer (text, item->num_chars);
1019
1019
                        *glyphs = html_get_glyphs_non_tab (*glyphs, item, i, text, end - text, item->num_chars);
1020
1020
                        text = end;
1021
 
                        i ++;
 
1021
                        i++;
1022
1022
                }
1023
1023
                *glyphs = g_list_reverse (*glyphs);
1024
1024
                g_list_free (items);