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

« back to all changes in this revision

Viewing changes to gtkhtml/gtkhtml.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2009-07-27 15:38:00 UTC
  • Revision ID: james.westby@ubuntu.com-20090727153800-2z0i3y6vpmywwhe5
Tags: 1:3.27.5-0ubuntu1
New upstream version:
Bug Fixes:
Bug #584243Crash when replacing a mispelled word (lp: #397957)
Other Fixes:
Fix some build tool warnings. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
411
411
        return FALSE;
412
412
}
413
413
 
414
 
 
415
414
static void
416
415
gtk_html_adjust_cursor_position (GtkHTML *html)
417
416
{
434
433
 
435
434
}
436
435
 
437
 
 
438
436
static void
439
437
queue_draw (GtkHTML *html)
440
438
{
1004
1002
                html_engine_refresh_fonts (engine);
1005
1003
        }
1006
1004
 
1007
 
 
1008
1005
        html_colorset_set_style (engine->defaultSettings->color_set, widget);
1009
1006
        html_colorset_set_unchanged (engine->settings->color_set,
1010
1007
                                     engine->defaultSettings->color_set);
1747
1744
 
1748
1745
                widget = GTK_HTML (widget)->iframe_parent;
1749
1746
 
1750
 
 
1751
1747
        }
1752
1748
 
1753
1749
        return widget;
1787
1783
        return TRUE;
1788
1784
}
1789
1785
 
1790
 
 
1791
1786
static gboolean
1792
1787
toplevel_unmap (GtkWidget *widget, GdkEvent *event, GtkHTML *html)
1793
1788
{
2708
2703
        case DND_TARGET_TYPE_MOZILLA_URL  :
2709
2704
                break;
2710
2705
        case DND_TARGET_TYPE_TEXT_URI_LIST:
2711
 
                if(!HTML_IS_PLAIN_PAINTER (engine->painter)) {
 
2706
                if (!HTML_IS_PLAIN_PAINTER (engine->painter)) {
2712
2707
                 HTMLObject *obj;
2713
2708
                 gint list_len, len;
2714
2709
                 gchar *uri;
3068
3063
                              G_TYPE_INT, G_TYPE_INT);
3069
3064
        object_class->destroy = destroy;
3070
3065
 
3071
 
 
3072
3066
#ifdef USE_PROPS
3073
3067
        gobject_class->get_property = gtk_html_get_property;
3074
3068
        gobject_class->set_property = gtk_html_set_property;
3102
3096
                                                              NULL,
3103
3097
                                                              G_PARAM_WRITABLE | G_PARAM_READABLE));
3104
3098
 
3105
 
 
3106
3099
#endif
3107
3100
 
3108
3101
        gtk_widget_class_install_style_property (widget_class,
3143
3136
                                                                     GDK_TYPE_COLOR,
3144
3137
                                                                     G_PARAM_READABLE));
3145
3138
 
3146
 
 
3147
3139
        widget_class->realize = realize;
3148
3140
        widget_class->unrealize = unrealize;
3149
3141
        widget_class->style_set = style_set;
3612
3604
        html->allow_selection = allow;
3613
3605
}
3614
3606
 
3615
 
 
3616
3607
/**
3617
3608
 * gtk_html_begin_full:
3618
3609
 * @html: the GtkHTML widget to operate on.
4661
4652
        return html_engine_get_engine_type( html->engine);
4662
4653
}
4663
4654
 
4664
 
 
4665
4655
void
4666
4656
gtk_html_set_default_content_type (GtkHTML *html, const gchar *content_type)
4667
4657
{
4920
4910
                line_height =  GTK_WIDGET (html)->allocation.height > (3 * get_line_height (html))
4921
4911
                        ? get_line_height (html) : 0;
4922
4912
 
4923
 
 
4924
4913
                switch (dir_type) {
4925
4914
                case GTK_DIR_UP:
4926
4915
                case GTK_DIR_LEFT: