[gtkhtml] More whitespace cleanup.
- From: Matthew Barnes <mbarnes src gnome org>
- To: svn-commits-list gnome org
- Subject: [gtkhtml] More whitespace cleanup.
- Date: Thu, 28 May 2009 13:30:02 -0400 (EDT)
commit 77d85cbe01ec90a9aa4607329a103070357fb525
Author: Matthew Barnes <mbarnes redhat com>
Date: Thu May 28 13:24:43 2009 -0400
More whitespace cleanup.
---
a11y/object.c | 6 ++--
a11y/text.c | 6 ++--
gtkhtml/gtkhtml-embedded.h | 2 +-
gtkhtml/gtkhtml-properties.c | 2 +-
gtkhtml/gtkhtml.c | 22 +++++++-------
gtkhtml/gtkhtml.h | 14 ++++----
gtkhtml/gtkhtmldebug.c | 4 +-
gtkhtml/htmlclueflow.c | 18 +++++-----
gtkhtml/htmlcluev.c | 2 +-
gtkhtml/htmlembedded.c | 4 +-
gtkhtml/htmlengine-edit-cursor.c | 2 +-
gtkhtml/htmlengine-edit-cut-and-paste.c | 6 ++--
gtkhtml/htmlengine-edit-movement.c | 4 +-
gtkhtml/htmlengine-print.c | 4 +-
gtkhtml/htmlengine-save.c | 2 +-
gtkhtml/htmlengine-save.h | 4 +-
gtkhtml/htmlengine.c | 18 +++++-----
gtkhtml/htmlengine.h | 2 +-
gtkhtml/htmlframe.c | 2 +-
gtkhtml/htmlgdkpainter.c | 2 +-
gtkhtml/htmliframe.c | 2 +-
gtkhtml/htmlimage.h | 2 +-
gtkhtml/htmlobject.h | 4 +-
gtkhtml/htmlpainter.c | 4 +-
gtkhtml/htmlpainter.h | 8 ++--
gtkhtml/htmlprinter.c | 10 +++---
gtkhtml/htmlsearch.c | 2 +-
gtkhtml/htmlsettings.h | 14 ++++----
gtkhtml/htmlstyle.c | 6 ++--
gtkhtml/htmltable.c | 2 +-
gtkhtml/htmltext.c | 38 ++++++++++++------------
gtkhtml/htmltext.h | 4 +-
gtkhtml/htmltextslave.c | 16 +++++-----
gtkhtml/htmltokenizer.c | 6 ++--
gtkhtml/htmltokenizer.h | 2 +-
gtkhtml/htmltype.c | 50 +++++++++++++++---------------
gtkhtml/htmlundo-action.h | 2 +-
gtkhtml/test-stress.c | 2 +-
gtkhtml/test-suite.c | 12 ++++----
gtkhtml/testgtkhtml.c | 12 ++++----
40 files changed, 162 insertions(+), 162 deletions(-)
diff --git a/a11y/object.c b/a11y/object.c
index e65bd6b..77a7020 100644
--- a/a11y/object.c
+++ b/a11y/object.c
@@ -335,7 +335,7 @@ gtk_html_a11y_cursor_changed_cb (GtkWidget *widget)
if (gtk_html_a11y_focus_object != focus_object) {
gtk_html_a11y_focus_object = focus_object;
- atk_focus_tracker_notify (focus_object);
+ atk_focus_tracker_notify (focus_object);
} else {
if (G_IS_HTML_A11Y_TEXT(focus_object)) {
gint offset;
@@ -361,7 +361,7 @@ gtk_html_a11y_insert_object_cb (GtkWidget * widget, int pos, int len)
if (gtk_html_a11y_focus_object != a11y) {
gtk_html_a11y_focus_object = a11y;
- atk_focus_tracker_notify (a11y);
+ atk_focus_tracker_notify (a11y);
}
if (G_IS_HTML_A11Y_TEXT(a11y)) {
@@ -381,7 +381,7 @@ gtk_html_a11y_delete_object_cb (GtkWidget * widget, int pos, int len)
if (gtk_html_a11y_focus_object != a11y) {
gtk_html_a11y_focus_object = a11y;
- atk_focus_tracker_notify (a11y);
+ atk_focus_tracker_notify (a11y);
}
if (G_IS_HTML_A11Y_TEXT(a11y)) {
diff --git a/a11y/text.c b/a11y/text.c
index 4e0cdbf..49f7dcc 100644
--- a/a11y/text.c
+++ b/a11y/text.c
@@ -85,7 +85,7 @@ static gint html_a11y_text_get_link_index (AtkHypertext *hypertext, gint char_in
/* Editable text interface. */
-static void atk_editable_text_interface_init (AtkEditableTextIface *iface);
+static void atk_editable_text_interface_init (AtkEditableTextIface *iface);
static void html_a11y_text_set_text_contents (AtkEditableText *text,
const gchar *string);
static void html_a11y_text_insert_text (AtkEditableText *text,
@@ -1101,7 +1101,7 @@ html_a11y_text_cut_text (AtkEditableText *text,
static void
html_a11y_text_delete_text (AtkEditableText *text,
- gint start_pos,
+ gint start_pos,
gint end_pos)
{
GtkHTML * html;
@@ -1120,7 +1120,7 @@ html_a11y_text_delete_text (AtkEditableText *text,
static void
html_a11y_text_paste_text (AtkEditableText *text,
- gint position)
+ gint position)
{
GtkHTML * html;
HTMLText *t;
diff --git a/gtkhtml/gtkhtml-embedded.h b/gtkhtml/gtkhtml-embedded.h
index 4d1b044..6fe2cab 100644
--- a/gtkhtml/gtkhtml-embedded.h
+++ b/gtkhtml/gtkhtml-embedded.h
@@ -62,7 +62,7 @@ struct _GtkHTMLEmbeddedClass {
/* FIXME: There needs to be a way for embedded objects in forms to encode
themselves for a form */
-GType gtk_html_embedded_get_type (void);
+GType gtk_html_embedded_get_type (void);
GtkWidget *gtk_html_embedded_new (char *classid, char *name, char *type, char *data, int width, int height);
void gtk_html_embedded_set_parameter (GtkHTMLEmbedded *ge, char *param, char *value);
diff --git a/gtkhtml/gtkhtml-properties.c b/gtkhtml/gtkhtml-properties.c
index 902fd11..4df8365 100644
--- a/gtkhtml/gtkhtml-properties.c
+++ b/gtkhtml/gtkhtml-properties.c
@@ -62,7 +62,7 @@ get_locale_language (void)
/* validate the country code */
if (strlen (lang + 3) > 2) {
- /* invalid country code */
+ /* invalid country code */
lang[2] = '\0';
} else {
lang[2] = '-';
diff --git a/gtkhtml/gtkhtml.c b/gtkhtml/gtkhtml.c
index 41da855..c203234 100644
--- a/gtkhtml/gtkhtml.c
+++ b/gtkhtml/gtkhtml.c
@@ -358,7 +358,7 @@ gtk_html_update_styles (GtkHTML *html)
}
alignment = html_alignment_to_paragraph (html_engine_get_current_clueflow_alignment (engine));
- if (alignment != html->priv->paragraph_alignment) {
+ if (alignment != html->priv->paragraph_alignment) {
html->priv->paragraph_alignment = alignment;
g_signal_emit (html, signals [CURRENT_PARAGRAPH_ALIGNMENT_CHANGED], 0, alignment);
}
@@ -393,7 +393,7 @@ idle_handler (gpointer data)
if (also_update_cursor)
gtk_html_adjust_cursor_position (html);
- html->priv->idle_handler_id = 0;
+ html->priv->idle_handler_id = 0;
html->priv->skip_update_cursor = FALSE;
html->priv->cursor_moved = FALSE;
@@ -1299,8 +1299,8 @@ size_allocate (GtkWidget *widget, GtkAllocation *allocation)
and we know the children positions */
children = GTK_LAYOUT (widget)->children;
GTK_LAYOUT (widget)->children = NULL;
- if (GTK_WIDGET_CLASS (parent_class)->size_allocate)
- (*GTK_WIDGET_CLASS (parent_class)->size_allocate) (widget, allocation);
+ if (GTK_WIDGET_CLASS (parent_class)->size_allocate)
+ (*GTK_WIDGET_CLASS (parent_class)->size_allocate) (widget, allocation);
GTK_LAYOUT (widget)->children = children;
if (html->engine->width != allocation->width
@@ -2256,9 +2256,9 @@ get_selection_string (GtkHTML *html, int *len, gboolean selection, gboolean prim
GString *buffer;
state = html_engine_save_buffer_new (html->engine, TRUE);
- buffer = (GString *)state->user_data;
+ buffer = (GString *)state->user_data;
- html_object_save (selection_object, state);
+ html_object_save (selection_object, state);
g_string_append_unichar (buffer, 0x0000);
if (len)
@@ -2589,7 +2589,7 @@ drag_data_get (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *sel
atom = gtk_selection_data_get_target (selection_data);
gtk_selection_data_set (selection_data, atom, 8,
(guchar *) complete_url, strlen (complete_url));
- /* printf ("complete URL %s\n", complete_url); */
+ /* printf ("complete URL %s\n", complete_url); */
GTK_HTML (widget)->priv->dnd_url = complete_url;
}
}
@@ -4071,7 +4071,7 @@ gtk_html_get_magic_links (const GtkHTML *html)
g_return_val_if_fail (html != NULL, FALSE);
g_return_val_if_fail (GTK_IS_HTML (html), FALSE);
- return html->priv->magic_links;
+ return html->priv->magic_links;
}
void
@@ -4090,7 +4090,7 @@ gtk_html_get_magic_smileys (const GtkHTML *html)
g_return_val_if_fail (html != NULL, FALSE);
g_return_val_if_fail (GTK_IS_HTML (html), FALSE);
- return html->priv->magic_smileys;
+ return html->priv->magic_smileys;
}
static void
@@ -4408,7 +4408,7 @@ clipboard_get_contents_cb (GtkClipboard *clipboard,
{
ClipboardContents *contents = (ClipboardContents *) data;
- if (info == TARGET_HTML && contents->html_text) {
+ if (info == TARGET_HTML && contents->html_text) {
gtk_selection_data_set (selection_data,
gdk_atom_intern ("text/html", FALSE), 8,
(const guchar *) contents->html_text,
@@ -5843,7 +5843,7 @@ gtk_html_set_iframe_parent (GtkHTML *html, GtkWidget *parent, HTMLObject *frame)
while (html->iframe_parent) {
depth++;
- html = GTK_HTML (html->iframe_parent);
+ html = GTK_HTML (html->iframe_parent);
}
return depth;
diff --git a/gtkhtml/gtkhtml.h b/gtkhtml/gtkhtml.h
index 9630bbc..2c931e4 100644
--- a/gtkhtml/gtkhtml.h
+++ b/gtkhtml/gtkhtml.h
@@ -212,18 +212,18 @@ void gtk_html_set_animate (GtkHTML
gboolean gtk_html_get_animate (const GtkHTML *html);
/* Printing support. */
-void gtk_html_print_page_with_header_footer (GtkHTML *html,
- GtkPrintContext *context,
- gdouble header_height,
+void gtk_html_print_page_with_header_footer (GtkHTML *html,
+ GtkPrintContext *context,
+ gdouble header_height,
gdouble footer_height,
GtkHTMLPrintCallback header_print,
- GtkHTMLPrintCallback footer_print,
- gpointer user_data);
+ GtkHTMLPrintCallback footer_print,
+ gpointer user_data);
void gtk_html_print_page (GtkHTML *html,
GtkPrintContext *context);
-gint gtk_html_print_page_get_pages_num (GtkHTML *html,
+gint gtk_html_print_page_get_pages_num (GtkHTML *html,
GtkPrintContext *context,
- gdouble header_height,
+ gdouble header_height,
gdouble footer_height);
GtkPrintOperationResult gtk_html_print_operation_run (GtkHTML *html,
GtkPrintOperation *operation,
diff --git a/gtkhtml/gtkhtmldebug.c b/gtkhtml/gtkhtmldebug.c
index 056985d..083ef70 100644
--- a/gtkhtml/gtkhtmldebug.c
+++ b/gtkhtml/gtkhtmldebug.c
@@ -228,7 +228,7 @@ gtk_html_debug_dump_object (HTMLObject *obj,
g_print (" ");
g_print ("Text (len %d bytes %d): \"%s\"\n",
text->text_len, text->text_bytes, text->text);
-/* debug_spell_errors (text->spell_errors); */
+/* debug_spell_errors (text->spell_errors); */
if (text->pi) {
for (i =0; i < text->pi->n; i ++)
g_print ("item %d offset: %d length: %d\n", i, text->pi->entries [i].glyph_item.item->offset, text->pi->entries [i].glyph_item.item->length);
@@ -338,7 +338,7 @@ dump_object_simple (HTMLObject *obj,
g_print ("%s `%s'\n",
html_type_name (HTML_OBJECT_TYPE (obj)),
text->text);
-/* g_print ("len %d bytes %d\n", text->text_len, text->text_bytes); */
+/* g_print ("len %d bytes %d\n", text->text_len, text->text_bytes); */
} else if (HTML_OBJECT_TYPE (obj) == HTML_TYPE_TEXTSLAVE) {
HTMLTextSlave *slave = HTML_TEXT_SLAVE (obj);
gchar *text;
diff --git a/gtkhtml/htmlclueflow.c b/gtkhtml/htmlclueflow.c
index 7ede78d..08542a7 100644
--- a/gtkhtml/htmlclueflow.c
+++ b/gtkhtml/htmlclueflow.c
@@ -498,7 +498,7 @@ get_pre_padding (HTMLClueFlow *flow, guint pad)
return pad;
else
return 0;
- }
+ }
if (flow->style == HTML_CLUEFLOW_STYLE_PRE
&& prev->style != HTML_CLUEFLOW_STYLE_PRE
@@ -1284,9 +1284,9 @@ draw_quotes (HTMLObject *self, HTMLPainter *painter,
if (cur->y != 0) {
baseline = cur->y;
break;
- }
- cur = cur->next;
- }
+ }
+ cur = cur->next;
+ }
/* draw "> " quote characters in the plain case */
@@ -1986,14 +1986,14 @@ save_plain (HTMLObject *self,
int offset;
if (get_pre_padding (flow, calc_padding (state->engine->painter)) > 0) {
- plain_padding (flow, out, FALSE);
+ plain_padding (flow, out, FALSE);
g_string_append (out, "\n");
}
s = html_engine_save_buffer_peek_text (buffer_state);
if (*s == 0) {
- plain_padding (flow, out, TRUE);
+ plain_padding (flow, out, TRUE);
g_string_append (out, "\n");
} else {
PangoAttrList *attrs = pango_attr_list_new ();
@@ -2352,10 +2352,10 @@ search_text (HTMLObject **beg, HTMLSearch *info)
unicode_par = g_utf8_get_char ((gchar *) par + index);
if (!info->case_sensitive) {
unicode_info = g_unichar_toupper (unicode_info);
- unicode_par = g_unichar_toupper (unicode_par);
+ unicode_par = g_unichar_toupper (unicode_par);
}
- if (unicode_info == unicode_par) {
+ if (unicode_info == unicode_par) {
eq_bytes += (guchar *)g_utf8_next_char (par + index) - par - index;
if (eq_bytes == info->text_bytes) {
@@ -2543,7 +2543,7 @@ html_clueflow_class_init (HTMLClueFlowClass *klass,
void
html_clueflow_init (HTMLClueFlow *clueflow, HTMLClueFlowClass *klass,
HTMLClueFlowStyle style, GByteArray *levels, HTMLListType item_type, gint item_number,
- HTMLClearType clear)
+ HTMLClearType clear)
{
HTMLObject *object;
HTMLClue *clue;
diff --git a/gtkhtml/htmlcluev.c b/gtkhtml/htmlcluev.c
index b966b83..df3c179 100644
--- a/gtkhtml/htmlcluev.c
+++ b/gtkhtml/htmlcluev.c
@@ -219,7 +219,7 @@ html_cluev_do_layout (HTMLObject *o, HTMLPainter *painter, gboolean calc_size, G
/* printf ("y: %d ", o->ascent - clue->curr->descent); */
if (first_change) {
first_change = FALSE;
- /* if it's new one (y == 0) clear from new y_off, else from old one or new one,
+ /* if it's new one (y == 0) clear from new y_off, else from old one or new one,
which one is higher */
first_y_off = old_y && old_y_off < new_y_off ? old_y_off : new_y_off;
/* printf ("\nfirst_y_off: %d x %d --> %d\n", old_y_off, new_y_off, first_y_off); */
diff --git a/gtkhtml/htmlembedded.c b/gtkhtml/htmlembedded.c
index 7de03a7..8696ea3 100644
--- a/gtkhtml/htmlembedded.c
+++ b/gtkhtml/htmlembedded.c
@@ -245,8 +245,8 @@ html_embedded_encode_string (const gchar *before, const gchar *codepage)
GIConv iconv_cd = generate_iconv_to (codepage);
if( is_valid_g_iconv (iconv_cd))
{
- str= convert_text_encoding(iconv_cd, before);
- g_iconv_close(iconv_cd);
+ str= convert_text_encoding(iconv_cd, before);
+ g_iconv_close(iconv_cd);
}
while ( pos < strlen(str) ) {
diff --git a/gtkhtml/htmlengine-edit-cursor.c b/gtkhtml/htmlengine-edit-cursor.c
index 8aa73e2..037e2a5 100644
--- a/gtkhtml/htmlengine-edit-cursor.c
+++ b/gtkhtml/htmlengine-edit-cursor.c
@@ -68,7 +68,7 @@ html_engine_hide_cursor (HTMLEngine *engine)
if (e) {
e->caret_mode = engine->caret_mode;
html_cursor_copy(e->cursor, engine->cursor);
- } else e = engine;
+ } else e = engine;
}
html_engine_draw_cursor_in_area (e, 0, 0, -1, -1);
}
diff --git a/gtkhtml/htmlengine-edit-cut-and-paste.c b/gtkhtml/htmlengine-edit-cut-and-paste.c
index faf456a..a95fd74 100644
--- a/gtkhtml/htmlengine-edit-cut-and-paste.c
+++ b/gtkhtml/htmlengine-edit-cut-and-paste.c
@@ -1884,9 +1884,9 @@ html_engine_delete (HTMLEngine *e)
/* go thru current cluev */
do {
- /* go thru current flow */
+ /* go thru current flow */
while (cur) {
- /* lets look if container is whole contained in the selection */
+ /* lets look if container is whole contained in the selection */
if (html_object_is_container (cur)) {
html_cursor_jump_to (e->cursor, e, cur, html_object_get_length (cur));
if (e->cursor->position > end->position) {
@@ -1903,7 +1903,7 @@ html_engine_delete (HTMLEngine *e)
} while (prev && prev->parent->next && (cur = html_object_head (prev->parent->next)));
if (prev) {
- /* cluev end is in the selection. Lets handle this case just like simple delete
+ /* cluev end is in the selection. Lets handle this case just like simple delete
since text is the selection itself*/
if (e->mark)
html_cursor_destroy (e->mark);
diff --git a/gtkhtml/htmlengine-edit-movement.c b/gtkhtml/htmlengine-edit-movement.c
index b22bd75..9f082d2 100644
--- a/gtkhtml/htmlengine-edit-movement.c
+++ b/gtkhtml/htmlengine-edit-movement.c
@@ -146,9 +146,9 @@ html_engine_jump_at (HTMLEngine *e,
if (obj == NULL)
return;
-/* printf ("jump to object type %d - %p offset %d\n", HTML_OBJECT_TYPE (obj), obj, offset); */
+/* printf ("jump to object type %d - %p offset %d\n", HTML_OBJECT_TYPE (obj), obj, offset); */
html_engine_jump_to_object (e, obj, offset);
-/* printf ("jumped to object type %d - %p offset: %d\n", HTML_OBJECT_TYPE (e->cursor->object), e->cursor->object, e->cursor->offset); */
+/* printf ("jumped to object type %d - %p offset: %d\n", HTML_OBJECT_TYPE (e->cursor->object), e->cursor->object, e->cursor->offset); */
}
diff --git a/gtkhtml/htmlengine-print.c b/gtkhtml/htmlengine-print.c
index 62acf3f..99bb109 100644
--- a/gtkhtml/htmlengine-print.c
+++ b/gtkhtml/htmlengine-print.c
@@ -141,7 +141,7 @@ print_all_pages (HTMLPainter *painter,
if (header_height + footer_height >= page_height) {
header_print = footer_print = NULL;
g_warning ("Page header height + footer height >= "
- "page height, disabling header/footer printing");
+ "page height, disabling header/footer printing");
}
body_height = page_height -
@@ -348,7 +348,7 @@ engine_print_begin_print (GtkPrintOperation *operation,
if (data->header_height + data->footer_height >= page_height) {
data->draw_header = data->draw_footer = NULL;
g_warning ("Page header height + footer height >= "
- "page height, disabling header/footer printing");
+ "page height, disabling header/footer printing");
}
/* Calculate page offsets */
diff --git a/gtkhtml/htmlengine-save.c b/gtkhtml/htmlengine-save.c
index 26c5c0b..895dc48 100644
--- a/gtkhtml/htmlengine-save.c
+++ b/gtkhtml/htmlengine-save.c
@@ -286,7 +286,7 @@ write_header (HTMLEngineSaveState *state)
html_engine_clear_all_class_data (state->engine);
/* Preface. */
if (! html_engine_save_output_string
- (state,
+ (state,
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 TRANSITIONAL//EN\">\n"
"<HTML>\n"))
return FALSE;
diff --git a/gtkhtml/htmlengine-save.h b/gtkhtml/htmlengine-save.h
index cf5f924..12c5860 100644
--- a/gtkhtml/htmlengine-save.h
+++ b/gtkhtml/htmlengine-save.h
@@ -58,8 +58,8 @@ gboolean html_engine_save_output_stringv (HTMLEngineSaveS
const gchar *format,
va_list ap);
gboolean html_engine_save_output_string (HTMLEngineSaveState *state,
- const gchar *format,
- ...) G_GNUC_PRINTF (2, 3);
+ const gchar *format,
+ ...) G_GNUC_PRINTF (2, 3);
gboolean html_engine_save_output_buffer (HTMLEngineSaveState *state,
const gchar *buffer,
int len);
diff --git a/gtkhtml/htmlengine.c b/gtkhtml/htmlengine.c
index dfbef05..d719461 100644
--- a/gtkhtml/htmlengine.c
+++ b/gtkhtml/htmlengine.c
@@ -937,9 +937,9 @@ insert_text (HTMLEngine *e,
if (NULL != prev)
if (HTML_IS_TEXT (prev))
- if (HTML_TEXT (prev)->text_bytes > 0)
- if (' ' == (HTML_TEXT (prev)->text)[HTML_TEXT (prev)->text_bytes - 1])
- prev_text_ends_in_space = TRUE ;
+ if (HTML_TEXT (prev)->text_bytes > 0)
+ if (' ' == (HTML_TEXT (prev)->text)[HTML_TEXT (prev)->text_bytes - 1])
+ prev_text_ends_in_space = TRUE ;
if (e->flow == NULL && e->editable) {
/* Preserve one leading space. */
@@ -2744,7 +2744,7 @@ element_parse_img (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
if (element->style->height) {
- height = element->style->height->val;
+ height = element->style->height->val;
percent_height = element->style->height->type == HTML_LENGTH_TYPE_PERCENT;
}
@@ -3113,7 +3113,7 @@ element_parse_option (HTMLEngine *e, HTMLObject *clue, const gchar *str)
element->style = html_style_set_display (element->style, DISPLAY_NONE);
pop_element (e, ID_OPTION);
- html_select_add_option (e->formSelect, value, selected);
+ html_select_add_option (e->formSelect, value, selected);
e->inOption = TRUE;
g_string_assign (e->formText, "");
@@ -3191,7 +3191,7 @@ block_end_table (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
if (table_align != HTML_HALIGN_LEFT && table_align != HTML_HALIGN_RIGHT) {
- finish_flow (e, clue);
+ finish_flow (e, clue);
DT(printf ("unaligned table(%p)\n", table);)
append_element (e, clue, HTML_OBJECT (table));
@@ -3296,7 +3296,7 @@ element_parse_table (HTMLEngine *e, HTMLObject *clue, const gchar *str)
element->style = html_style_add_width (element->style, value);
if (html_element_get_attr (element, "align", &value))
- element->style = html_style_add_text_align (element->style, parse_halign (value, HTML_HALIGN_NONE));
+ element->style = html_style_add_text_align (element->style, parse_halign (value, HTML_HALIGN_NONE));
if (html_element_get_attr (element, "bgcolor", &value)
&& !e->defaultSettings->forceDefault) {
@@ -3599,7 +3599,7 @@ element_parse_cell (HTMLEngine *e, HTMLObject *clue, const gchar *str)
cell = HTML_TABLE_CELL (html_table_cell_new (rowSpan, colSpan, table->padding));
- html_element_set_coreattr_to_object (element, HTML_OBJECT (cell), e);
+ html_element_set_coreattr_to_object (element, HTML_OBJECT (cell), e);
html_style_set_padding (element->style, table->padding);
html_cluev_set_style (HTML_CLUEV (cell), element->style);
@@ -4510,7 +4510,7 @@ html_engine_unrealize (HTMLEngine *e)
HTMLClueV (cluev)
HTMLClueFlow (head)
- HTMLObject (child) */
+ HTMLObject (child) */
void
html_engine_ensure_editable (HTMLEngine *engine)
{
diff --git a/gtkhtml/htmlengine.h b/gtkhtml/htmlengine.h
index 093f99c..abf666f 100644
--- a/gtkhtml/htmlengine.h
+++ b/gtkhtml/htmlengine.h
@@ -318,7 +318,7 @@ void html_engine_flush (HTMLEngine *e);
void html_engine_set_engine_type (HTMLEngine *e,
gboolean engine_type);
gboolean html_engine_get_engine_type (HTMLEngine *e);
-void html_engine_set_content_type(HTMLEngine *e,
+void html_engine_set_content_type(HTMLEngine *e,
const gchar* content_type);
const gchar * html_engine_get_content_type(HTMLEngine *e);
diff --git a/gtkhtml/htmlframe.c b/gtkhtml/htmlframe.c
index 80469d5..88fdc1f 100644
--- a/gtkhtml/htmlframe.c
+++ b/gtkhtml/htmlframe.c
@@ -562,7 +562,7 @@ html_frame_type_init (void)
void
html_frame_class_init (HTMLFrameClass *klass,
HTMLType type,
- guint size)
+ guint size)
{
HTMLEmbeddedClass *embedded_class;
HTMLObjectClass *object_class;
diff --git a/gtkhtml/htmlgdkpainter.c b/gtkhtml/htmlgdkpainter.c
index aa35422..7716cab 100644
--- a/gtkhtml/htmlgdkpainter.c
+++ b/gtkhtml/htmlgdkpainter.c
@@ -442,7 +442,7 @@ draw_background (HTMLPainter *painter,
gc = gdk_gc_new (gdk_painter->window);
- if (color || !gdk_pixbuf_get_has_alpha (pixbuf)) {
+ if (color || !gdk_pixbuf_get_has_alpha (pixbuf)) {
pixmap = gdk_pixmap_new (gdk_painter->window, dw, dh, -1);
if (color) {
diff --git a/gtkhtml/htmliframe.c b/gtkhtml/htmliframe.c
index 9cd0980..af40b9a 100644
--- a/gtkhtml/htmliframe.c
+++ b/gtkhtml/htmliframe.c
@@ -691,7 +691,7 @@ html_iframe_type_init (void)
void
html_iframe_class_init (HTMLIFrameClass *klass,
HTMLType type,
- guint size)
+ guint size)
{
HTMLEmbeddedClass *embedded_class;
HTMLObjectClass *object_class;
diff --git a/gtkhtml/htmlimage.h b/gtkhtml/htmlimage.h
index 07cb7d9..7a28678 100644
--- a/gtkhtml/htmlimage.h
+++ b/gtkhtml/htmlimage.h
@@ -148,7 +148,7 @@ void html_image_factory_cleanup (HTMLImageFactory *f
void html_image_factory_stop_animations (HTMLImageFactory *factory);
void html_image_factory_start_animations (HTMLImageFactory *factory);
void html_image_factory_set_animate (HTMLImageFactory *factory,
- gboolean animate);
+ gboolean animate);
gboolean html_image_factory_get_animate (HTMLImageFactory *factory);
void html_image_factory_deactivate_animations (HTMLImageFactory *factory);
HTMLImagePointer *html_image_factory_register (HTMLImageFactory *factory,
diff --git a/gtkhtml/htmlobject.h b/gtkhtml/htmlobject.h
index 280a657..8ba0ab0 100644
--- a/gtkhtml/htmlobject.h
+++ b/gtkhtml/htmlobject.h
@@ -402,8 +402,8 @@ void html_object_calc_abs_position_in_frame (HTMLObject *o,
int *x_return,
int *y_return);
gboolean html_object_intersect (HTMLObject *o,
- GdkRectangle *intersection,
- gint x,
+ GdkRectangle *intersection,
+ gint x,
gint y,
gint width,
gint height);
diff --git a/gtkhtml/htmlpainter.c b/gtkhtml/htmlpainter.c
index 12eaa42..5bd211d 100644
--- a/gtkhtml/htmlpainter.c
+++ b/gtkhtml/htmlpainter.c
@@ -921,13 +921,13 @@ html_painter_get_block_cite_width (HTMLPainter *painter, GtkHTMLFontStyle style,
guint
html_painter_get_page_width (HTMLPainter *painter, HTMLEngine *e)
{
- return (* HP_CLASS (painter)->get_page_width) (painter, e);
+ return (* HP_CLASS (painter)->get_page_width) (painter, e);
}
guint
html_painter_get_page_height (HTMLPainter *painter, HTMLEngine *e)
{
- return (* HP_CLASS (painter)->get_page_height) (painter, e);
+ return (* HP_CLASS (painter)->get_page_height) (painter, e);
}
/**
diff --git a/gtkhtml/htmlpainter.h b/gtkhtml/htmlpainter.h
index c84a4a2..1c6dea0 100644
--- a/gtkhtml/htmlpainter.h
+++ b/gtkhtml/htmlpainter.h
@@ -84,8 +84,8 @@ struct _HTMLPainterClass {
void (* set_background_color) (HTMLPainter *painter, const GdkColor *color);
void (* draw_shade_line) (HTMLPainter *p, gint x, gint y, gint width);
void (* draw_border) (HTMLPainter *painter, GdkColor *bg,
- gint x, gint y, gint width, gint height,
- HTMLBorderStyle style, gint bordersize);
+ gint x, gint y, gint width, gint height,
+ HTMLBorderStyle style, gint bordersize);
void (* set_clip_rectangle) (HTMLPainter *painter, gint x, gint y, gint width, gint height);
void (* draw_background) (HTMLPainter *painter, GdkColor *color, GdkPixbuf *pixbuf,
@@ -286,9 +286,9 @@ void html_painter_draw_embedded (HTMLPain
gint x,
gint y);
guint html_painter_get_page_width (HTMLPainter *painter,
- HTMLEngine *e);
+ HTMLEngine *e);
guint html_painter_get_page_height (HTMLPainter *painter,
- HTMLEngine *e);
+ HTMLEngine *e);
gint html_painter_pango_to_engine (HTMLPainter *painter,
gint pango_units);
gint html_painter_engine_to_pango (HTMLPainter *painter,
diff --git a/gtkhtml/htmlprinter.c b/gtkhtml/htmlprinter.c
index 6c19d1c..b40b1b0 100644
--- a/gtkhtml/htmlprinter.c
+++ b/gtkhtml/htmlprinter.c
@@ -398,7 +398,7 @@ draw_pixmap (HTMLPainter *painter, GdkPixbuf *pixbuf, gint x, gint y, gint scale
cairo_t *cr;
printer = HTML_PRINTER (painter);
- g_return_if_fail (printer->context != NULL);
+ g_return_if_fail (printer->context != NULL);
cr = gtk_print_context_get_cairo_context (printer->context);
page_height =(double) gtk_print_context_get_height (printer->context);
print_x = SCALE_ENGINE_TO_GNOME_PRINT (x);
@@ -454,7 +454,7 @@ draw_lines (HTMLPrinter *printer, double x, double y, double width, PangoAnalysi
double position = pango_units_to_double (pango_font_metrics_get_underline_position (metrics));
double ly = y + position - thickness / 2;
- cairo_new_path (cr);
+ cairo_new_path (cr);
cairo_move_to (cr, x, ly + 4);
cairo_line_to (cr, x + width, ly + 4);
cairo_set_line_width (cr, thickness);
@@ -495,12 +495,12 @@ draw_glyphs (HTMLPainter *painter, gint x, gint y, PangoItem *item, PangoGlyphSt
html_pango_get_item_properties (item, &properties);
pango_glyph_string_extents (glyphs, item->analysis.font, NULL, &log_rect);
- if (properties.bg_color) {
+ if (properties.bg_color) {
cairo_set_source_rgb (cr,
properties.bg_color->red / 65535.0,
properties.bg_color->green / 65535.0,
properties.bg_color->blue / 65535.0);
- cairo_rectangle (cr,
+ cairo_rectangle (cr,
print_x,
print_y + pango_units_to_double (log_rect.y + log_rect.height),
pango_units_to_double (log_rect.width),
@@ -514,7 +514,7 @@ draw_glyphs (HTMLPainter *painter, gint x, gint y, PangoItem *item, PangoGlyphSt
properties.fg_color->green / 65535.0,
properties.fg_color->blue / 65535.0);
} else {
- cairo_set_source_rgb (cr, 0., 0., 0.);
+ cairo_set_source_rgb (cr, 0., 0., 0.);
}
cairo_move_to (cr, print_x, print_y);
pango_cairo_show_glyph_string (cr,
diff --git a/gtkhtml/htmlsearch.c b/gtkhtml/htmlsearch.c
index ef39ce0..c5bd347 100644
--- a/gtkhtml/htmlsearch.c
+++ b/gtkhtml/htmlsearch.c
@@ -67,7 +67,7 @@ html_search_new (HTMLEngine *e, const gchar *text, gboolean case_sensitive, gboo
html_search_push (ns, o);
ns->stack = g_slist_reverse (ns->stack);
if (e->cursor->object)
- ns->found = g_list_append (ns->found, e->cursor->object);
+ ns->found = g_list_append (ns->found, e->cursor->object);
} else {
ns->stack = NULL;
ns->start_pos = 0;
diff --git a/gtkhtml/htmlsettings.h b/gtkhtml/htmlsettings.h
index 1c18e5c..b14b395 100644
--- a/gtkhtml/htmlsettings.h
+++ b/gtkhtml/htmlsettings.h
@@ -51,14 +51,14 @@ HTMLSettings * html_settings_new (GtkWidget *w);
void html_settings_reset (HTMLSettings *settings,
HTMLSettings *orig,
HTMLPainter *painter);
-void html_settings_destroy (HTMLSettings *settings);
-void html_settings_set_font_sizes (HTMLSettings *settings,
+void html_settings_destroy (HTMLSettings *settings);
+void html_settings_set_font_sizes (HTMLSettings *settings,
const gint *newFontSizes);
-void html_settings_get_font_sizes (HTMLSettings *settings,
+void html_settings_get_font_sizes (HTMLSettings *settings,
gint *fontSizes);
-void html_settings_reset_font_sizes (HTMLSettings *settings);
-void html_settings_copy (HTMLSettings *dest, HTMLSettings *src);
-void html_settings_set_font_base_face (HTMLSettings *settings, const gchar *face);
-void html_settings_set_fixed_font_face (HTMLSettings *settings, const gchar *face);
+void html_settings_reset_font_sizes (HTMLSettings *settings);
+void html_settings_copy (HTMLSettings *dest, HTMLSettings *src);
+void html_settings_set_font_base_face (HTMLSettings *settings, const gchar *face);
+void html_settings_set_fixed_font_face (HTMLSettings *settings, const gchar *face);
#endif /* _HTMLSETTINGS_H_ */
diff --git a/gtkhtml/htmlstyle.c b/gtkhtml/htmlstyle.c
index f5f129e..d92274e 100644
--- a/gtkhtml/htmlstyle.c
+++ b/gtkhtml/htmlstyle.c
@@ -465,7 +465,7 @@ html_style_add_attribute (HTMLStyle *style, const char *attr)
if (html_parse_color (g_strstrip (text + 7), &color)) {
HTMLColor *hc = html_color_new_from_gdk_color (&color);
style = html_style_add_color (style, hc);
- html_color_unref (hc);
+ html_color_unref (hc);
}
} else if (!g_ascii_strncasecmp ("background: ", text, 12)) {
@@ -474,7 +474,7 @@ html_style_add_attribute (HTMLStyle *style, const char *attr)
if (html_parse_color (text + 12, &color)) {
HTMLColor *hc = html_color_new_from_gdk_color (&color);
style = html_style_add_background_color (style, hc);
- html_color_unref (hc);
+ html_color_unref (hc);
}
} else if (!g_ascii_strncasecmp ("background-color: ", text, 18)) {
GdkColor color;
@@ -482,7 +482,7 @@ html_style_add_attribute (HTMLStyle *style, const char *attr)
if (html_parse_color (text + 18, &color)) {
HTMLColor *hc = html_color_new_from_gdk_color (&color);
style = html_style_add_background_color (style, hc);
- html_color_unref (hc);
+ html_color_unref (hc);
}
} else if (!g_ascii_strncasecmp ("background-image: ", text, 18)) {
style = html_style_add_background_image (style, text + 18);
diff --git a/gtkhtml/htmltable.c b/gtkhtml/htmltable.c
index 496662c..e29297d 100644
--- a/gtkhtml/htmltable.c
+++ b/gtkhtml/htmltable.c
@@ -1540,7 +1540,7 @@ divide_upto_preferred_width (HTMLTable *table, HTMLPainter *painter, GArray *pre
added += part;
max_size [c] += part;
left -= part;
- /* printf ("cell %d add: %d --> %d\n", c, part, max_size [c]); */
+ /* printf ("cell %d add: %d --> %d\n", c, part, max_size [c]); */
}
}
}
diff --git a/gtkhtml/htmltext.c b/gtkhtml/htmltext.c
index 43976d0..58b67f6 100644
--- a/gtkhtml/htmltext.c
+++ b/gtkhtml/htmltext.c
@@ -987,7 +987,7 @@ html_text_calc_part_width (HTMLText *text, HTMLPainter *painter, char *start, gi
} else {
width += pi->entries [idx].widths [offset];
line_offset ++;
- }
+ }
len --;
old_idx = idx;
@@ -998,7 +998,7 @@ html_text_calc_part_width (HTMLText *text, HTMLPainter *painter, char *start, gi
}
s = g_utf8_next_char (s);
- }
+ }
out:
if (asc)
@@ -2133,8 +2133,8 @@ move_spell_errors (GList *spell_errors, guint offset, gint delta)
se = (SpellError *) spell_errors->data;
if (se->off >= offset)
se->off += delta;
- spell_errors = spell_errors->next;
- }
+ spell_errors = spell_errors->next;
+ }
}
static GList *
@@ -2176,8 +2176,8 @@ remove_spell_errors (GList *spell_errors, guint offset, guint len)
spell_errors = remove_one (spell_errors, cur);
}
}
- cur = cnext;
- }
+ cur = cnext;
+ }
return spell_errors;
}
@@ -2867,7 +2867,7 @@ html_text_class_init (HTMLTextClass *klass,
object_class->cursor_right = html_text_cursor_right;
object_class->cursor_left = html_text_cursor_left;
object_class->backspace = html_text_backspace;
- object_class->get_right_edge_offset = html_text_get_right_edge_offset;
+ object_class->get_right_edge_offset = html_text_get_right_edge_offset;
object_class->get_left_edge_offset = html_text_get_left_edge_offset;
/* HTMLText methods. */
@@ -3383,21 +3383,21 @@ html_text_remove_links (HTMLText *text)
/* HTMLTextSlave * */
/* html_text_get_slave_at_offset (HTMLObject *o, gint offset) */
/* { */
-/* if (!o || (!HTML_IS_TEXT (o) && !HTML_IS_TEXT_SLAVE (o))) */
-/* return NULL; */
+/* if (!o || (!HTML_IS_TEXT (o) && !HTML_IS_TEXT_SLAVE (o))) */
+/* return NULL; */
-/* if (HTML_IS_TEXT (o)) */
-/* o = o->next; */
+/* if (HTML_IS_TEXT (o)) */
+/* o = o->next; */
-/* while (o && HTML_IS_TEXT_SLAVE (o)) { */
-/* if (HTML_IS_TEXT_SLAVE (o) && HTML_TEXT_SLAVE (o)->posStart <= offset */
-/* && (offset < HTML_TEXT_SLAVE (o)->posStart + HTML_TEXT_SLAVE (o)->posLen */
-/* || (offset == HTML_TEXT_SLAVE (o)->posStart + HTML_TEXT_SLAVE (o)->posLen && HTML_TEXT_SLAVE (o)->owner->text_len == offset))) */
-/* return HTML_TEXT_SLAVE (o); */
-/* o = o->next; */
-/* } */
+/* while (o && HTML_IS_TEXT_SLAVE (o)) { */
+/* if (HTML_IS_TEXT_SLAVE (o) && HTML_TEXT_SLAVE (o)->posStart <= offset */
+/* && (offset < HTML_TEXT_SLAVE (o)->posStart + HTML_TEXT_SLAVE (o)->posLen */
+/* || (offset == HTML_TEXT_SLAVE (o)->posStart + HTML_TEXT_SLAVE (o)->posLen && HTML_TEXT_SLAVE (o)->owner->text_len == offset))) */
+/* return HTML_TEXT_SLAVE (o); */
+/* o = o->next; */
+/* } */
-/* return NULL; */
+/* return NULL; */
/* } */
Link *
diff --git a/gtkhtml/htmltext.h b/gtkhtml/htmltext.h
index 4271883..ac44381 100644
--- a/gtkhtml/htmltext.h
+++ b/gtkhtml/htmltext.h
@@ -97,7 +97,7 @@ struct _HTMLText {
struct _HTMLTextClass {
HTMLObjectClass object_class;
- void (* queue_draw) (HTMLText *text, HTMLEngine *engine,
+ void (* queue_draw) (HTMLText *text, HTMLEngine *engine,
guint offset, guint len);
GtkHTMLFontStyle (* get_font_style) (const HTMLText *text);
@@ -224,7 +224,7 @@ void html_text_add_link_full (HTMLText *te
gint end_index,
gint start_offset,
gint end_offset);
-void html_text_set_link_visited (HTMLText *text,
+void html_text_set_link_visited (HTMLText *text,
gint offset,
HTMLEngine *engine,
gboolean is_visited);
diff --git a/gtkhtml/htmltextslave.c b/gtkhtml/htmltextslave.c
index 148d3cd..175f16b 100644
--- a/gtkhtml/htmltextslave.c
+++ b/gtkhtml/htmltextslave.c
@@ -796,7 +796,7 @@ draw_text (HTMLTextSlave *self,
if (calc_glyph_range_size (text, &gi->glyph_item, selection_start_index, selection_end_index, &start_x, &width, &asc, &height) && width > 0) {
html_painter_get_clip_rectangle (p, &cx, &cy, &cw, &ch);
-/* printf ("run_width; %d start_x %d index %d\n", run_width, start_x, selection_start_index); */
+/* printf ("run_width; %d start_x %d index %d\n", run_width, start_x, selection_start_index); */
html_painter_set_clip_rectangle (p,
obj->x + tx + html_painter_pango_to_engine (p, run_width + start_x),
obj->y + ty + get_ys (text, p) - html_painter_pango_to_engine (p, asc),
@@ -836,7 +836,7 @@ draw_text (HTMLTextSlave *self,
if (calc_glyph_range_size (text, &gi->glyph_item, se_start_index, se_end_index, &start_x, &width, &asc, &height)) {
html_painter_set_pen (p, &html_colorset_get_color_allocated (e->settings->color_set,
p, HTMLSpellErrorColor)->color);
- /* printf ("spell error: %s\n", html_text_get_text (slave->owner, off)); */
+ /* printf ("spell error: %s\n", html_text_get_text (slave->owner, off)); */
html_painter_draw_spell_error (p, obj->x + tx + html_painter_pango_to_engine (p, run_width + start_x),
obj->y + ty + get_ys (self->owner, p), html_painter_pango_to_engine (p, width));
@@ -1001,7 +1001,7 @@ calc_offset (HTMLTextSlave *slave, HTMLPainter *painter, gint x)
}
}
-/* printf ("offset %d\n", offset); */
+/* printf ("offset %d\n", offset); */
return offset;
}
@@ -1318,7 +1318,7 @@ html_text_slave_cursor_left_one (HTMLTextSlave *slave, HTMLPainter *painter, HTM
HTMLObject *prev_obj = HTML_OBJECT (slave->owner)->prev;
HTMLTextSlaveGlyphItem *gi = html_text_slave_get_glyph_item_at_offset (slave, painter, cursor->offset - slave->posStart, &prev, &next, NULL, &index);
-/* printf ("gi: %p item num chars: %d\n", gi, gi ? gi->glyph_item.item->num_chars : -1); */
+/* printf ("gi: %p item num chars: %d\n", gi, gi ? gi->glyph_item.item->num_chars : -1); */
if (!gi)
return FALSE;
@@ -1463,15 +1463,15 @@ html_text_slave_get_cursor_base (HTMLTextSlave *slave, HTMLPainter *painter, gui
gi = html_text_slave_get_glyph_item_at_offset (slave, painter, (int) offset, NULL, NULL, &start_width, &index);
-/* printf ("gi: %p index: %d start_width: %d item indexes %d %d\n", */
-/* gi, index, start_width, gi ? gi->glyph_item.item->offset : -1, */
-/* gi ? gi->glyph_item.item->offset + gi->glyph_item.item->length : -1); */
+/* printf ("gi: %p index: %d start_width: %d item indexes %d %d\n", */
+/* gi, index, start_width, gi ? gi->glyph_item.item->offset : -1, */
+/* gi ? gi->glyph_item.item->offset + gi->glyph_item.item->length : -1); */
if (gi) {
int start_x;
if (calc_glyph_range_size (slave->owner, &gi->glyph_item, index, index, &start_x, NULL, NULL, NULL) && x) {
-/* printf ("start_width: %d start_x: %d\n", start_width, start_x); */
+/* printf ("start_width: %d start_x: %d\n", start_width, start_x); */
*x += html_painter_pango_to_engine (painter, start_width + start_x);
}
}
diff --git a/gtkhtml/htmltokenizer.c b/gtkhtml/htmltokenizer.c
index d76f638..b2fa479 100644
--- a/gtkhtml/htmltokenizer.c
+++ b/gtkhtml/htmltokenizer.c
@@ -176,7 +176,7 @@ static void html_tokenizer_tokenize_one_char (HTMLTokenizer *t,
const gchar **src);
static void add_char(HTMLTokenizer *t, gchar c);
-gboolean is_need_convert(const gchar* token);
+gboolean is_need_convert(const gchar* token);
gchar* html_tokenizer_convert_entity(gchar * token);
@@ -953,7 +953,7 @@ in_comment (HTMLTokenizer *t, const gchar **src)
{
struct _HTMLTokenizerPrivate *p = t->priv;
- if (**src == '-') { /* Look for "-->" */
+ if (**src == '-') { /* Look for "-->" */
if (p->searchCount < 2)
p->searchCount++;
} else if (p->searchCount == 2 && (**src == '>')) {
@@ -1147,7 +1147,7 @@ end_tag (HTMLTokenizer *t, const gchar **src)
/* Make the tag lower case */
ptr = p->buffer + 2;
if (p->pre || *ptr == '/') {
- /* End tag */
+ /* End tag */
p->discard = NoneDiscard;
}
else {
diff --git a/gtkhtml/htmltokenizer.h b/gtkhtml/htmltokenizer.h
index f3186cc..6b84b36 100644
--- a/gtkhtml/htmltokenizer.h
+++ b/gtkhtml/htmltokenizer.h
@@ -74,7 +74,7 @@ void html_tokenizer_begin (HTMLTokenizer *t,
const gchar * html_tokenizer_get_content_type(HTMLTokenizer *t);
void html_tokenizer_change_content_type
- (HTMLTokenizer *t,
+ (HTMLTokenizer *t,
const gchar *content_type);
void html_tokenizer_set_engine_type (HTMLTokenizer *t,
diff --git a/gtkhtml/htmltype.c b/gtkhtml/htmltype.c
index ceaaccb..6aec447 100644
--- a/gtkhtml/htmltype.c
+++ b/gtkhtml/htmltype.c
@@ -118,53 +118,53 @@ html_type_name (HTMLType type)
case HTML_TYPE_ANCHOR:
return "Anchor";
case HTML_TYPE_BULLET:
- return "Bullet";
+ return "Bullet";
case HTML_TYPE_BUTTON:
- return "Button";
+ return "Button";
case HTML_TYPE_CHECKBOX:
- return "CheckBox";
+ return "CheckBox";
case HTML_TYPE_CLUE:
- return "Clue";
+ return "Clue";
case HTML_TYPE_CLUEALIGNED:
- return "ClueAligned";
+ return "ClueAligned";
case HTML_TYPE_CLUEFLOW:
- return "ClueFlow";
+ return "ClueFlow";
case HTML_TYPE_CLUEH:
- return "ClueH";
+ return "ClueH";
case HTML_TYPE_CLUEV:
- return "ClueV";
+ return "ClueV";
case HTML_TYPE_EMBEDDED:
- return "Embedded";
+ return "Embedded";
case HTML_TYPE_HIDDEN:
- return "Hidden";
+ return "Hidden";
case HTML_TYPE_HSPACE:
- return "HSpace";
+ return "HSpace";
case HTML_TYPE_IMAGE:
- return "Image";
+ return "Image";
case HTML_TYPE_IMAGEINPUT:
- return "ImageInput";
+ return "ImageInput";
case HTML_TYPE_LINKTEXT:
- return "LinkText";
+ return "LinkText";
case HTML_TYPE_OBJECT:
- return "Object";
+ return "Object";
case HTML_TYPE_RADIO:
- return "Radio";
+ return "Radio";
case HTML_TYPE_RULE:
- return "Rule";
+ return "Rule";
case HTML_TYPE_SELECT:
- return "Select";
+ return "Select";
case HTML_TYPE_TABLE:
- return "Table";
+ return "Table";
case HTML_TYPE_TABLECELL:
- return "TableCell";
+ return "TableCell";
case HTML_TYPE_TEXT:
- return "Text";
+ return "Text";
case HTML_TYPE_TEXTAREA:
- return "TextArea";
+ return "TextArea";
case HTML_TYPE_TEXTINPUT:
- return "TextInput";
+ return "TextInput";
case HTML_TYPE_TEXTSLAVE:
- return "TextSlave";
+ return "TextSlave";
case HTML_TYPE_IFRAME:
return "IFrame";
case HTML_TYPE_FRAME:
@@ -172,7 +172,7 @@ html_type_name (HTMLType type)
case HTML_TYPE_FRAMESET:
return "Framset";
case HTML_TYPE_NONE:
- case HTML_NUM_TYPES:
+ case HTML_NUM_TYPES:
/* Make compiler happy. */
g_assert_not_reached ();
}
diff --git a/gtkhtml/htmlundo-action.h b/gtkhtml/htmlundo-action.h
index 2481abf..2419c92 100644
--- a/gtkhtml/htmlundo-action.h
+++ b/gtkhtml/htmlundo-action.h
@@ -30,7 +30,7 @@
struct _HTMLUndoAction {
gchar *description; /* A text description of the action, to be displayed in the menus. */
- HTMLUndoFunc function; /* Function to call when the action is performed. */
+ HTMLUndoFunc function; /* Function to call when the action is performed. */
HTMLUndoData *data; /* Data to pass to the action function when it's called. */
guint position; /* Cursor position, to be set when the action is executed. */
guint position_after; /* cursor position to go after undo action executed */
diff --git a/gtkhtml/test-stress.c b/gtkhtml/test-stress.c
index f871c18..99836bd 100644
--- a/gtkhtml/test-stress.c
+++ b/gtkhtml/test-stress.c
@@ -140,7 +140,7 @@ static int test_level_1 (GtkHTML *html)
if (et == 1)
ch [0] = ' ';
- else
+ else
ch [0] = 'a' + (int) (26.0*rand()/(RAND_MAX+1.0));
ch [1] = 0;
html_engine_insert_text (html->engine, ch, 1);
diff --git a/gtkhtml/test-suite.c b/gtkhtml/test-suite.c
index 9a60783..48482c8 100644
--- a/gtkhtml/test-suite.c
+++ b/gtkhtml/test-suite.c
@@ -70,7 +70,7 @@ static void load_editable (GtkHTML *html, const char *s)
{
gtk_html_set_editable (html, FALSE);
gtk_html_load_from_string (html, s, -1);
-/* gtk_html_debug_dump_tree_simple (html->engine->clue, 0); */
+/* gtk_html_debug_dump_tree_simple (html->engine->clue, 0); */
gtk_html_set_editable (html, TRUE);
}
@@ -570,11 +570,11 @@ test_quotes_in_table (GtkHTML *html)
|| !HTML_CLUE (HTML_CLUE (e->clue)->head->next)->head || !HTML_IS_TABLE (HTML_CLUE (HTML_CLUE (e->clue)->head->next)->head))
return FALSE;
- table = HTML_TABLE (HTML_CLUE (HTML_CLUE (e->clue)->head->next)->head);
+ table = HTML_TABLE (HTML_CLUE (HTML_CLUE (e->clue)->head->next)->head);
- if (table->totalCols != 1 || table->totalRows != 1 || !table->cells [0][0] || !HTML_IS_TABLE_CELL (table->cells [0][0])
+ if (table->totalCols != 1 || table->totalRows != 1 || !table->cells [0][0] || !HTML_IS_TABLE_CELL (table->cells [0][0])
|| !HTML_CLUE (table->cells [0][0])->head || !HTML_IS_CLUEFLOW (HTML_CLUE (table->cells [0][0])->head))
- return FALSE;
+ return FALSE;
flow_levels = HTML_CLUEFLOW (HTML_CLUE (table->cells [0][0])->head)->levels;
@@ -742,8 +742,8 @@ int main (int argc, char *argv[])
gtk_container_add (GTK_CONTAINER (sw), html_widget);
gtk_container_add (GTK_CONTAINER (win), sw);
-/* gtk_widget_show_all (win); */
-/* gtk_widget_show_now (win); */
+/* gtk_widget_show_all (win); */
+/* gtk_widget_show_now (win); */
n_all = n_successful = 0;
diff --git a/gtkhtml/testgtkhtml.c b/gtkhtml/testgtkhtml.c
index 656d742..9bc077e 100644
--- a/gtkhtml/testgtkhtml.c
+++ b/gtkhtml/testgtkhtml.c
@@ -200,7 +200,7 @@ create_toolbars ()
GTK_WIDGET (item),
/* X direction */ /* Y direction */
0, 1, 0, 1,
- GTK_SHRINK, GTK_SHRINK,
+ GTK_SHRINK, GTK_SHRINK,
0, 0);
item = gtk_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD);
@@ -213,7 +213,7 @@ create_toolbars ()
GTK_WIDGET (item),
/* X direction */ /* Y direction */
1, 2, 0, 1,
- GTK_SHRINK, GTK_SHRINK,
+ GTK_SHRINK, GTK_SHRINK,
0, 0);
item = gtk_tool_button_new_from_stock (GTK_STOCK_STOP);
@@ -224,7 +224,7 @@ create_toolbars ()
GTK_WIDGET (item),
/* X direction */ /* Y direction */
2, 3, 0, 1,
- GTK_SHRINK, GTK_SHRINK,
+ GTK_SHRINK, GTK_SHRINK,
0, 0);
item = gtk_tool_button_new_from_stock (GTK_STOCK_REFRESH);
@@ -235,7 +235,7 @@ create_toolbars ()
GTK_WIDGET (item),
/* X direction */ /* Y direction */
3, 4, 0, 1,
- GTK_SHRINK, GTK_SHRINK,
+ GTK_SHRINK, GTK_SHRINK,
0, 0);
item = gtk_tool_button_new_from_stock (GTK_STOCK_HOME);
@@ -246,7 +246,7 @@ create_toolbars ()
GTK_WIDGET (item),
/* X direction */ /* Y direction */
4, 5, 0, 1,
- GTK_SHRINK, GTK_SHRINK,
+ GTK_SHRINK, GTK_SHRINK,
0, 0);
label = gtk_label_new ("Location:");
@@ -255,7 +255,7 @@ create_toolbars ()
label,
/* X direction */ /* Y direction */
5, 6, 0, 1,
- GTK_SHRINK, GTK_SHRINK,
+ GTK_SHRINK, GTK_SHRINK,
0, 0);
entry = gtk_entry_new ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
