← Back to branch summary

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

« back to all changes in this revision

Viewing changes to gtkhtml/htmlengine-edit-cut-and-paste.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/htmlengine-edit-cut-and-paste.c
817
817
                gint start_position = start->position;
818
818
                gint end_position = end->position;
819
819
                if (end_position - start_position > 0) {
820
 
                        int len = end_position - start_position;
 
820
                        gint len = end_position - start_position;
821
821
                        g_signal_emit_by_name (e->widget, "object_delete", start_position, len);
822
822
                }
823
823
                html_cursor_destroy (start);
1266
1266
        html_engine_thaw (e);
1267
1267
}
1268
1268
 
1269
 
static const char *picto_chars =
 
1269
static const gchar *picto_chars =
1270
1270
        /*  0 */ "DO)(|/PQ*!"
1271
1271
        /* 10 */ "S\0:-\0:\0:-\0"
1272
1272
        /* 20 */ ":\0:;=-\"\0:;"
1475
1475
}
1476
1476
 
1477
1477
void
1478
 
html_engine_paste_link (HTMLEngine *e, const char *text, int len, const char *complete_url)
 
1478
html_engine_paste_link (HTMLEngine *e, const gchar *text, gint len, const gchar *complete_url)
1479
1479
{
1480
 
        char *url, *target;
 
1480
        gchar *url, *target;
1481
1481
 
1482
1482
        if (len == -1)
1483
1483
                len = g_utf8_strlen (text, -1);
1542
1542
                        }
1543
1543
                }
1544
1544
                if (forward) {
1545
 
                        int i;
 
1545
                        gint i;
1546
1546
 
1547
1547
                        for (i = len; i > 0; i--)
1548
1548
                                html_cursor_forward (e->cursor, e);
1865
1865
                gint end_position = end->position;
1866
1866
 
1867
1867
                if (end_position - start_position > 0) {
1868
 
                        int len = end_position - start_position;
 
1868
                        gint len = end_position - start_position;
1869
1869
                        g_signal_emit_by_name (e->widget, "object_delete", start_position, len);
1870
1870
                }
1871
1871
 
1884
1884
 
1885
1885
                                /* go thru current cluev */
1886
1886
                                do {
1887
 
                                        /* go thru current flow */
 
1887
                                        /* go thru current flow */
1888
1888
                                        while (cur) {
1889
 
                                                /* lets look if container is whole contained in the selection */
 
1889
                                                /* lets look if container is whole contained in the selection */
1890
1890
                                                if (html_object_is_container (cur)) {
1891
1891
                                                        html_cursor_jump_to (e->cursor, e, cur, html_object_get_length (cur));
1892
1892
                                                        if (e->cursor->position > end->position) {
1903
1903
                                } while (prev && prev->parent->next && (cur = html_object_head (prev->parent->next)));
1904
1904
 
1905
1905
                                if (prev) {
1906
 
                                        /* cluev end is in the selection. Lets handle this case just like simple delete 
 
1906
                                        /* cluev end is in the selection. Lets handle this case just like simple delete
1907
1907
                                        since text is the selection itself*/
1908
1908
                                        if (e->mark)
1909
1909
                                                html_cursor_destroy (e->mark);