← Back to branch summary

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

« back to all changes in this revision

Viewing changes to gtkhtml/htmlrule.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/htmlrule.c
26
26
#include "htmlcolor.h"
27
27
#include "htmlcolorset.h"
28
28
#include "htmlengine-save.h"
 
29
#include "htmlenumutils.h"
29
30
#include "htmlrule.h"
30
31
#include "htmlpainter.h"
31
32
#include "htmlsettings.h"
208
209
{
209
210
        gchar *size;
210
211
        const gchar *shade;
 
212
        gchar *align;
211
213
        gchar *length;
212
214
        gboolean rv;
213
215
 
216
218
        length = HTML_RULE (self)->length
217
219
                ? g_strdup_printf (" LENGTH=\"%d\"", HTML_RULE (self)->length)
218
220
                : (self->percent > 0 && self->percent != 100 ? g_strdup_printf (" LENGTH=\"%d%%\"", self->percent) : g_strdup (""));
219
 
 
220
 
        rv = html_engine_save_output_string (state, "\n<HR%s%s%s>\n", shade, size, length);
221
 
 
222
 
        if (*size)
223
 
                g_free (size);
224
 
        if (*length)
225
 
                g_free (length);
 
221
        align = g_strdup_printf (" ALIGN=\"%s\"", html_halign_name (HTML_RULE (self)->halign));
 
222
 
 
223
        rv = html_engine_save_output_string (state, "\n<HR%s%s%s%s>\n", shade, size, length, align);
 
224
 
 
225
        g_free (align);
 
226
        g_free (length);
 
227
        g_free (size);
226
228
 
227
229
        return rv;
228
230
}