← Back to branch summary

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

« back to all changes in this revision

Viewing changes to gtkhtml/htmlstyle.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/htmlstyle.c
29
29
html_parse_color (const gchar *text,
30
30
                  GdkColor *color)
31
31
{
32
 
        gchar c [8];
 
32
        gchar c[8];
33
33
        gint  len = strlen (text);
34
34
 
35
35
        if (gdk_color_parse (text, color)) {
64
64
                }
65
65
        }
66
66
 
67
 
        c [7] = 0;
 
67
        c[7] = 0;
68
68
        if (*text != '#') {
69
69
                c[0] = '#';
70
70
                strncpy (c + 1, text, 6);
397
397
parse_border_style (HTMLStyle *style, gchar *value)
398
398
{
399
399
        while (isspace (*value))
400
 
                value ++;
 
400
                value++;
401
401
 
402
402
        if (!g_ascii_strcasecmp (value, "solid"))
403
403
                style = html_style_set_border_style (style, HTML_BORDER_SOLID);
425
425
parse_border_width (HTMLStyle *style, gchar *value)
426
426
{
427
427
        while (isspace (*value))
428
 
                value ++;
 
428
                value++;
429
429
 
430
430
        if (!g_ascii_strcasecmp (value, "thin"))
431
431
                style = html_style_set_border_width (style, 1);
448
448
                gchar orig = 0;
449
449
 
450
450
                while (isspace (*value))
451
 
                        value ++;
 
451
                        value++;
452
452
 
453
453
                next = value;
454
454
                while (*next && !isspace (*next))
455
 
                        next ++;
 
455
                        next++;
456
456
                if (*next) {
457
457
                        orig = *next;
458
458
                        *next = 0;
466
466
 
467
467
                if (modified) {
468
468
                        *next = orig;
469
 
                        next ++;
 
469
                        next++;
470
470
                }
471
471
 
472
472
                value = next;