[gtkhtml] Coding style cleanups.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkhtml] Coding style cleanups.
- Date: Mon, 13 Sep 2010 13:15:59 +0000 (UTC)
commit aa18ee3091b7b3cda23d9ab9de714ad362cbeae0
Author: Matthew Barnes <mbarnes redhat com>
Date: Mon Sep 13 08:22:52 2010 -0400
Coding style cleanups.
a11y/factory.c | 2 +-
a11y/html.c | 6 +-
a11y/object.c | 26 +++---
a11y/text.c | 118 ++++++++++----------
a11y/utils.c | 8 +-
gtkhtml/dllmain.c | 4 +-
gtkhtml/gtkhtml-embedded.c | 26 +++---
gtkhtml/gtkhtml.c | 46 ++++----
gtkhtml/htmlanchor.c | 2 +-
gtkhtml/htmlbutton.c | 6 +-
gtkhtml/htmlcheckbox.c | 10 +-
gtkhtml/htmlembedded.c | 30 +++---
gtkhtml/htmlengine-edit-cursor.c | 18 ++--
gtkhtml/htmlengine-edit-cut-and-paste.c | 2 +-
gtkhtml/htmlengine-edit-fontstyle.c | 2 +-
gtkhtml/htmlengine-edit-table.c | 2 +-
gtkhtml/htmlengine-edit.c | 2 +-
gtkhtml/htmlengine-save.c | 2 +-
gtkhtml/htmlengine.c | 102 +++++++++---------
gtkhtml/htmlengine.h | 4 +-
gtkhtml/htmlentity.c | 2 +-
gtkhtml/htmlform.c | 6 +-
gtkhtml/htmlframe.c | 14 ++--
gtkhtml/htmlgdkpainter.c | 14 ++--
gtkhtml/htmlhidden.c | 2 +-
gtkhtml/htmliframe.c | 12 +-
gtkhtml/htmlimage.c | 2 +-
gtkhtml/htmlimageinput.c | 2 +-
gtkhtml/htmlobject.h | 4 +-
gtkhtml/htmlpainter.c | 4 +-
gtkhtml/htmlprinter.c | 18 ++--
gtkhtml/htmlradio.c | 6 +-
gtkhtml/htmlsearch.c | 4 +-
gtkhtml/htmlselect.c | 4 +-
gtkhtml/htmltable.c | 4 +-
gtkhtml/htmltablecell.c | 2 +-
gtkhtml/htmltext.c | 2 +-
gtkhtml/htmltextarea.c | 2 +-
gtkhtml/htmltextinput.c | 16 ++--
gtkhtml/htmltokenizer.c | 28 +++---
gtkhtml/htmltokenizer.h | 2 +-
gtkhtml/htmltype.c | 2 +-
gtkhtml/htmlurl.c | 12 +-
gtkhtml/test-stress.c | 18 ++--
gtkhtml/testgtkhtml.c | 180 +++++++++++++++---------------
45 files changed, 390 insertions(+), 390 deletions(-)
---
diff --git a/a11y/factory.c b/a11y/factory.c
index 51fb52f..b051c75 100644
--- a/a11y/factory.c
+++ b/a11y/factory.c
@@ -57,7 +57,7 @@ gtk_html_accessibility_init (void)
if (accessibility_initialized)
return;
- if (atk_get_root())
+ if (atk_get_root ())
atk_registry_set_factory_type (atk_get_default_registry (), GTK_TYPE_HTML, gtk_html_a11y_factory_get_type ());
accessibility_initialized = TRUE;
diff --git a/a11y/html.c b/a11y/html.c
index fbf2c44..ea92ddf 100644
--- a/a11y/html.c
+++ b/a11y/html.c
@@ -162,8 +162,8 @@ html_a11y_get_parent (AtkObject *accessible)
parent_obj = get_parent_html (accessible);
if (parent_obj) {
parent = html_utils_get_accessible (parent_obj, NULL);
- if ((p = html_a11y_get_parent(parent)) != NULL) {
- atk_object_set_parent(parent, p);
+ if ((p = html_a11y_get_parent (parent)) != NULL) {
+ atk_object_set_parent (parent, p);
}
}
}
@@ -239,7 +239,7 @@ html_a11y_ref_child (AtkObject *accessible, gint index)
AtkStateSet * ss;
- ss = html_a11y_ref_state_set(accessible);
+ ss = html_a11y_ref_state_set (accessible);
if (atk_state_set_contains_state (ss, ATK_STATE_DEFUNCT)) {
g_object_unref (ss);
return NULL;
diff --git a/a11y/object.c b/a11y/object.c
index 38dbc7f..7e7bce8 100644
--- a/a11y/object.c
+++ b/a11y/object.c
@@ -286,7 +286,7 @@ gtk_html_a11y_get_focus_object (GtkWidget * widget)
AtkObject *obj = NULL;
gint offset;
- html = GTK_HTML(widget);
+ html = GTK_HTML (widget);
g_return_val_if_fail (html && html->engine, NULL);
@@ -304,7 +304,7 @@ gtk_html_a11y_get_focus_object (GtkWidget * widget)
static AtkObject * gtk_html_a11y_focus_object = NULL;
static void
-gtk_html_a11y_grab_focus_cb(GtkWidget * widget)
+gtk_html_a11y_grab_focus_cb (GtkWidget * widget)
{
AtkObject *focus_object, *obj, *clue;
@@ -314,8 +314,8 @@ gtk_html_a11y_grab_focus_cb(GtkWidget * widget)
obj = gtk_widget_get_accessible (widget);
- clue = html_utils_get_accessible(GTK_HTML(widget)->engine->clue, obj);
- atk_object_set_parent(clue, obj);
+ clue = html_utils_get_accessible (GTK_HTML (widget)->engine->clue, obj);
+ atk_object_set_parent (clue, obj);
gtk_html_a11y_focus_object = focus_object;
atk_focus_tracker_notify (focus_object);
@@ -333,10 +333,10 @@ gtk_html_a11y_cursor_changed_cb (GtkWidget *widget)
gtk_html_a11y_focus_object = focus_object;
atk_focus_tracker_notify (focus_object);
} else {
- if (G_IS_HTML_A11Y_TEXT(focus_object)) {
+ if (G_IS_HTML_A11Y_TEXT (focus_object)) {
gint offset;
- offset = (GTK_HTML(widget))->engine->cursor->offset;
+ offset = (GTK_HTML (widget))->engine->cursor->offset;
g_signal_emit_by_name(focus_object, "text_caret_moved",offset);
}
}
@@ -357,7 +357,7 @@ gtk_html_a11y_insert_object_cb (GtkWidget * widget, gint pos, gint len)
atk_focus_tracker_notify (a11y);
}
- if (G_IS_HTML_A11Y_TEXT(a11y)) {
+ if (G_IS_HTML_A11Y_TEXT (a11y)) {
g_signal_emit_by_name (a11y, "text_changed::insert", cursor->offset - len, len);
}
@@ -376,7 +376,7 @@ gtk_html_a11y_delete_object_cb (GtkWidget * widget, gint pos, gint len)
atk_focus_tracker_notify (a11y);
}
- if (G_IS_HTML_A11Y_TEXT(a11y)) {
+ if (G_IS_HTML_A11Y_TEXT (a11y)) {
g_signal_emit_by_name (a11y, "text_changed::delete", pos, len);
}
}
@@ -399,17 +399,17 @@ gtk_html_a11y_new (GtkWidget *widget)
G_CALLBACK (gtk_html_a11y_grab_focus_cb),
NULL);
g_signal_connect (widget, "cursor_changed",
- G_CALLBACK(gtk_html_a11y_cursor_changed_cb),
+ G_CALLBACK (gtk_html_a11y_cursor_changed_cb),
NULL);
g_signal_connect_after (widget, "object_inserted",
- G_CALLBACK(gtk_html_a11y_insert_object_cb),
+ G_CALLBACK (gtk_html_a11y_insert_object_cb),
NULL);
g_signal_connect_after (widget, "object_delete",
- G_CALLBACK(gtk_html_a11y_delete_object_cb),
+ G_CALLBACK (gtk_html_a11y_delete_object_cb),
NULL);
- if (GTK_HTML(widget)->engine->clue)
- html_utils_get_accessible(GTK_HTML(widget)->engine->clue, accessible);
+ if (GTK_HTML (widget)->engine->clue)
+ html_utils_get_accessible (GTK_HTML (widget)->engine->clue, accessible);
/* printf ("created new gtkhtml accessible object\n"); */
diff --git a/a11y/text.c b/a11y/text.c
index fc34c05..1492d49 100644
--- a/a11y/text.c
+++ b/a11y/text.c
@@ -333,7 +333,7 @@ html_a11y_text_ref_state_set (AtkObject *accessible)
if (!html || !html->engine)
return state_set;
- if (html_engine_get_editable(html->engine))
+ if (html_engine_get_editable (html->engine))
atk_state_set_add_state (state_set, ATK_STATE_EDITABLE);
atk_state_set_add_state (state_set, ATK_STATE_MULTI_LINE);
@@ -447,41 +447,41 @@ html_a11y_text_get_text (AtkText *text, gint start_offset, gint end_offset)
}
static gint
-html_a11y_text_get_caret_offset(AtkText * text)
+html_a11y_text_get_caret_offset (AtkText * text)
{
HTMLObject * p;
HTMLEngine * e;
GtkHTML * html;
- g_return_val_if_fail(text, 0);
+ g_return_val_if_fail (text, 0);
- p= HTML_A11Y_HTML(text);
- g_return_val_if_fail(p && HTML_IS_TEXT(p), 0);
+ p= HTML_A11Y_HTML (text);
+ g_return_val_if_fail (p && HTML_IS_TEXT (p), 0);
- html = GTK_HTML_A11Y_GTKHTML(html_a11y_get_gtkhtml_parent(HTML_A11Y(text)));
+ html = GTK_HTML_A11Y_GTKHTML (html_a11y_get_gtkhtml_parent (HTML_A11Y (text)));
- g_return_val_if_fail(html && GTK_IS_HTML(html) && html->engine, 0);
+ g_return_val_if_fail (html && GTK_IS_HTML (html) && html->engine, 0);
- e = html_engine_get_top_html_engine(html->engine);
+ e = html_engine_get_top_html_engine (html->engine);
- g_return_val_if_fail(e && e->cursor && e->cursor->object == p, 0);
+ g_return_val_if_fail (e && e->cursor && e->cursor->object == p, 0);
return e->cursor->offset;
}
static gboolean
-html_a11y_text_set_caret_offset(AtkText * text, gint offset)
+html_a11y_text_set_caret_offset (AtkText * text, gint offset)
{
GtkHTML * html;
HTMLEngine * e;
- HTMLObject * obj = HTML_A11Y_HTML(text);
+ HTMLObject * obj = HTML_A11Y_HTML (text);
- html = GTK_HTML_A11Y_GTKHTML(html_a11y_get_gtkhtml_parent(HTML_A11Y(text)));
+ html = GTK_HTML_A11Y_GTKHTML (html_a11y_get_gtkhtml_parent (HTML_A11Y (text)));
- g_return_val_if_fail(obj && html && html->engine, FALSE);
+ g_return_val_if_fail (obj && html && html->engine, FALSE);
e = html->engine;
- html_engine_jump_to_object(e, obj, offset);
+ html_engine_jump_to_object (e, obj, offset);
return TRUE;
}
@@ -692,7 +692,7 @@ html_a11y_text_add_selection (AtkText *text, gint start_offset, gint end_offset)
HTMLObject *obj = HTML_A11Y_HTML (text);
HTMLInterval *i;
- g_return_val_if_fail(html && html->engine, FALSE);
+ g_return_val_if_fail (html && html->engine, FALSE);
if (html_engine_is_selection_active (html->engine))
return FALSE;
@@ -761,7 +761,7 @@ html_a11y_text_get_run_attributes (AtkText *text,
g_return_val_if_fail (a11y, NULL);
html = GTK_HTML_A11Y_GTKHTML (a11y);
- g_return_val_if_fail (html && GTK_IS_HTML(html) && html->engine, NULL);
+ g_return_val_if_fail (html && GTK_IS_HTML (html) && html->engine, NULL);
e = html->engine;
attr = html_text_prepare_attrs (t, e->painter);
@@ -861,7 +861,7 @@ html_a11y_text_get_run_attributes (AtkText *text,
}
if ((pango_lang = (PangoAttrLanguage*) pango_attr_iterator_get (iter,
PANGO_ATTR_LANGUAGE)) != NULL) {
- value = g_strdup( pango_language_to_string( pango_lang->value));
+ value = g_strdup ( pango_language_to_string ( pango_lang->value));
attrib_set = gail_misc_add_attribute (attrib_set,
ATK_TEXT_ATTR_LANGUAGE,
value);
@@ -917,7 +917,7 @@ html_a11y_text_get_offset_at_point (AtkText *text, gint x, gint y,
gint text_x, text_y, text_height, text_width;
obj = HTML_A11Y_HTML (text);
- g_return_val_if_fail(obj && html_object_is_text(obj), -1);
+ g_return_val_if_fail (obj && html_object_is_text (obj), -1);
atk_component_get_extents (ATK_COMPONENT (text), &text_x, &text_y, &text_width, &text_height, coords);
@@ -930,7 +930,7 @@ html_a11y_text_get_offset_at_point (AtkText *text, gint x, gint y,
g_return_val_if_fail (top_a11y, -1);
top_html = GTK_HTML_A11Y_GTKHTML (top_a11y);
- g_return_val_if_fail (top_html && GTK_IS_HTML(top_html) && top_html->engine, -1);
+ g_return_val_if_fail (top_html && GTK_IS_HTML (top_html) && top_html->engine, -1);
top_e = top_html->engine;
atk_component_get_extents (ATK_COMPONENT (top_a11y), &html_x, &html_y, &html_width, &html_height, coords);
@@ -959,13 +959,13 @@ html_a11y_text_get_character_extents (AtkText *text, gint offset,
GtkHTMLA11Y *a11y;
obj = HTML_A11Y_HTML (text);
- g_return_if_fail(obj && html_object_is_text(obj));
+ g_return_if_fail (obj && html_object_is_text (obj));
a11y = html_a11y_get_top_gtkhtml_parent (HTML_A11Y (text));
g_return_if_fail (a11y);
html = GTK_HTML_A11Y_GTKHTML (a11y);
- g_return_if_fail(html && GTK_IS_HTML(html) && html->engine);
+ g_return_if_fail (html && GTK_IS_HTML (html) && html->engine);
e = html->engine;
atk_component_get_extents (ATK_COMPONENT (a11y), x, y, width, height, coords);
@@ -1004,19 +1004,19 @@ html_a11y_text_set_text_contents (AtkEditableText *text,
HTMLText *t;
/* fprintf(stderr, "atk set text contents called text %p\n", text);*/
- g_return_if_fail(string);
+ g_return_if_fail (string);
- html = GTK_HTML_A11Y_GTKHTML(html_a11y_get_gtkhtml_parent(HTML_A11Y(text)));
- g_return_if_fail(html && html->engine && html_engine_get_editable(html->engine));
- t = HTML_TEXT(HTML_A11Y_HTML(text));
+ html = GTK_HTML_A11Y_GTKHTML (html_a11y_get_gtkhtml_parent (HTML_A11Y (text)));
+ g_return_if_fail (html && html->engine && html_engine_get_editable (html->engine));
+ t = HTML_TEXT (HTML_A11Y_HTML (text));
g_return_if_fail (t);
html_engine_hide_cursor (html->engine);
- html_cursor_jump_to(html->engine->cursor, html->engine, HTML_OBJECT(t), 0);
- html_engine_set_mark(html->engine);
- html_cursor_jump_to(html->engine->cursor, html->engine, HTML_OBJECT(t), t->text_len);
+ html_cursor_jump_to (html->engine->cursor, html->engine, HTML_OBJECT (t), 0);
+ html_engine_set_mark (html->engine);
+ html_cursor_jump_to (html->engine->cursor, html->engine, HTML_OBJECT (t), t->text_len);
html_engine_update_selection_if_necessary (html->engine);
- html_engine_paste_text(html->engine, string, -1);
+ html_engine_paste_text (html->engine, string, -1);
html_engine_show_cursor (html->engine);
g_signal_emit_by_name(html, "grab_focus");
@@ -1033,14 +1033,14 @@ html_a11y_text_insert_text (AtkEditableText *text,
/* fprintf(stderr, "atk insert text called \n"); */
- g_return_if_fail(string && (length > 0));
- t = HTML_TEXT(HTML_A11Y_HTML(text));
+ g_return_if_fail (string && (length > 0));
+ t = HTML_TEXT (HTML_A11Y_HTML (text));
g_return_if_fail (t);
- html = GTK_HTML_A11Y_GTKHTML(html_a11y_get_gtkhtml_parent(HTML_A11Y(text)));
- g_return_if_fail(html && html->engine && html_engine_get_editable(html->engine));
- html_cursor_jump_to(html->engine->cursor, html->engine, HTML_OBJECT(t), *position);
- html_engine_paste_text(html->engine, string, -1);
+ html = GTK_HTML_A11Y_GTKHTML (html_a11y_get_gtkhtml_parent (HTML_A11Y (text)));
+ g_return_if_fail (html && html->engine && html_engine_get_editable (html->engine));
+ html_cursor_jump_to (html->engine->cursor, html->engine, HTML_OBJECT (t), *position);
+ html_engine_paste_text (html->engine, string, -1);
}
static void
@@ -1052,18 +1052,18 @@ html_a11y_text_copy_text (AtkEditableText *text,
HTMLText *t;
/* fprintf(stderr, "atk copy text called \n"); */
- html = GTK_HTML_A11Y_GTKHTML(html_a11y_get_gtkhtml_parent(HTML_A11Y(text)));
- g_return_if_fail(html && html->engine && html_engine_get_editable(html->engine));
- t = HTML_TEXT(HTML_A11Y_HTML(text));
+ html = GTK_HTML_A11Y_GTKHTML (html_a11y_get_gtkhtml_parent (HTML_A11Y (text)));
+ g_return_if_fail (html && html->engine && html_engine_get_editable (html->engine));
+ t = HTML_TEXT (HTML_A11Y_HTML (text));
g_return_if_fail (t);
html_engine_hide_cursor (html->engine);
- html_cursor_jump_to(html->engine->cursor, html->engine, HTML_OBJECT(t), start_pos);
- html_engine_set_mark(html->engine);
- html_cursor_jump_to(html->engine->cursor, html->engine, HTML_OBJECT(t), end_pos);
+ html_cursor_jump_to (html->engine->cursor, html->engine, HTML_OBJECT (t), start_pos);
+ html_engine_set_mark (html->engine);
+ html_cursor_jump_to (html->engine->cursor, html->engine, HTML_OBJECT (t), end_pos);
html_engine_update_selection_if_necessary (html->engine);
- html_engine_copy(html->engine);
+ html_engine_copy (html->engine);
html_engine_show_cursor (html->engine);
}
@@ -1076,17 +1076,17 @@ html_a11y_text_cut_text (AtkEditableText *text,
HTMLText *t;
/* fprintf(stderr, "atk cut text called.\n"); */
- html = GTK_HTML_A11Y_GTKHTML(html_a11y_get_gtkhtml_parent(HTML_A11Y(text)));
- g_return_if_fail(html && html->engine && html_engine_get_editable(html->engine));
- t = HTML_TEXT(HTML_A11Y_HTML(text));
+ html = GTK_HTML_A11Y_GTKHTML (html_a11y_get_gtkhtml_parent (HTML_A11Y (text)));
+ g_return_if_fail (html && html->engine && html_engine_get_editable (html->engine));
+ t = HTML_TEXT (HTML_A11Y_HTML (text));
g_return_if_fail (t);
html_engine_hide_cursor (html->engine);
- html_cursor_jump_to(html->engine->cursor, html->engine, HTML_OBJECT(t), start_pos);
- html_engine_set_mark(html->engine);
- html_cursor_jump_to(html->engine->cursor, html->engine, HTML_OBJECT(t), end_pos);
+ html_cursor_jump_to (html->engine->cursor, html->engine, HTML_OBJECT (t), start_pos);
+ html_engine_set_mark (html->engine);
+ html_cursor_jump_to (html->engine->cursor, html->engine, HTML_OBJECT (t), end_pos);
html_engine_update_selection_if_necessary (html->engine);
- html_engine_cut(html->engine);
+ html_engine_cut (html->engine);
html_engine_show_cursor (html->engine);
g_signal_emit_by_name(html, "grab_focus");
@@ -1101,13 +1101,13 @@ html_a11y_text_delete_text (AtkEditableText *text,
HTMLText *t;
/* fprintf(stderr, "atk delete text called.\n"); */
- html = GTK_HTML_A11Y_GTKHTML(html_a11y_get_gtkhtml_parent(HTML_A11Y(text)));
- g_return_if_fail(html && html->engine && html_engine_get_editable(html->engine));
- t = HTML_TEXT(HTML_A11Y_HTML(text));
+ html = GTK_HTML_A11Y_GTKHTML (html_a11y_get_gtkhtml_parent (HTML_A11Y (text)));
+ g_return_if_fail (html && html->engine && html_engine_get_editable (html->engine));
+ t = HTML_TEXT (HTML_A11Y_HTML (text));
g_return_if_fail (t);
- html_cursor_jump_to(html->engine->cursor, html->engine, HTML_OBJECT(t), start_pos);
- html_engine_delete_n(html->engine, end_pos-start_pos, TRUE);
+ html_cursor_jump_to (html->engine->cursor, html->engine, HTML_OBJECT (t), start_pos);
+ html_engine_delete_n (html->engine, end_pos-start_pos, TRUE);
g_signal_emit_by_name(html, "grab_focus");
}
@@ -1120,14 +1120,14 @@ html_a11y_text_paste_text (AtkEditableText *text,
/* fprintf(stderr, "atk paste text called.\n"); */
- html = GTK_HTML_A11Y_GTKHTML(html_a11y_get_gtkhtml_parent(HTML_A11Y(text)));
- g_return_if_fail(html && html->engine && html_engine_get_editable(html->engine));
- t = HTML_TEXT(HTML_A11Y_HTML(text));
+ html = GTK_HTML_A11Y_GTKHTML (html_a11y_get_gtkhtml_parent (HTML_A11Y (text)));
+ g_return_if_fail (html && html->engine && html_engine_get_editable (html->engine));
+ t = HTML_TEXT (HTML_A11Y_HTML (text));
g_return_if_fail (t);
html_engine_show_cursor (html->engine);
- html_cursor_jump_to(html->engine->cursor, html->engine, HTML_OBJECT(t), position);
- html_engine_paste(html->engine);
+ html_cursor_jump_to (html->engine->cursor, html->engine, HTML_OBJECT (t), position);
+ html_engine_paste (html->engine);
html_engine_show_cursor (html->engine);
g_signal_emit_by_name(html, "grab_focus");
diff --git a/a11y/utils.c b/a11y/utils.c
index d027b64..1ee1ee2 100644
--- a/a11y/utils.c
+++ b/a11y/utils.c
@@ -89,16 +89,16 @@ create_accessible (HTMLObject *o, AtkObject *parent)
}
static void
-acc_unref(gpointer data)
+acc_unref (gpointer data)
{
AtkStateSet * ss;
- g_object_set_data(G_OBJECT(data), HTML_ID, NULL);
+ g_object_set_data (G_OBJECT (data), HTML_ID, NULL);
ss = atk_object_ref_state_set (data);
atk_state_set_add_state (ss, ATK_STATE_DEFUNCT);
atk_object_notify_state_change (data, ATK_STATE_DEFUNCT, TRUE);
- g_object_unref(G_OBJECT(data));
+ g_object_unref (G_OBJECT (data));
}
AtkObject *
@@ -106,7 +106,7 @@ html_utils_get_accessible (HTMLObject *o, AtkObject *parent)
{
AtkObject *accessible;
- g_return_val_if_fail(o != NULL, NULL);
+ g_return_val_if_fail (o != NULL, NULL);
accessible = html_object_get_data_nocp (o, ACCESSIBLE_ID);
diff --git a/gtkhtml/dllmain.c b/gtkhtml/dllmain.c
index 02af04a..52d34df 100644
--- a/gtkhtml/dllmain.c
+++ b/gtkhtml/dllmain.c
@@ -63,8 +63,8 @@ setup (void)
return;
}
- prefix = g_win32_get_package_installation_directory_of_module(hmodule);
- cp_prefix = g_win32_locale_filename_from_utf8(prefix);
+ prefix = g_win32_get_package_installation_directory_of_module (hmodule);
+ cp_prefix = g_win32_locale_filename_from_utf8 (prefix);
localedir = replace_prefix (cp_prefix, GNOMELOCALEDIR);
g_free (cp_prefix);
diff --git a/gtkhtml/gtkhtml-embedded.c b/gtkhtml/gtkhtml-embedded.c
index a95da59..163b0f5 100644
--- a/gtkhtml/gtkhtml-embedded.c
+++ b/gtkhtml/gtkhtml-embedded.c
@@ -73,7 +73,7 @@ gtk_html_embedded_get_type (void)
}
static void
-free_param(gpointer key, gpointer value, gpointer data)
+free_param (gpointer key, gpointer value, gpointer data)
{
g_free (key);
g_free (value);
@@ -82,12 +82,12 @@ free_param(gpointer key, gpointer value, gpointer data)
static void
gtk_html_embedded_finalize (GObject *object)
{
- GtkHTMLEmbedded *eb = GTK_HTML_EMBEDDED(object);
+ GtkHTMLEmbedded *eb = GTK_HTML_EMBEDDED (object);
g_hash_table_foreach (eb->params, free_param, NULL);
g_hash_table_destroy (eb->params);
- g_free(eb->classid);
- g_free(eb->type);
+ g_free (eb->classid);
+ g_free (eb->type);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
@@ -105,8 +105,8 @@ static void gtk_html_embedded_add (GtkContainer *container, GtkWidget *child)
/* can't add something twice */
g_return_if_fail (gtk_bin_get_child (GTK_BIN (container)) == NULL);
- old_add(container, child);
- gtk_html_embedded_changed(GTK_HTML_EMBEDDED(container));
+ old_add (container, child);
+ gtk_html_embedded_changed (GTK_HTML_EMBEDDED (container));
}
static void gtk_html_embedded_remove (GtkContainer *container, GtkWidget *child)
@@ -114,9 +114,9 @@ static void gtk_html_embedded_remove (GtkContainer *container, GtkWidget *child)
g_return_if_fail (container != NULL);
g_return_if_fail (gtk_bin_get_child (GTK_BIN (container)) != NULL);
- old_remove(container, child);
+ old_remove (container, child);
- gtk_html_embedded_changed(GTK_HTML_EMBEDDED(container));
+ gtk_html_embedded_changed (GTK_HTML_EMBEDDED (container));
}
typedef void (*draw_print_signal)(GtkObject *, gpointer, gpointer);
@@ -274,10 +274,10 @@ gtk_html_embedded_new (gchar *classid, gchar *name, gchar *type, gchar *data, gi
em->width = width;
em->height = height;
- em->type = type ? g_strdup(type) : NULL;
- em->classid = g_strdup(classid);
- em->name = g_strdup(name);
- em->data = g_strdup(data);
+ em->type = type ? g_strdup (type) : NULL;
+ em->classid = g_strdup (classid);
+ em->name = g_strdup (name);
+ em->data = g_strdup (data);
return (GtkWidget *)em;
}
@@ -315,7 +315,7 @@ gtk_html_embedded_set_parameter (GtkHTMLEmbedded *ge, gchar *param, gchar *value
g_free (lookup);
g_hash_table_insert (ge->params,
lookup ? param : g_strdup (param),
- value ? g_strdup(value) : NULL);
+ value ? g_strdup (value) : NULL);
}
/**
diff --git a/gtkhtml/gtkhtml.c b/gtkhtml/gtkhtml.c
index 4bb7a45..dc45e1b 100644
--- a/gtkhtml/gtkhtml.c
+++ b/gtkhtml/gtkhtml.c
@@ -740,9 +740,9 @@ setup_scroll_timeout (GtkHTML *html)
html->priv->scroll_timeout_id = g_timeout_add (SCROLL_TIMEOUT_INTERVAL,
scroll_timeout_cb, html);
- GDK_THREADS_LEAVE();
+ GDK_THREADS_LEAVE ();
scroll_timeout_cb (html);
- GDK_THREADS_ENTER();
+ GDK_THREADS_ENTER ();
}
static void
@@ -967,7 +967,7 @@ gtk_html_set_fonts (GtkHTML *html, HTMLPainter *painter)
}
static void
-set_caret_mode(HTMLEngine *engine, gboolean caret_mode)
+set_caret_mode (HTMLEngine *engine, gboolean caret_mode)
{
if (engine->editable)
return;
@@ -978,7 +978,7 @@ set_caret_mode(HTMLEngine *engine, gboolean caret_mode)
engine->caret_mode = caret_mode;
if (caret_mode && !engine->parsing && !engine->timerId == 0)
- gtk_html_edit_make_cursor_visible(engine->widget);
+ gtk_html_edit_make_cursor_visible (engine->widget);
/* Normally, blink cursor handler is setup in focus in event.
* However, in the case focus already in this engine, and user
@@ -1093,7 +1093,7 @@ key_press_event (GtkWidget *widget, GdkEventKey *event)
url = html_object_get_complete_url (focus_object, focus_object_offset);
if (url) {
/* printf ("link clicked: %s\n", url); */
- if (HTML_IS_TEXT(focus_object)) {
+ if (HTML_IS_TEXT (focus_object)) {
html_text_set_link_visited (HTML_TEXT (focus_object), focus_object_offset, html->engine, TRUE);
g_signal_emit (html, signals[LINK_CLICKED], 0, url);
}
@@ -2139,8 +2139,8 @@ button_release_event (GtkWidget *initial_widget,
&& (!gtk_html_get_editable (html) || html->priv->in_url_test_mode)) {
g_signal_emit (widget, signals[LINK_CLICKED], 0, html->pointer_url);
focus_object = html_engine_get_focus_object (html->engine, &focus_object_offset);
- if (HTML_IS_TEXT(focus_object)) {
- html_text_set_link_visited (HTML_TEXT(focus_object), focus_object_offset, html->engine, TRUE);
+ if (HTML_IS_TEXT (focus_object)) {
+ html_text_set_link_visited (HTML_TEXT (focus_object), focus_object_offset, html->engine, TRUE);
}
if (html->priv->in_url_test_mode) {
@@ -2429,7 +2429,7 @@ set_adjustments (GtkLayout *layout,
GtkAdjustment *hadj,
GtkAdjustment *vadj)
{
- GtkHTML *html = GTK_HTML(layout);
+ GtkHTML *html = GTK_HTML (layout);
connect_adjustments (html, hadj, vadj);
@@ -2688,12 +2688,12 @@ static HTMLObject *
new_img_obj_from_uri (HTMLEngine *e, gchar *uri, gchar *title, gint len)
{
if (!strncmp (uri, "file:", 5)) {
- if (!HTML_IS_PLAIN_PAINTER(e->painter)) {
+ if (!HTML_IS_PLAIN_PAINTER (e->painter)) {
GdkPixbuf *pixbuf = NULL;
gchar *img_path = g_filename_from_uri (uri, NULL, NULL);
if (img_path) {
- pixbuf = gdk_pixbuf_new_from_file(img_path, NULL);
- g_free(img_path);
+ pixbuf = gdk_pixbuf_new_from_file (img_path, NULL);
+ g_free (img_path);
}
if (pixbuf) {
g_object_unref (pixbuf);
@@ -2756,7 +2756,7 @@ drag_data_received (GtkWidget *widget, GdkDragContext *context,
case DND_TARGET_TYPE_UTF8_STRING:
case DND_TARGET_TYPE_STRING:
case DND_TARGET_TYPE_TEXT_HTML:
- clipboard_paste_received_cb(
+ clipboard_paste_received_cb (
gtk_widget_get_clipboard (GTK_WIDGET (widget), GDK_SELECTION_PRIMARY),
selection_data, widget);
pasted = TRUE;
@@ -3716,7 +3716,7 @@ gtk_html_begin_full (GtkHTML *html,
/* Enable change content type in engine */
if (flags & GTK_HTML_BEGIN_CHANGECONTENTTYPE)
- gtk_html_set_default_engine(html, TRUE);
+ gtk_html_set_default_engine (html, TRUE);
return handle;
}
@@ -4158,16 +4158,16 @@ frame_set_animate (HTMLObject *o, HTMLEngine *e, gpointer data)
}
void
-gtk_html_set_caret_mode(GtkHTML * html, gboolean caret_mode)
+gtk_html_set_caret_mode (GtkHTML * html, gboolean caret_mode)
{
g_return_if_fail (GTK_IS_HTML (html));
g_return_if_fail (HTML_IS_ENGINE (html->engine));
- set_caret_mode(html->engine, caret_mode);
+ set_caret_mode (html->engine, caret_mode);
}
gboolean
-gtk_html_get_caret_mode(const GtkHTML *html)
+gtk_html_get_caret_mode (const GtkHTML *html)
{
g_return_val_if_fail (GTK_IS_HTML (html), FALSE);
g_return_val_if_fail (HTML_IS_ENGINE (html->engine), FALSE);
@@ -4702,27 +4702,27 @@ gtk_html_redo (GtkHTML *html)
/* misc utils */
/* if engine_type == false - default behaviour*/
void
-gtk_html_set_default_engine(GtkHTML *html, gboolean engine_type)
+gtk_html_set_default_engine (GtkHTML *html, gboolean engine_type)
{
- html_engine_set_engine_type( html->engine, engine_type);
+ html_engine_set_engine_type ( html->engine, engine_type);
}
gboolean
-gtk_html_get_default_engine(GtkHTML *html)
+gtk_html_get_default_engine (GtkHTML *html)
{
- return html_engine_get_engine_type( html->engine);
+ return html_engine_get_engine_type ( html->engine);
}
void
gtk_html_set_default_content_type (GtkHTML *html, const gchar *content_type)
{
- html_engine_set_content_type( html->engine, content_type);
+ html_engine_set_content_type ( html->engine, content_type);
}
const gchar *
gtk_html_get_default_content_type (GtkHTML *html)
{
- return html_engine_get_content_type( html->engine);
+ return html_engine_get_content_type ( html->engine);
}
gpointer
@@ -5211,7 +5211,7 @@ command (GtkHTML *html, GtkHTMLCommandType com_type)
case GTK_HTML_COMMAND_MODIFY_SELECTION_PAGEDOWN:
case GTK_HTML_COMMAND_MODIFY_SELECTION_PREV_WORD:
case GTK_HTML_COMMAND_MODIFY_SELECTION_NEXT_WORD:
- if (html->engine->caret_mode || html_engine_get_editable(e)) {
+ if (html->engine->caret_mode || html_engine_get_editable (e)) {
gtk_im_context_reset (html->priv->im_context);
rv = move_selection (html, com_type);
}
diff --git a/gtkhtml/htmlanchor.c b/gtkhtml/htmlanchor.c
index 8a7f130..d830138 100644
--- a/gtkhtml/htmlanchor.c
+++ b/gtkhtml/htmlanchor.c
@@ -56,7 +56,7 @@ copy (HTMLObject *self,
static HTMLAnchor *
find_anchor (HTMLObject *o, const gchar *name, gint *x, gint *y)
{
- if (strcmp (name, HTML_ANCHOR(o)->name->str) == 0) {
+ if (strcmp (name, HTML_ANCHOR (o)->name->str) == 0) {
*x += o->x;
*y += o->y;
diff --git a/gtkhtml/htmlbutton.c b/gtkhtml/htmlbutton.c
index 0089371..535cdd2 100644
--- a/gtkhtml/htmlbutton.c
+++ b/gtkhtml/htmlbutton.c
@@ -69,7 +69,7 @@ encode (HTMLEmbedded *e,const gchar *codepage)
GString *encoding = g_string_new ("");
gchar *ptr;
- if (strlen (e->name) && (HTML_BUTTON(e)->successful)) {
+ if (strlen (e->name) && (HTML_BUTTON (e)->successful)) {
ptr = html_embedded_encode_string (e->name, codepage);
encoding = g_string_append (encoding, ptr);
g_free (ptr);
@@ -82,7 +82,7 @@ encode (HTMLEmbedded *e,const gchar *codepage)
}
ptr = encoding->str;
- g_string_free(encoding, FALSE);
+ g_string_free (encoding, FALSE);
return ptr;
}
@@ -152,7 +152,7 @@ html_button_init (HTMLButton *button,
button->type = type;
button->successful = FALSE;
/* gtk_widget_show(element->widget);
- gtk_layout_put(GTK_LAYOUT(parent), element->widget, 0, 0);*/
+ gtk_layout_put (GTK_LAYOUT (parent), element->widget, 0, 0);*/
}
HTMLObject *
diff --git a/gtkhtml/htmlcheckbox.c b/gtkhtml/htmlcheckbox.c
index 524b613..7b95eb3 100644
--- a/gtkhtml/htmlcheckbox.c
+++ b/gtkhtml/htmlcheckbox.c
@@ -56,7 +56,7 @@ encode (HTMLEmbedded *e, const gchar *codepage)
}
ptr = encoding->str;
- g_string_free(encoding, FALSE);
+ g_string_free (encoding, FALSE);
return ptr;
}
@@ -65,7 +65,7 @@ encode (HTMLEmbedded *e, const gchar *codepage)
static void
reset (HTMLEmbedded *e)
{
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(e->widget), HTML_CHECKBOX(e)->default_checked);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (e->widget), HTML_CHECKBOX (e)->default_checked);
}
@@ -116,14 +116,14 @@ html_checkbox_init (HTMLCheckBox *checkbox,
html_embedded_init (element, HTML_EMBEDDED_CLASS (klass), parent, name, value);
- check = gtk_check_button_new();
+ check = gtk_check_button_new ();
html_embedded_set_widget (element, check);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), checked);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), checked);
checkbox->default_checked = checked;
/* gtk_widget_show(element->widget);
- gtk_layout_put(GTK_LAYOUT(parent), element->widget, 0, 0);*/
+ gtk_layout_put (GTK_LAYOUT (parent), element->widget, 0, 0);*/
}
HTMLObject *
diff --git a/gtkhtml/htmlembedded.c b/gtkhtml/htmlembedded.c
index 9cd0480..f9b9642 100644
--- a/gtkhtml/htmlembedded.c
+++ b/gtkhtml/htmlembedded.c
@@ -67,7 +67,7 @@ draw (HTMLObject *o,
gint width, gint height,
gint tx, gint ty)
{
- HTMLEmbedded *element = HTML_EMBEDDED(o);
+ HTMLEmbedded *element = HTML_EMBEDDED (o);
gint new_x, new_y;
d (printf ("draw embedded %p\n", element));
@@ -82,7 +82,7 @@ draw (HTMLObject *o,
if ((parent = gtk_widget_get_parent (element->widget))) {
if (new_x != element->abs_x || new_y != element->abs_y) {
d (printf ("element: %p moveto: %d,%d shown: %d\n", element, new_x, new_y, GTK_WIDGET_VISIBLE (element->widget)));
- gtk_layout_move (GTK_LAYOUT(parent), element->widget, new_x, new_y);
+ gtk_layout_move (GTK_LAYOUT (parent), element->widget, new_x, new_y);
} else if (!GTK_HTML (parent)->engine->expose)
gtk_widget_queue_draw (element->widget);
}
@@ -92,7 +92,7 @@ draw (HTMLObject *o,
if (!parent) {
d (printf ("element: %p put: %d,%d shown: %d\n", element, new_x, new_y, GTK_WIDGET_VISIBLE (element->widget)));
- gtk_layout_put (GTK_LAYOUT(element->parent), element->widget, new_x, new_y);
+ gtk_layout_put (GTK_LAYOUT (element->parent), element->widget, new_x, new_y);
}
}
@@ -109,9 +109,9 @@ destroy (HTMLObject *o)
element = HTML_EMBEDDED (o);
if (element->name)
- g_free(element->name);
+ g_free (element->name);
if (element->value)
- g_free(element->value);
+ g_free (element->value);
if (element->widget) {
GtkWidget *parent;
@@ -183,7 +183,7 @@ html_embedded_real_calc_size (HTMLObject *self, HTMLPainter *painter, GList **ch
requisition.width = requisition.height = 0;
gtk_widget_size_request (widget, &requisition);
- if (GTK_IS_HTML_EMBEDDED(widget))
+ if (GTK_IS_HTML_EMBEDDED (widget))
self->descent = GTK_HTML_EMBEDDED (widget)->descent * pixel_size;
else
self->descent = 0;
@@ -246,18 +246,18 @@ 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)) {
+ while (pos < strlen (str)) {
c = (guchar) str[pos];
if ( (( c >= 'A') && ( c <= 'Z')) ||
(( c >= 'a') && ( c <= 'z')) ||
(( c >= '0') && ( c <= '9')) ||
- (strchr(safe, c))
+ (strchr (safe, c))
)
{
encoded = g_string_append_c (encoded, c);
@@ -334,11 +334,11 @@ html_embedded_init (HTMLEmbedded *element,
element->form = NULL;
if (name)
- element->name = g_strdup(name);
+ element->name = g_strdup (name);
else
element->name = g_strdup("");
if (value)
- element->value = g_strdup(value);
+ element->value = g_strdup (value);
else
element->value = g_strdup("");
element->widget = NULL;
@@ -350,7 +350,7 @@ html_embedded_init (HTMLEmbedded *element,
}
static gboolean
-html_embedded_grab_cursor(GtkWidget *eb, GdkEvent *event)
+html_embedded_grab_cursor (GtkWidget *eb, GdkEvent *event)
{
/* Keep the focus! Fight the power */
return TRUE;
@@ -366,7 +366,7 @@ html_embedded_object_changed (GtkHTMLEmbedded *eb, HTMLEngine *e)
if (object)
html_object_calc_size (object, e->painter, NULL);
- html_engine_schedule_update(e);
+ html_engine_schedule_update (e);
}
HTMLEmbedded *
@@ -374,7 +374,7 @@ html_embedded_new_widget (GtkWidget *parent, GtkHTMLEmbedded *eb, HTMLEngine *en
{
HTMLEmbedded *em;
- em = g_new0(HTMLEmbedded, 1);
+ em = g_new0 (HTMLEmbedded, 1);
d (printf ("embedded %p new widget\n", em));
html_embedded_init (em, HTML_EMBEDDED_CLASS (&html_embedded_class), parent, eb->name, "");
diff --git a/gtkhtml/htmlengine-edit-cursor.c b/gtkhtml/htmlengine-edit-cursor.c
index 3f89f2a..5b8f1a5 100644
--- a/gtkhtml/htmlengine-edit-cursor.c
+++ b/gtkhtml/htmlengine-edit-cursor.c
@@ -64,10 +64,10 @@ html_engine_hide_cursor (HTMLEngine *engine)
if ((engine->editable || engine->caret_mode) && engine->cursor_hide_count == 0) {
if (!engine->editable) {
- e = html_object_engine(engine->cursor->object, NULL);
+ e = html_object_engine (engine->cursor->object, NULL);
if (e) {
e->caret_mode = engine->caret_mode;
- html_cursor_copy(e->cursor, engine->cursor);
+ html_cursor_copy (e->cursor, engine->cursor);
} else e = engine;
}
html_engine_draw_cursor_in_area (e, 0, 0, -1, -1);
@@ -89,10 +89,10 @@ html_engine_show_cursor (HTMLEngine *engine)
engine->cursor_hide_count--;
if ((engine->editable || engine->caret_mode) && engine->cursor_hide_count == 0) {
if (!engine->editable) {
- e = html_object_engine(engine->cursor->object, NULL);
+ e = html_object_engine (engine->cursor->object, NULL);
if (e) {
e->caret_mode = engine->caret_mode;
- html_cursor_copy(e->cursor, engine->cursor);
+ html_cursor_copy (e->cursor, engine->cursor);
} else e = engine;
}
html_engine_draw_cursor_in_area (e, 0, 0, -1, -1);
@@ -317,11 +317,11 @@ html_engine_draw_cursor_in_area (HTMLEngine *engine,
html_object_get_cursor (obj, engine->painter, offset, &x1, &y1, &x2, &y2);
while (obj) {
- if (html_object_is_frame(obj)) {
- x1 -= HTML_EMBEDDED(obj)->abs_x;
- x2 -= HTML_EMBEDDED(obj)->abs_x;
- y1 -= HTML_EMBEDDED(obj)->abs_y;
- y2 -= HTML_EMBEDDED(obj)->abs_y;
+ if (html_object_is_frame (obj)) {
+ x1 -= HTML_EMBEDDED (obj)->abs_x;
+ x2 -= HTML_EMBEDDED (obj)->abs_x;
+ y1 -= HTML_EMBEDDED (obj)->abs_y;
+ y2 -= HTML_EMBEDDED (obj)->abs_y;
break;
}
obj = obj->parent;
diff --git a/gtkhtml/htmlengine-edit-cut-and-paste.c b/gtkhtml/htmlengine-edit-cut-and-paste.c
index ee23ee9..b71924b 100644
--- a/gtkhtml/htmlengine-edit-cut-and-paste.c
+++ b/gtkhtml/htmlengine-edit-cut-and-paste.c
@@ -411,7 +411,7 @@ html_engine_copy_object (HTMLEngine *e, HTMLObject **o, guint *len)
void
html_engine_copy (HTMLEngine *e)
{
- html_engine_copy_object(e, &e->clipboard, &e->clipboard_len);
+ html_engine_copy_object (e, &e->clipboard, &e->clipboard_len);
}
struct _DeleteUndo {
diff --git a/gtkhtml/htmlengine-edit-fontstyle.c b/gtkhtml/htmlengine-edit-fontstyle.c
index 6f7740d..2a63a66 100644
--- a/gtkhtml/htmlengine-edit-fontstyle.c
+++ b/gtkhtml/htmlengine-edit-fontstyle.c
@@ -181,7 +181,7 @@ html_engine_get_document_color (HTMLEngine *engine)
return html_text_get_color_at_index (HTML_TEXT (obj), engine, g_utf8_offset_to_pointer (HTML_TEXT (obj)->text, offset) - HTML_TEXT (obj)->text);
} else {
HTMLColor *color = html_colorset_get_color (engine->settings->color_set, HTMLTextColor);
- html_color_ref(color);
+ html_color_ref (color);
return color;
}
}
diff --git a/gtkhtml/htmlengine-edit-table.c b/gtkhtml/htmlengine-edit-table.c
index ac957b0..8a24a0a 100644
--- a/gtkhtml/htmlengine-edit-table.c
+++ b/gtkhtml/htmlengine-edit-table.c
@@ -318,7 +318,7 @@ delete_cells_undo_destroy (HTMLUndoData *undo_data)
for (i = 0; i < data->size; i++)
if (data->cells[i])
html_object_destroy (HTML_OBJECT (data->cells[i]));
- g_free(data->cells);
+ g_free (data->cells);
}
static DeleteCellsUndo *
diff --git a/gtkhtml/htmlengine-edit.c b/gtkhtml/htmlengine-edit.c
index 00c7e31..d33fd57 100644
--- a/gtkhtml/htmlengine-edit.c
+++ b/gtkhtml/htmlengine-edit.c
@@ -96,7 +96,7 @@ html_engine_set_mark (HTMLEngine *e)
if (e->mark != NULL) {
html_engine_unselect_all (e);
- html_cursor_destroy(e->mark);
+ html_cursor_destroy (e->mark);
}
e->mark = html_cursor_dup (e->cursor);
diff --git a/gtkhtml/htmlengine-save.c b/gtkhtml/htmlengine-save.c
index 1bbf80a..4feede9 100644
--- a/gtkhtml/htmlengine-save.c
+++ b/gtkhtml/htmlengine-save.c
@@ -20,7 +20,7 @@
Boston, MA 02110-1301, USA.
Author: Ettore Perazzoli <ettore helixcode com>
- `encode_entities()' adapted from gnome-xml by Daniel Veillard
+ `encode_entities ()' adapted from gnome-xml by Daniel Veillard
<Daniel Veillard w3 org>.
*/
diff --git a/gtkhtml/htmlengine.c b/gtkhtml/htmlengine.c
index ecf80be..4d5949e 100644
--- a/gtkhtml/htmlengine.c
+++ b/gtkhtml/htmlengine.c
@@ -427,7 +427,7 @@ current_color (HTMLEngine *e) {
HTMLElement *span;
GList *item;
- g_return_val_if_fail( HTML_IS_ENGINE(e), NULL );
+ g_return_val_if_fail ( HTML_IS_ENGINE (e), NULL );
for (item = e->span_stack->list; item; item = item->next) {
span = item->data;
@@ -536,7 +536,7 @@ current_row_valign (HTMLEngine *e)
}
}
- DT(
+ DT (
if (ID_EQ (span->id, ID_TR))
DT(g_warning ("no row");)
);
@@ -575,7 +575,7 @@ current_row_align (HTMLEngine *e)
}
}
- DT(
+ DT (
if (ID_EQ (span->id, ID_TR))
DT(g_warning ("no row");)
);
@@ -1405,7 +1405,7 @@ new_parse_body (HTMLEngine *e, const gchar *end[])
gint i = 0;
while (end[i] != 0) {
- if (g_ascii_strncasecmp (str, end[i], strlen(end[i])) == 0) {
+ if (g_ascii_strncasecmp (str, end[i], strlen (end[i])) == 0) {
rv = str;
}
i++;
@@ -1466,7 +1466,7 @@ discard_body (HTMLEngine *p, const gchar *end[])
gint i = 0;
while (end[i] != 0) {
- if (g_ascii_strncasecmp (str + 1, end[i], strlen(end[i])) == 0) {
+ if (g_ascii_strncasecmp (str + 1, end[i], strlen (end[i])) == 0) {
g_free (str);
return TRUE;
}
@@ -1510,14 +1510,14 @@ element_parse_param (HTMLEngine *e, HTMLObject *clue, const gchar *str)
html_element_get_attr (element, "value", &value);
if (html_element_get_attr (element, "name", &name) && name)
- gtk_html_embedded_set_parameter(eb, name, value);
+ gtk_html_embedded_set_parameter (eb, name, value);
/* no close tag */
html_element_free (element);
}
static gboolean
-parse_object_params(HTMLEngine *p, HTMLObject *clue)
+parse_object_params (HTMLEngine *p, HTMLObject *clue)
{
gchar *str;
@@ -1637,7 +1637,7 @@ element_parse_object (HTMLEngine *e, HTMLObject *clue, const gchar *attr)
/* show alt text on TRUE */
if (object_found) {
- append_element (e, clue, HTML_OBJECT(el));
+ append_element (e, clue, HTML_OBJECT (el));
/* automatically add this to a form if it is part of one */
if (e->form)
html_form_add_element (e->form, HTML_EMBEDDED (el));
@@ -2165,8 +2165,8 @@ element_parse_body (HTMLEngine *e, HTMLObject *clue, const gchar *str)
bgurl = g_strdup (token + 11);
if (e->bgPixmapPtr != NULL)
- html_image_factory_unregister(e->image_factory, e->bgPixmapPtr, NULL);
- e->bgPixmapPtr = html_image_factory_register(e->image_factory, NULL, bgurl, FALSE);
+ html_image_factory_unregister (e->image_factory, e->bgPixmapPtr, NULL);
+ e->bgPixmapPtr = html_image_factory_register (e->image_factory, NULL, bgurl, FALSE);
g_free (bgurl);
} else if (g_ascii_strncasecmp( token, "text=", 5) == 0
&& !e->defaultSettings->forceDefault ) {
@@ -2217,7 +2217,7 @@ element_parse_base (HTMLEngine *e, HTMLObject *clue, const gchar *str)
html_string_tokenizer_tokenize( e->st, str + 5, " >" );
while (html_string_tokenizer_has_more_tokens (e->st)) {
- const gchar * token = html_string_tokenizer_next_token(e->st);
+ const gchar * token = html_string_tokenizer_next_token (e->st);
if (g_ascii_strncasecmp( token, "target=", 7 ) == 0) {
g_signal_emit (e, signals[SET_BASE_TARGET], 0, token + 7);
} else if (g_ascii_strncasecmp( token, "href=", 5 ) == 0) {
@@ -2341,16 +2341,16 @@ element_parse_input (HTMLEngine *e, HTMLObject *clue, const gchar *str)
type = Image;
}
else if (g_ascii_strncasecmp( token, "name=", 5 ) == 0) {
- name = g_strdup(token + 5);
+ name = g_strdup (token + 5);
}
else if (g_ascii_strncasecmp( token, "value=", 6 ) == 0) {
- value = g_strdup(token + 6);
+ value = g_strdup (token + 6);
}
else if (g_ascii_strncasecmp( token, "size=", 5 ) == 0) {
- size = atoi( token + 5 );
+ size = atoi ( token + 5 );
}
else if (g_ascii_strncasecmp( token, "maxlength=", 10 ) == 0) {
- maxLen = atoi( token + 10 );
+ maxLen = atoi ( token + 10 );
}
else if (g_ascii_strncasecmp( token, "checked", 7 ) == 0) {
checked = TRUE;
@@ -2370,31 +2370,31 @@ element_parse_input (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
switch (type) {
case CheckBox:
- element = html_checkbox_new(GTK_WIDGET(e->widget), name, value, checked);
+ element = html_checkbox_new (GTK_WIDGET (e->widget), name, value, checked);
break;
case Hidden:
{
- HTMLObject *hidden = html_hidden_new(name, value);
+ HTMLObject *hidden = html_hidden_new (name, value);
html_form_add_hidden (e->form, HTML_HIDDEN (hidden));
break;
}
case Radio:
- element = html_radio_new(GTK_WIDGET(e->widget), name, value, checked, e->form);
+ element = html_radio_new (GTK_WIDGET (e->widget), name, value, checked, e->form);
break;
case Reset:
- element = html_button_new(GTK_WIDGET(e->widget), name, value, BUTTON_RESET);
+ element = html_button_new (GTK_WIDGET (e->widget), name, value, BUTTON_RESET);
break;
case Submit:
- element = html_button_new(GTK_WIDGET(e->widget), name, value, BUTTON_SUBMIT);
+ element = html_button_new (GTK_WIDGET (e->widget), name, value, BUTTON_SUBMIT);
break;
case Button:
- element = html_button_new(GTK_WIDGET(e->widget), name, value, BUTTON_NORMAL);
+ element = html_button_new (GTK_WIDGET (e->widget), name, value, BUTTON_NORMAL);
break;
case Text:
case Password:
- element = html_text_input_new(GTK_WIDGET(e->widget), name, value, size, maxLen, (type == Password));
+ element = html_text_input_new (GTK_WIDGET (e->widget), name, value, size, maxLen, (type == Password));
break;
case Image:
/* FIXME fixup missing url */
@@ -2442,13 +2442,13 @@ element_parse_form (HTMLEngine *e, HTMLObject *clue, const gchar *str)
if (g_ascii_strncasecmp( token + 7, "post", 4 ) == 0)
method = "POST";
} else if (g_ascii_strncasecmp( token, "target=", 7 ) == 0) {
- target = g_strdup(token + 7);
+ target = g_strdup (token + 7);
}
}
form_begin (e, clue, action, method, TRUE);
- g_free(action);
- g_free(target);
+ g_free (action);
+ g_free (target);
push_block (e, ID_FORM, DISPLAY_BLOCK, block_end_form, TRUE, 0);
}
@@ -2783,31 +2783,31 @@ element_parse_img (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
void
-html_engine_set_engine_type( HTMLEngine *e, gboolean engine_type)
+html_engine_set_engine_type ( HTMLEngine *e, gboolean engine_type)
{
g_return_if_fail (HTML_IS_ENGINE (e));
- html_tokenizer_set_engine_type(e->ht, engine_type);
+ html_tokenizer_set_engine_type (e->ht, engine_type);
}
gboolean
-html_engine_get_engine_type( HTMLEngine *e)
+html_engine_get_engine_type ( HTMLEngine *e)
{
g_return_val_if_fail (HTML_IS_ENGINE (e), FALSE);
- return html_tokenizer_get_engine_type(e->ht);
+ return html_tokenizer_get_engine_type (e->ht);
}
void
-html_engine_set_content_type(HTMLEngine *e, const gchar * content_type)
+html_engine_set_content_type (HTMLEngine *e, const gchar * content_type)
{
g_return_if_fail (HTML_IS_ENGINE (e));
- html_tokenizer_change_content_type(e->ht, content_type);
+ html_tokenizer_change_content_type (e->ht, content_type);
}
const gchar *
-html_engine_get_content_type(HTMLEngine *e)
+html_engine_get_content_type (HTMLEngine *e)
{
g_return_val_if_fail (HTML_IS_ENGINE (e), NULL);
- return html_tokenizer_get_content_type(e->ht);
+ return html_tokenizer_get_content_type (e->ht);
}
static void
@@ -2822,7 +2822,7 @@ element_parse_meta (HTMLEngine *e, HTMLObject *clue, const gchar *str)
html_string_tokenizer_tokenize(e->st, str + 5, " >");
while (html_string_tokenizer_has_more_tokens (e->st)) {
- const gchar * token = html_string_tokenizer_next_token(e->st);
+ const gchar * token = html_string_tokenizer_next_token (e->st);
if (g_ascii_strncasecmp(token, "http-equiv=", 11) == 0 ) {
if (g_ascii_strncasecmp(token + 11, "refresh", 7) == 0 )
refresh = 1;
@@ -2834,24 +2834,24 @@ element_parse_meta (HTMLEngine *e, HTMLObject *clue, const gchar *str)
if (contenttype)
{
contenttype = 0;
- html_engine_set_content_type(e, content);
+ html_engine_set_content_type (e, content);
}
if (refresh) {
refresh = 0;
/* The time in seconds until the refresh */
- refresh_delay = atoi(content);
+ refresh_delay = atoi (content);
html_string_tokenizer_tokenize(e->st, content, ",;> ");
while (html_string_tokenizer_has_more_tokens (e->st)) {
- token = html_string_tokenizer_next_token(e->st);
+ token = html_string_tokenizer_next_token (e->st);
if (g_ascii_strncasecmp( token, "url=", 4 ) == 0)
refresh_url = g_strdup (token + 4);
}
g_signal_emit (e, signals[REDIRECT], 0, refresh_url, refresh_delay);
if (refresh_url)
- g_free(refresh_url);
+ g_free (refresh_url);
}
}
}
@@ -3156,10 +3156,10 @@ element_parse_select (HTMLEngine *e, HTMLObject *clue, const gchar *str)
element->style = html_style_set_display (element->style, DISPLAY_NONE);
- e->formSelect = HTML_SELECT (html_select_new (GTK_WIDGET(e->widget), name, size, multi));
+ e->formSelect = HTML_SELECT (html_select_new (GTK_WIDGET (e->widget), name, size, multi));
html_form_add_element (e->form, HTML_EMBEDDED ( e->formSelect ));
append_element (e, clue, HTML_OBJECT (e->formSelect));
- g_free(name);
+ g_free (name);
element->exitFunc = block_end_select;
html_stack_push (e->span_stack, element);
@@ -3491,7 +3491,7 @@ element_parse_caption (HTMLEngine *e, HTMLObject *clue, const gchar *str)
html_string_tokenizer_tokenize( e->st, str + 7, " >" );
while (html_string_tokenizer_has_more_tokens (e->st)) {
- const gchar * token = html_string_tokenizer_next_token(e->st);
+ const gchar * token = html_string_tokenizer_next_token (e->st);
if (g_ascii_strncasecmp( token, "align=", 6) == 0) {
if (g_ascii_strncasecmp( token+6, "top", 3) == 0)
capAlign = HTML_VALIGN_TOP;
@@ -3621,7 +3621,7 @@ element_parse_cell (HTMLEngine *e, HTMLObject *clue, const gchar *str)
if (image_url) {
HTMLImagePointer *ip;
- ip = html_image_factory_register(e->image_factory, NULL, image_url, FALSE);
+ ip = html_image_factory_register (e->image_factory, NULL, image_url, FALSE);
html_table_cell_set_bg_pixmap (cell, ip);
}
@@ -3660,7 +3660,7 @@ element_parse_textarea (HTMLEngine *e, HTMLObject *clue, const gchar *str)
const gchar *token = html_string_tokenizer_next_token (e->st);
if (g_ascii_strncasecmp (token, "name=", 5) == 0) {
- name = g_strdup(token + 5);
+ name = g_strdup (token + 5);
} else if (g_ascii_strncasecmp (token, "rows=", 5) == 0) {
rows = atoi (token + 5);
} else if (g_ascii_strncasecmp (token, "cols=", 5) == 0) {
@@ -3668,7 +3668,7 @@ element_parse_textarea (HTMLEngine *e, HTMLObject *clue, const gchar *str)
}
}
- e->formTextArea = HTML_TEXTAREA (html_textarea_new (GTK_WIDGET(e->widget), name, rows, cols));
+ e->formTextArea = HTML_TEXTAREA (html_textarea_new (GTK_WIDGET (e->widget), name, rows, cols));
html_form_add_element (e->form, HTML_EMBEDDED ( e->formTextArea ));
append_element (e, clue, HTML_OBJECT (e->formTextArea));
@@ -3676,7 +3676,7 @@ element_parse_textarea (HTMLEngine *e, HTMLObject *clue, const gchar *str)
g_string_assign (e->formText, "");
e->inTextArea = TRUE;
- g_free(name);
+ g_free (name);
push_block (e, ID_TEXTAREA, DISPLAY_BLOCK, block_end_textarea, 0, 0);
}
@@ -4224,7 +4224,7 @@ html_engine_finalize (GObject *object)
html_engine_map_table_clear (engine);
html_engine_id_table_clear (engine);
html_engine_clear_all_class_data (engine);
- g_free(engine->language);
+ g_free (engine->language);
if (engine->insertion_url) {
g_free (engine->insertion_url);
@@ -4406,7 +4406,7 @@ html_engine_init (HTMLEngine *engine)
engine->ht = html_tokenizer_new ();
engine->st = html_string_tokenizer_new ();
- engine->image_factory = html_image_factory_new(engine);
+ engine->image_factory = html_image_factory_new (engine);
engine->undo = html_undo_new ();
@@ -4790,7 +4790,7 @@ update_embedded (GtkWidget *widget, gpointer data)
if (!gtk_widget_get_parent (emb->widget)) {
gtk_layout_put (GTK_LAYOUT (emb->parent), emb->widget, x, y);
} else {
- gtk_layout_move (GTK_LAYOUT(emb->parent), emb->widget, x, y);
+ gtk_layout_move (GTK_LAYOUT (emb->parent), emb->widget, x, y);
}
}
}
@@ -5321,7 +5321,7 @@ html_engine_calc_size (HTMLEngine *e, GList **changed_objs)
static void
destroy_form (gpointer data, gpointer user_data)
{
- html_form_destroy (HTML_FORM(data));
+ html_form_destroy (HTML_FORM (data));
}
void
@@ -5387,7 +5387,7 @@ html_engine_parse (HTMLEngine *e)
/* Free the background pixmap */
if (e->bgPixmapPtr) {
- html_image_factory_unregister(e->image_factory, e->bgPixmapPtr, NULL);
+ html_image_factory_unregister (e->image_factory, e->bgPixmapPtr, NULL);
e->bgPixmapPtr = NULL;
}
@@ -6758,7 +6758,7 @@ html_engine_update_focus_if_necessary (HTMLEngine *e, HTMLObject *obj, gint offs
{
gchar *url = NULL;
- if (html_engine_get_editable(e))
+ if (html_engine_get_editable (e))
return;
if (obj && (((HTML_IS_IMAGE (obj) && HTML_IMAGE (obj)->url && *HTML_IMAGE (obj)->url))
diff --git a/gtkhtml/htmlengine.h b/gtkhtml/htmlengine.h
index ee97df5..a3ff3ac 100644
--- a/gtkhtml/htmlengine.h
+++ b/gtkhtml/htmlengine.h
@@ -319,9 +319,9 @@ 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);
+const gchar * html_engine_get_content_type (HTMLEngine *e);
/* Rendering control. */
gint html_engine_calc_min_width (HTMLEngine *e);
diff --git a/gtkhtml/htmlentity.c b/gtkhtml/htmlentity.c
index 2ece22a..0a0e982 100644
--- a/gtkhtml/htmlentity.c
+++ b/gtkhtml/htmlentity.c
@@ -868,7 +868,7 @@ html_entity_hash (register const gchar *str, register guint len)
gulong
html_entity_parse (const gchar *s, guint len)
{
- struct _EntityEntry * result = html_entity_hash( s, len);
+ struct _EntityEntry * result = html_entity_hash ( s, len);
if (result == NULL )
return INVALID_ENTITY_CHARACTER_MARKER;
return result->value;
diff --git a/gtkhtml/htmlform.c b/gtkhtml/htmlform.c
index 2b339d6..d0e685e 100644
--- a/gtkhtml/htmlform.c
+++ b/gtkhtml/htmlform.c
@@ -31,8 +31,8 @@ html_form_new (HTMLEngine *engine, const gchar *_action, const gchar *_method)
HTMLForm *new;
new = g_new (HTMLForm, 1);
- new->action = g_strdup(_action);
- new->method = g_strdup(_method);
+ new->action = g_strdup (_action);
+ new->method = g_strdup (_method);
new->elements = NULL;
new->hidden = NULL;
@@ -126,7 +126,7 @@ html_form_submit (HTMLForm *form)
GList *i = form->elements;
gchar *ptr;
- const gchar * codepage = html_engine_get_content_type(form->engine);
+ const gchar * codepage = html_engine_get_content_type (form->engine);
while (i) {
ptr = html_embedded_encode (HTML_EMBEDDED (i->data), codepage);
diff --git a/gtkhtml/htmlframe.c b/gtkhtml/htmlframe.c
index 1418bb0..b3bdd19 100644
--- a/gtkhtml/htmlframe.c
+++ b/gtkhtml/htmlframe.c
@@ -43,7 +43,7 @@ static void
frame_url_requested (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, gpointer data)
{
HTMLFrame *frame = HTML_FRAME (data);
- GtkHTML *parent = GTK_HTML (HTML_EMBEDDED(frame)->parent);
+ GtkHTML *parent = GTK_HTML (HTML_EMBEDDED (frame)->parent);
if (!html->engine->stopped)
g_signal_emit_by_name (parent->engine, "url_requested", url, handle);
@@ -67,7 +67,7 @@ frame_submit (GtkHTML *html,
gpointer data)
{
HTMLFrame *frame = HTML_FRAME (data);
- GtkHTML *parent = GTK_HTML (HTML_EMBEDDED(frame)->parent);
+ GtkHTML *parent = GTK_HTML (HTML_EMBEDDED (frame)->parent);
g_signal_emit_by_name (parent, "submit", method, action, encoding);
}
@@ -76,7 +76,7 @@ static void
frame_size_changed (GtkHTML *html, gpointer data)
{
HTMLFrame *frame = HTML_FRAME (data);
- GtkHTML *parent = GTK_HTML (HTML_EMBEDDED(frame)->parent);
+ GtkHTML *parent = GTK_HTML (HTML_EMBEDDED (frame)->parent);
html_engine_schedule_update (parent->engine);
}
@@ -85,7 +85,7 @@ static gboolean
frame_object_requested (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data)
{
HTMLFrame *frame = HTML_FRAME (data);
- GtkHTML *parent = GTK_HTML (HTML_EMBEDDED(frame)->parent);
+ GtkHTML *parent = GTK_HTML (HTML_EMBEDDED (frame)->parent);
gboolean ret_val;
ret_val = FALSE;
@@ -128,7 +128,7 @@ html_frame_new (GtkWidget *parent,
}
static gboolean
-html_frame_grab_cursor(GtkWidget *frame, GdkEvent *event)
+html_frame_grab_cursor (GtkWidget *frame, GdkEvent *event)
{
/* Keep the focus! Fight the power */
return TRUE;
@@ -480,10 +480,10 @@ html_frame_init (HTMLFrame *frame,
new_tokenizer = NULL;
gtk_html_set_default_content_type (new_html,
- gtk_html_get_default_content_type(parent_html));
+ gtk_html_get_default_content_type (parent_html));
gtk_html_set_default_engine (new_html,
- gtk_html_get_default_engine(parent_html));
+ gtk_html_get_default_engine (parent_html));
frame->html = new_widget;
frame->url = g_strdup (src);
diff --git a/gtkhtml/htmlgdkpainter.c b/gtkhtml/htmlgdkpainter.c
index a98992a..2567862 100644
--- a/gtkhtml/htmlgdkpainter.c
+++ b/gtkhtml/htmlgdkpainter.c
@@ -291,12 +291,12 @@ draw_border (HTMLPainter *painter,
#define DARK(c) dark.c = MAX (((gint) bg->c) - INC, 0)
#define LIGHT(c) light.c = MIN (((gint) bg->c) + INC, 0xffff)
- DARK(red);
- DARK(green);
- DARK(blue);
- LIGHT(red);
- LIGHT(green);
- LIGHT(blue);
+ DARK (red);
+ DARK (green);
+ DARK (blue);
+ LIGHT (red);
+ LIGHT (green);
+ LIGHT (blue);
alloc_color (painter, &dark);
alloc_color (painter, &light);
@@ -692,7 +692,7 @@ draw_spell_error (HTMLPainter *painter, gint x, gint y, gint width)
static void
draw_embedded (HTMLPainter * p, HTMLEmbedded *o, gint x, gint y)
{
- HTMLGdkPainter *gdk_painter = HTML_GDK_PAINTER(p);
+ HTMLGdkPainter *gdk_painter = HTML_GDK_PAINTER (p);
GtkWidget *embedded_widget;
embedded_widget = html_embedded_get_widget (o);
diff --git a/gtkhtml/htmlhidden.c b/gtkhtml/htmlhidden.c
index 7847f09..748d7fa 100644
--- a/gtkhtml/htmlhidden.c
+++ b/gtkhtml/htmlhidden.c
@@ -46,7 +46,7 @@ encode (HTMLEmbedded *e, const gchar *codepage)
}
ptr = encoding->str;
- g_string_free(encoding, FALSE);
+ g_string_free (encoding, FALSE);
return ptr;
}
diff --git a/gtkhtml/htmliframe.c b/gtkhtml/htmliframe.c
index 048552a..8ffcf27 100644
--- a/gtkhtml/htmliframe.c
+++ b/gtkhtml/htmliframe.c
@@ -54,7 +54,7 @@ static void
iframe_url_requested (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, gpointer data)
{
HTMLIFrame *iframe = HTML_IFRAME (data);
- GtkHTML *parent = GTK_HTML (HTML_EMBEDDED(iframe)->parent);
+ GtkHTML *parent = GTK_HTML (HTML_EMBEDDED (iframe)->parent);
if (!html->engine->stopped)
g_signal_emit_by_name (parent->engine, "url_requested", url, handle);
@@ -64,7 +64,7 @@ static void
iframe_size_changed (GtkHTML *html, gpointer data)
{
HTMLIFrame *iframe = HTML_IFRAME (data);
- GtkHTML *parent = GTK_HTML (HTML_EMBEDDED(iframe)->parent);
+ GtkHTML *parent = GTK_HTML (HTML_EMBEDDED (iframe)->parent);
html_engine_schedule_update (parent->engine);
}
@@ -73,7 +73,7 @@ static gboolean
iframe_object_requested (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data)
{
HTMLIFrame *iframe = HTML_IFRAME (data);
- GtkHTML *parent = GTK_HTML (HTML_EMBEDDED(iframe)->parent);
+ GtkHTML *parent = GTK_HTML (HTML_EMBEDDED (iframe)->parent);
gboolean ret_val;
ret_val = FALSE;
@@ -116,7 +116,7 @@ html_iframe_new (GtkWidget *parent,
}
static gboolean
-html_iframe_grab_cursor(GtkWidget *iframe, GdkEvent *event)
+html_iframe_grab_cursor (GtkWidget *iframe, GdkEvent *event)
{
/* Keep the focus! Fight the power */
return TRUE;
@@ -610,10 +610,10 @@ html_iframe_init (HTMLIFrame *iframe,
new_tokenizer = NULL;
gtk_html_set_default_content_type (new_html,
- gtk_html_get_default_content_type(parent_html));
+ gtk_html_get_default_content_type (parent_html));
gtk_html_set_default_engine (new_html,
- gtk_html_get_default_engine(parent_html));
+ gtk_html_get_default_engine (parent_html));
iframe->html = new_widget;
iframe->url = g_strdup (src);
diff --git a/gtkhtml/htmlimage.c b/gtkhtml/htmlimage.c
index 462e5ba..dae1272 100644
--- a/gtkhtml/htmlimage.c
+++ b/gtkhtml/htmlimage.c
@@ -873,7 +873,7 @@ html_image_new (HTMLImageFactory *imf,
{
HTMLImage *image;
- image = g_new(HTMLImage, 1);
+ image = g_new (HTMLImage, 1);
html_image_init (image, &html_image_class,
imf,
diff --git a/gtkhtml/htmlimageinput.c b/gtkhtml/htmlimageinput.c
index d2e18a0..5db1e57 100644
--- a/gtkhtml/htmlimageinput.c
+++ b/gtkhtml/htmlimageinput.c
@@ -131,7 +131,7 @@ encode (HTMLEmbedded *e, const gchar *codepage)
}
ptr = encoding->str;
- g_string_free(encoding, FALSE);
+ g_string_free (encoding, FALSE);
return ptr;
}
diff --git a/gtkhtml/htmlobject.h b/gtkhtml/htmlobject.h
index 78ca9cd..1c4cccd 100644
--- a/gtkhtml/htmlobject.h
+++ b/gtkhtml/htmlobject.h
@@ -61,8 +61,8 @@ struct _HTMLObject {
guint selected : 1;
/* If an object has a redraw pending and is being destroyed, this flag
- is set to TRUE instead of g_free()ing the object. When the draw
- queue is flushed, the g_free() is performed. */
+ is set to TRUE instead of g_free ()ing the object. When the draw
+ queue is flushed, the g_free () is performed. */
guint free_pending : 1;
/* FIXME add the other dynamic pusedo-classes... */
diff --git a/gtkhtml/htmlpainter.c b/gtkhtml/htmlpainter.c
index 5eabd22..adcdbba 100644
--- a/gtkhtml/htmlpainter.c
+++ b/gtkhtml/htmlpainter.c
@@ -945,7 +945,7 @@ html_painter_pango_to_engine (HTMLPainter *painter,
gint pango_units)
{
gdouble tmp = 0.5 + pango_units / painter->engine_to_pango;
- return (gint) CLAMP(tmp, G_MININT, G_MAXINT);
+ return (gint) CLAMP (tmp, G_MININT, G_MAXINT);
}
/**
@@ -964,7 +964,7 @@ html_painter_engine_to_pango (HTMLPainter *painter,
gint engine_units)
{
gdouble tmp = 0.5 + engine_units * painter->engine_to_pango;
- return (gint) CLAMP(tmp, G_MININT, G_MAXINT);
+ return (gint) CLAMP (tmp, G_MININT, G_MAXINT);
}
void
diff --git a/gtkhtml/htmlprinter.c b/gtkhtml/htmlprinter.c
index 13d91fb..82ceb8e 100644
--- a/gtkhtml/htmlprinter.c
+++ b/gtkhtml/htmlprinter.c
@@ -273,12 +273,12 @@ draw_border (HTMLPainter *painter,
#define DARK(c) dark.c = MAX (((gint) bg->c) - INC, 0)
#define LIGHT(c) light.c = MIN (((gint) bg->c) + INC, 0xffff)
- DARK(red);
- DARK(green);
- DARK(blue);
- LIGHT(red);
- LIGHT(green);
- LIGHT(blue);
+ DARK (red);
+ DARK (green);
+ DARK (blue);
+ LIGHT (red);
+ LIGHT (green);
+ LIGHT (blue);
switch (style) {
case HTML_BORDER_SOLID:
@@ -530,7 +530,7 @@ static void
draw_embedded (HTMLPainter *p, HTMLEmbedded *o, gint x, gint y)
{
gdouble print_x, print_y;
- HTMLPrinter *printer = HTML_PRINTER(p);
+ HTMLPrinter *printer = HTML_PRINTER (p);
GtkWidget *embedded_widget;
cairo_t *cr;
@@ -541,9 +541,9 @@ draw_embedded (HTMLPainter *p, HTMLEmbedded *o, gint x, gint y)
cairo_save (cr);
cairo_translate (cr,
print_x, print_y + o->height * PIXEL_SIZE);
- embedded_widget = html_embedded_get_widget(o);
+ embedded_widget = html_embedded_get_widget (o);
if (embedded_widget && GTK_IS_HTML_EMBEDDED (embedded_widget)) {
- g_signal_emit_by_name(G_OBJECT (embedded_widget),
+ g_signal_emit_by_name (G_OBJECT (embedded_widget),
"draw_print",
cr);
}
diff --git a/gtkhtml/htmlradio.c b/gtkhtml/htmlradio.c
index 5574c5a..e79bcc8 100644
--- a/gtkhtml/htmlradio.c
+++ b/gtkhtml/htmlradio.c
@@ -45,7 +45,7 @@ copy (HTMLObject *self,
static void
reset (HTMLEmbedded *e)
{
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(e->widget), HTML_RADIO(e)->default_checked);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (e->widget), HTML_RADIO (e)->default_checked);
}
static gchar *
@@ -68,7 +68,7 @@ encode (HTMLEmbedded *e, const gchar *codepage)
}
ptr = encoding->str;
- g_string_free(encoding, FALSE);
+ g_string_free (encoding, FALSE);
return ptr;
}
@@ -126,7 +126,7 @@ html_radio_init (HTMLRadio *radio,
html_embedded_set_widget (element, widget);
html_form_add_radio (form, name, GTK_RADIO_BUTTON (widget));
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), checked);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), checked);
radio->default_checked = checked;
}
diff --git a/gtkhtml/htmlsearch.c b/gtkhtml/htmlsearch.c
index 73eee0c..7ad6354 100644
--- a/gtkhtml/htmlsearch.c
+++ b/gtkhtml/htmlsearch.c
@@ -25,7 +25,7 @@
position of paragraph. so it is possible to find first match
on bottom of page (ie. first column of table) and the second
one on top (ie. top of second comlumn)
- [also Netscape didn't take care of it]
+ [also Netscape didn't take care of it]
*/
@@ -95,7 +95,7 @@ html_search_new (HTMLEngine *e, const gchar *text, gboolean case_sensitive, gboo
rv_int = regcomp (ns->reb, ns->text, (case_sensitive) ? 0 : REG_ICASE);
if (rv_int) {
gchar buf[1024];
- if (regerror(rv_int, ns->reb, buf, sizeof(buf))) {
+ if (regerror (rv_int, ns->reb, buf, sizeof (buf))) {
g_warning ("%s", buf);
} else {
g_warning ("regcomp failed, error code %d", rv_int);
diff --git a/gtkhtml/htmlselect.c b/gtkhtml/htmlselect.c
index c6eb2a8..0f3eeea 100644
--- a/gtkhtml/htmlselect.c
+++ b/gtkhtml/htmlselect.c
@@ -66,7 +66,7 @@ copy (HTMLObject *self,
static void
reset (HTMLEmbedded *e)
{
- HTMLSelect *s = HTML_SELECT(e);
+ HTMLSelect *s = HTML_SELECT (e);
if (s->multi || s->size > 1) {
GtkTreeView *tree_view;
@@ -128,7 +128,7 @@ static gchar *
encode (HTMLEmbedded *e, const gchar *codepage)
{
struct EmbeddedSelectionInfo info;
- HTMLSelect *s = HTML_SELECT(e);
+ HTMLSelect *s = HTML_SELECT (e);
GtkTreeIter iter;
info.embedded = e;
diff --git a/gtkhtml/htmltable.c b/gtkhtml/htmltable.c
index a5c4c9e..5a2caa5 100644
--- a/gtkhtml/htmltable.c
+++ b/gtkhtml/htmltable.c
@@ -126,7 +126,7 @@ copy_sized (HTMLObject *self, HTMLObject *dest, gint rows, gint cols)
d->bgColor = s->bgColor ? gdk_color_copy (s->bgColor) : NULL;
d->caption = s->caption ? HTML_CLUEV (html_object_dup (HTML_OBJECT (s->caption))) : NULL;
- d->bgPixmap = s->bgPixmap ? html_image_factory_register(s->bgPixmap->factory, NULL, s->bgPixmap->url, FALSE) : NULL;
+ d->bgPixmap = s->bgPixmap ? html_image_factory_register (s->bgPixmap->factory, NULL, s->bgPixmap->url, FALSE) : NULL;
d->columnMin = g_array_new (FALSE, FALSE, sizeof (gint));
d->columnFixed = g_array_new (FALSE, FALSE, sizeof (gint));
@@ -2391,7 +2391,7 @@ html_table_add_cell (HTMLTable *table, HTMLTableCell *cell)
html_table_alloc_cell (table, table->row, table->col);
html_table_set_cell (table, table->row, table->col, cell);
html_table_cell_set_position (cell, table->row, table->col);
- do_cspan(table, table->row, table->col, cell);
+ do_cspan (table, table->row, table->col, cell);
}
void
diff --git a/gtkhtml/htmltablecell.c b/gtkhtml/htmltablecell.c
index b6d394a..5d421be 100644
--- a/gtkhtml/htmltablecell.c
+++ b/gtkhtml/htmltablecell.c
@@ -117,7 +117,7 @@ copy (HTMLObject *self, HTMLObject *dest)
(* HTML_OBJECT_CLASS (parent_class)->copy) (self, dest);
- d->bgPixmap = s->have_bgPixmap ? html_image_factory_register(s->bgPixmap->factory, NULL, s->bgPixmap->url, FALSE) : NULL;
+ d->bgPixmap = s->have_bgPixmap ? html_image_factory_register (s->bgPixmap->factory, NULL, s->bgPixmap->url, FALSE) : NULL;
}
static gboolean
diff --git a/gtkhtml/htmltext.c b/gtkhtml/htmltext.c
index 1624835..e1ad367 100644
--- a/gtkhtml/htmltext.c
+++ b/gtkhtml/htmltext.c
@@ -3990,7 +3990,7 @@ html_text_change_set (HTMLText *text, HTMLChangeFlags flags)
void
html_text_set_link_visited (HTMLText *text, gint offset, HTMLEngine *engine, gboolean is_visited)
{
- HTMLEngine *object_engine=html_object_engine(HTML_OBJECT(text),engine);
+ HTMLEngine *object_engine=html_object_engine (HTML_OBJECT (text),engine);
Link *link = html_text_get_link_at_offset (text,offset);
if (link) {
diff --git a/gtkhtml/htmltextarea.c b/gtkhtml/htmltextarea.c
index 4183e3d..4c7d972 100644
--- a/gtkhtml/htmltextarea.c
+++ b/gtkhtml/htmltextarea.c
@@ -88,7 +88,7 @@ encode (HTMLEmbedded *e, const gchar *codepage)
}
utf8_str = encoding->str;
- g_string_free(encoding, FALSE);
+ g_string_free (encoding, FALSE);
return utf8_str;
}
diff --git a/gtkhtml/htmltextinput.c b/gtkhtml/htmltextinput.c
index b7a86cf..73fb4e8 100644
--- a/gtkhtml/htmltextinput.c
+++ b/gtkhtml/htmltextinput.c
@@ -70,7 +70,7 @@ reset (HTMLEmbedded *e)
static gboolean
html_text_input_key_pressed (GtkWidget *w, GdkEventKey *ev, gpointer p)
{
- HTMLEmbedded *e = HTML_EMBEDDED(p);
+ HTMLEmbedded *e = HTML_EMBEDDED (p);
HTMLEmbedded *next = NULL;
HTMLEmbedded *current = NULL;
gboolean found = FALSE;
@@ -78,12 +78,12 @@ html_text_input_key_pressed (GtkWidget *w, GdkEventKey *ev, gpointer p)
if (ev->keyval == GDK_Return) {
for (node = e->form->elements; node; node = node->next) {
- current = HTML_EMBEDDED(node->data);
+ current = HTML_EMBEDDED (node->data);
/* focus on the next visible element */
if (current->widget && found
- && HTML_OBJECT_TYPE(current) != HTML_TYPE_BUTTON
- && HTML_OBJECT_TYPE(current) != HTML_TYPE_IMAGEINPUT) {
+ && HTML_OBJECT_TYPE (current) != HTML_TYPE_BUTTON
+ && HTML_OBJECT_TYPE (current) != HTML_TYPE_IMAGEINPUT) {
next = current;
break;
}
@@ -126,7 +126,7 @@ encode (HTMLEmbedded *e, const gchar * codepage)
}
ptr = encoding->str;
- g_string_free(encoding, FALSE);
+ g_string_free (encoding, FALSE);
return ptr;
}
@@ -192,11 +192,11 @@ html_text_input_init (HTMLTextInput *ti,
ti->default_text = g_strdup (element->value);
if (maxlen != -1)
- gtk_entry_set_max_length(GTK_ENTRY(element->widget), maxlen);
+ gtk_entry_set_max_length (GTK_ENTRY (element->widget), maxlen);
- gtk_entry_set_visibility (GTK_ENTRY(element->widget), !password);
+ gtk_entry_set_visibility (GTK_ENTRY (element->widget), !password);
- gtk_entry_set_width_chars (GTK_ENTRY(element->widget), size);
+ gtk_entry_set_width_chars (GTK_ENTRY (element->widget), size);
ti->size = size;
ti->maxlen = maxlen;
diff --git a/gtkhtml/htmltokenizer.c b/gtkhtml/htmltokenizer.c
index 95975ba..2aaf3a0 100644
--- a/gtkhtml/htmltokenizer.c
+++ b/gtkhtml/htmltokenizer.c
@@ -153,9 +153,9 @@ static void html_tokenizer_real_engine_type (HTMLTokenizer *t, gboolean engi
static void html_tokenizer_real_write (HTMLTokenizer *, const gchar *str, gsize size);
static void html_tokenizer_real_end (HTMLTokenizer *);
static const gchar *
- html_tokenizer_real_get_content_type(HTMLTokenizer *);
+ html_tokenizer_real_get_content_type (HTMLTokenizer *);
static gboolean
- html_tokenizer_real_get_engine_type(HTMLTokenizer *);
+ html_tokenizer_real_get_engine_type (HTMLTokenizer *);
static gchar *html_tokenizer_real_peek_token (HTMLTokenizer *);
static gchar *html_tokenizer_real_next_token (HTMLTokenizer *);
static gboolean html_tokenizer_real_has_more_tokens (HTMLTokenizer *);
@@ -170,11 +170,11 @@ static void html_tokenizer_blocking_push (HTMLTokenizer *t,
HTMLTokenType tt);
static void html_tokenizer_tokenize_one_char (HTMLTokenizer *t,
const gchar **src);
-static void add_char(HTMLTokenizer *t, gchar c);
+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);
+gchar * html_tokenizer_convert_entity (gchar * token);
static GObjectClass *parent_class = NULL;
@@ -303,7 +303,7 @@ html_tokenizer_finalize (GObject *obj)
g_iconv_close (t->priv->iconv_cd);
if (t->priv->content_type)
- g_free(t->priv->content_type);
+ g_free (t->priv->content_type);
g_free (t->priv);
t->priv = NULL;
@@ -676,7 +676,7 @@ is_text (const gchar *content_type)
}
static const gchar *
-get_encoding_from_content_type(const gchar * content_type)
+get_encoding_from_content_type (const gchar * content_type)
{
gchar * charset;
if (content_type)
@@ -693,10 +693,10 @@ get_encoding_from_content_type(const gchar * content_type)
}
GIConv
-generate_iconv_from(const gchar * content_type)
+generate_iconv_from (const gchar * content_type)
{
if (content_type)
- if (!charset_is_utf8(content_type))
+ if (!charset_is_utf8 (content_type))
{
const gchar * encoding = get_encoding_from_content_type (content_type);
if (encoding)
@@ -706,7 +706,7 @@ generate_iconv_from(const gchar * content_type)
}
GIConv
-generate_iconv_to(const gchar * content_type)
+generate_iconv_to (const gchar * content_type)
{
if (content_type)
if (!charset_is_utf8 (content_type))
@@ -740,7 +740,7 @@ html_tokenizer_real_change (HTMLTokenizer *t, const gchar *content_type)
return;
if (p->content_type)
- g_free(p->content_type);
+ g_free (p->content_type);
p->content_type = g_ascii_strdown ( content_type, -1);
@@ -1527,7 +1527,7 @@ html_tokenizer_peek_token (HTMLTokenizer *t)
}
const gchar *
-html_tokenizer_get_content_type(HTMLTokenizer *t)
+html_tokenizer_get_content_type (HTMLTokenizer *t)
{
HTMLTokenizerClass *klass;
@@ -1536,7 +1536,7 @@ html_tokenizer_get_content_type(HTMLTokenizer *t)
klass = HTML_TOKENIZER_CLASS (G_OBJECT_GET_CLASS (t));
if (klass->get_content_type)
- return klass->get_content_type(t);
+ return klass->get_content_type (t);
g_warning ("No get_content_type method defined.");
return NULL;
@@ -1553,7 +1553,7 @@ html_tokenizer_get_engine_type (HTMLTokenizer *t)
klass = HTML_TOKENIZER_CLASS (G_OBJECT_GET_CLASS (t));
if (klass->get_engine_type)
- return klass->get_engine_type(t);
+ return klass->get_engine_type (t);
g_warning ("No get_engine_type method defined.");
return FALSE;
diff --git a/gtkhtml/htmltokenizer.h b/gtkhtml/htmltokenizer.h
index 2e28aeb..87abe65 100644
--- a/gtkhtml/htmltokenizer.h
+++ b/gtkhtml/htmltokenizer.h
@@ -72,7 +72,7 @@ void html_tokenizer_destroy (HTMLTokenizer *tokenizer);
void html_tokenizer_begin (HTMLTokenizer *t,
const gchar *content_type);
-const gchar * html_tokenizer_get_content_type(HTMLTokenizer *t);
+const gchar * html_tokenizer_get_content_type (HTMLTokenizer *t);
void html_tokenizer_change_content_type
(HTMLTokenizer *t,
const gchar *content_type);
diff --git a/gtkhtml/htmltype.c b/gtkhtml/htmltype.c
index 6aec447..c188e69 100644
--- a/gtkhtml/htmltype.c
+++ b/gtkhtml/htmltype.c
@@ -76,7 +76,7 @@ html_types_init (void)
return;
html_anchor_type_init ();
- html_button_type_init();
+ html_button_type_init ();
html_checkbox_type_init ();
html_clue_type_init ();
html_cluealigned_type_init ();
diff --git a/gtkhtml/htmlurl.c b/gtkhtml/htmlurl.c
index d8e624f..2844ebf 100644
--- a/gtkhtml/htmlurl.c
+++ b/gtkhtml/htmlurl.c
@@ -264,7 +264,7 @@ html_url_dup (const HTMLURL *url, HTMLURLDupFlags flags)
if (flags & HTML_URL_DUP_NOCGIARGS && new->path) {
/* Cut the path after the first '?' */
- ptr = strchr(new->path, '?');
+ ptr = strchr (new->path, '?');
if (ptr)
*ptr = 0;
}
@@ -473,7 +473,7 @@ concat_dir_and_file (const gchar *dir, const gchar *file)
{
/* If the directory name doesn't have a / on the end, we need
to add one so we get a proper path to the file */
- if (*dir && dir[strlen(dir) - 1] != PATH_SEP)
+ if (*dir && dir[strlen (dir) - 1] != PATH_SEP)
return g_strconcat (dir, PATH_SEP_STR, file, NULL);
else
return g_strconcat (dir, file, NULL);
@@ -495,13 +495,13 @@ html_url_append_path (const HTMLURL *url,
if (url->path == NULL)
return NULL;
- tmppath = g_strdup(url->path);
+ tmppath = g_strdup (url->path);
/* Cut the path at the first '?' */
- if ((ptr = strchr(tmppath, '?')))
+ if ((ptr = strchr (tmppath, '?')))
*ptr = 0;
- i = strlen(tmppath);
+ i = strlen (tmppath);
/* Remove first '/' from the right */
while (i && tmppath[i-1] != '/')
@@ -509,7 +509,7 @@ html_url_append_path (const HTMLURL *url,
if (i)
tmppath[i] = 0;
- else if (strlen(tmppath) > 1)
+ else if (strlen (tmppath) > 1)
tmppath[i] = 0;
new_path = concat_dir_and_file (tmppath, path);
diff --git a/gtkhtml/test-stress.c b/gtkhtml/test-stress.c
index fb4d7f6..d86a183 100644
--- a/gtkhtml/test-stress.c
+++ b/gtkhtml/test-stress.c
@@ -86,11 +86,11 @@ static gint test_level_1 (GtkHTML *html)
srand (2);
for (i = 0; i < 200; i++) {
- gint j, len = 1 + (gint) (10.0*rand()/(RAND_MAX+1.0));
+ gint j, len = 1 + (gint) (10.0*rand ()/(RAND_MAX+1.0));
gchar word[12];
for (j = 0; j < len; j++)
- word[j] = 'a' + (gint) (26.0*rand()/(RAND_MAX+1.0));
+ word[j] = 'a' + (gint) (26.0*rand ()/(RAND_MAX+1.0));
word[len] = ' ';
word[len + 1] = 0;
total_len += len + 1;
@@ -107,12 +107,12 @@ static gint test_level_1 (GtkHTML *html)
for (i = 0; i < 1000; i++) {
gint j, new_pos, pos, len;
- len = 1 + (gint) (120.0*rand()/(RAND_MAX+1.0));
- pos = MAX (0, (gint) (((double) (total_len - len))*rand()/(RAND_MAX+1.0)));
+ len = 1 + (gint) (120.0*rand ()/(RAND_MAX+1.0));
+ pos = MAX (0, (gint) (((double) (total_len - len))*rand ()/(RAND_MAX+1.0)));
printf ("step: %d pos: %d len: %d\n", i, pos, len);
- switch ((gint) (10.0*rand()/(RAND_MAX+1.0))) {
+ switch ((gint) (10.0*rand ()/(RAND_MAX+1.0))) {
case 0:
/* cut'n'paste */
printf ("cut'n'paste\n");
@@ -121,7 +121,7 @@ static gint test_level_1 (GtkHTML *html)
html_cursor_jump_to_position (html->engine->cursor, html->engine, pos + len);
html_engine_cut (html->engine);
- new_pos = (gint) (((double) (total_len - len))*rand()/(RAND_MAX+1.0));
+ new_pos = (gint) (((double) (total_len - len))*rand ()/(RAND_MAX+1.0));
html_cursor_jump_to_position (html->engine->cursor, html->engine, new_pos);
html_engine_paste (html->engine);
@@ -131,7 +131,7 @@ static gint test_level_1 (GtkHTML *html)
printf ("insert text\n");
html_cursor_jump_to_position (html->engine->cursor, html->engine, pos);
for (j = 0; j < len; j++) {
- gint et = (gint) (10.0*rand()/(RAND_MAX+1.0));
+ gint et = (gint) (10.0*rand ()/(RAND_MAX+1.0));
if (et == 0)
gtk_html_command (html, "insert-tab");
else {
@@ -140,7 +140,7 @@ static gint test_level_1 (GtkHTML *html)
if (et == 1)
ch[0] = ' ';
else
- ch[0] = 'a' + (gint) (26.0*rand()/(RAND_MAX+1.0));
+ ch[0] = 'a' + (gint) (26.0*rand ()/(RAND_MAX+1.0));
ch[1] = 0;
html_engine_insert_text (html->engine, ch, 1);
}
@@ -178,7 +178,7 @@ static gint test_level_1 (GtkHTML *html)
html_cursor_jump_to_position (html->engine->cursor, html->engine, pos + len);
gtk_html_cut (html);
- new_pos = (gint) (((double) (total_len - len))*rand()/(RAND_MAX+1.0));
+ new_pos = (gint) (((double) (total_len - len))*rand ()/(RAND_MAX+1.0));
html_cursor_jump_to_position (html->engine->cursor, html->engine, new_pos);
gtk_html_paste (html, TRUE);
diff --git a/gtkhtml/testgtkhtml.c b/gtkhtml/testgtkhtml.c
index 1334379..282b9d2 100644
--- a/gtkhtml/testgtkhtml.c
+++ b/gtkhtml/testgtkhtml.c
@@ -90,8 +90,8 @@ static void resize_cb (GtkWidget *widget, gpointer data);
static void select_all_cb (GtkWidget *widget, gpointer data);
static void title_changed_cb (GtkHTML *html, const gchar *title, gpointer data);
static void url_requested (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, gpointer data);
-static void entry_goto_url(GtkWidget *widget, gpointer data);
-static void goto_url(const gchar *url, gint back_or_forward);
+static void entry_goto_url (GtkWidget *widget, gpointer data);
+static void goto_url (const gchar *url, gint back_or_forward);
static void on_set_base (GtkHTML *html, const gchar *url, gpointer data);
static gchar *parse_href (const gchar *s);
@@ -210,7 +210,7 @@ example_changed_cb (GtkComboBox *combo_box, gpointer data)
Example *example = examples->pdata[i];
if (example->filename) {
- goto_url(example->filename, 0);
+ goto_url (example->filename, 0);
} else
goto_url("http://www.gnome.org";, 0);
}
@@ -597,7 +597,7 @@ redraw_cb (GtkWidget *widget, gpointer data)
static void
animate_cb (GtkToggleButton *togglebutton, gpointer data)
{
- gtk_html_set_animate (html, !gtk_toggle_button_get_mode(togglebutton));
+ gtk_html_set_animate (html, !gtk_toggle_button_get_mode (togglebutton));
}
static void
@@ -611,14 +611,14 @@ title_changed_cb (GtkHTML *html, const gchar *title, gpointer data)
}
static void
-entry_goto_url(GtkWidget *widget, gpointer data)
+entry_goto_url (GtkWidget *widget, gpointer data)
{
gchar *tmpurl;
tmpurl = g_strdup (gtk_entry_get_text (GTK_ENTRY (widget)));
/* Add "http://"; if no protocol is specified */
- if (strchr(tmpurl, ':')) {
+ if (strchr (tmpurl, ':')) {
on_set_base (NULL, tmpurl, NULL);
goto_url (tmpurl, 0);
} else {
@@ -627,7 +627,7 @@ entry_goto_url(GtkWidget *widget, gpointer data)
url = g_strdup_printf("http://%s";, tmpurl);
on_set_base (NULL, url, NULL);
goto_url (url, 0);
- g_free(url);
+ g_free (url);
}
g_free (tmpurl);
}
@@ -645,16 +645,16 @@ back_cb (GtkWidget *widget, gpointer data)
go_position++;
- if ((item = g_list_nth_data(go_list, go_position))) {
+ if ((item = g_list_nth_data (go_list, go_position))) {
- goto_url(item->url, 1);
- gtk_widget_set_sensitive(popup_menu_forward, TRUE);
- gtk_widget_set_sensitive(toolbar_forward, TRUE);
+ goto_url (item->url, 1);
+ gtk_widget_set_sensitive (popup_menu_forward, TRUE);
+ gtk_widget_set_sensitive (toolbar_forward, TRUE);
- if (go_position == (g_list_length(go_list) - 1)) {
+ if (go_position == (g_list_length (go_list) - 1)) {
- gtk_widget_set_sensitive(popup_menu_back, FALSE);
- gtk_widget_set_sensitive(toolbar_back, FALSE);
+ gtk_widget_set_sensitive (popup_menu_back, FALSE);
+ gtk_widget_set_sensitive (toolbar_back, FALSE);
}
} else
@@ -668,16 +668,16 @@ forward_cb (GtkWidget *widget, gpointer data)
go_position--;
- if ((go_position >= 0) && (item = g_list_nth_data(go_list, go_position))) {
+ if ((go_position >= 0) && (item = g_list_nth_data (go_list, go_position))) {
- goto_url(item->url, 1);
+ goto_url (item->url, 1);
- gtk_widget_set_sensitive(popup_menu_back, TRUE);
- gtk_widget_set_sensitive(toolbar_back, TRUE);
+ gtk_widget_set_sensitive (popup_menu_back, TRUE);
+ gtk_widget_set_sensitive (toolbar_back, TRUE);
if (go_position == 0) {
- gtk_widget_set_sensitive(popup_menu_forward, FALSE);
- gtk_widget_set_sensitive(toolbar_forward, FALSE);
+ gtk_widget_set_sensitive (popup_menu_forward, FALSE);
+ gtk_widget_set_sensitive (toolbar_forward, FALSE);
}
} else
go_position++;
@@ -688,9 +688,9 @@ reload_cb (GtkWidget *widget, gpointer data)
{
go_item *item;
- if ((item = g_list_nth_data(go_list, go_position))) {
+ if ((item = g_list_nth_data (go_list, go_position))) {
- goto_url(item->url, 1);
+ goto_url (item->url, 1);
}
}
@@ -708,7 +708,7 @@ load_done (GtkHTML *html)
/* TODO2 animator stop
if (exit_when_done)
- gtk_main_quit();
+ gtk_main_quit ();
*/
}
@@ -751,7 +751,7 @@ on_set_base (GtkHTML *html, const gchar *url, gpointer data)
static gboolean
redirect_timer_event (gpointer data) {
g_print("Redirecting to '%s' NOW\n", redirect_url);
- goto_url(redirect_url, 0);
+ goto_url (redirect_url, 0);
/* OBS: redirect_url is freed in goto_url */
@@ -764,7 +764,7 @@ on_redirect (GtkHTML *html, const gchar *url, gint delay, gpointer data) {
if (redirect_timerId == 0) {
- redirect_url = g_strdup(url);
+ redirect_url = g_strdup (url);
redirect_timerId = g_timeout_add (delay * 1000,(GtkFunction) redirect_timer_event, NULL);
}
@@ -781,7 +781,7 @@ on_submit (GtkHTML *html, const gchar *method, const gchar *action, const gchar
tmpstr = g_string_append_c (tmpstr, '?');
tmpstr = g_string_append (tmpstr, encoding);
- goto_url(tmpstr->str, 0);
+ goto_url (tmpstr->str, 0);
g_string_free (tmpstr, TRUE);
} else {
@@ -791,7 +791,7 @@ on_submit (GtkHTML *html, const gchar *method, const gchar *action, const gchar
}
static void
-change_status_bar(GtkStatusbar * statusbar, const gchar * text)
+change_status_bar (GtkStatusbar * statusbar, const gchar * text)
{
gchar *msg;
@@ -812,7 +812,7 @@ change_status_bar(GtkStatusbar * statusbar, const gchar * text)
static void
on_url (GtkHTML *html, const gchar *url, gpointer data)
{
- change_status_bar (GTK_STATUSBAR(statusbar), url);
+ change_status_bar (GTK_STATUSBAR (statusbar), url);
}
static void
@@ -823,16 +823,16 @@ on_link_clicked (GtkHTML *html, const gchar *url, gpointer data)
/* simulate an async object isntantiation */
static gint
-object_timeout(GtkHTMLEmbedded *eb)
+object_timeout (GtkHTMLEmbedded *eb)
{
GtkWidget *w;
- w = gtk_check_button_new();
- gtk_widget_show(w);
+ w = gtk_check_button_new ();
+ gtk_widget_show (w);
printf("inserting custom widget after a delay ...\n");
- gtk_html_embedded_set_descent(eb, rand()%8);
- gtk_container_add (GTK_CONTAINER(eb), w);
+ gtk_html_embedded_set_descent (eb, rand ()%8);
+ gtk_container_add (GTK_CONTAINER (eb), w);
g_object_unref (eb);
return FALSE;
@@ -847,7 +847,7 @@ object_requested_cmd (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data)
return FALSE;
g_object_ref (eb);
- g_timeout_add(rand() % 5000 + 1000, (GtkFunction) object_timeout, eb);
+ g_timeout_add (rand () % 5000 + 1000, (GtkFunction) object_timeout, eb);
/* object_timeout (eb); */
return TRUE;
@@ -865,7 +865,7 @@ got_data (SoupSession *session, SoupMessage *msg, gpointer user_data)
return;
}
/* Enable change content type in engine */
- gtk_html_set_default_engine(html, TRUE);
+ gtk_html_set_default_engine (html, TRUE);
ContentType = soup_message_headers_get (msg->response_headers, "Content-type");
@@ -993,42 +993,42 @@ go_list_cb (GtkWidget *widget, gpointer data)
/* Only if the item was selected, not deselected */
if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget))) {
- go_position = GPOINTER_TO_INT(data);
+ go_position = GPOINTER_TO_INT (data);
- if ((item = g_list_nth_data(go_list, go_position))) {
+ if ((item = g_list_nth_data (go_list, go_position))) {
- goto_url(item->url, 1);
- num = g_list_length(go_list);
+ goto_url (item->url, 1);
+ num = g_list_length (go_list);
if (go_position == 0 || num < 2) {
- gtk_widget_set_sensitive(popup_menu_forward, FALSE);
- gtk_widget_set_sensitive(toolbar_forward, FALSE);
+ gtk_widget_set_sensitive (popup_menu_forward, FALSE);
+ gtk_widget_set_sensitive (toolbar_forward, FALSE);
} else {
- gtk_widget_set_sensitive(popup_menu_forward, TRUE);
- gtk_widget_set_sensitive(toolbar_forward, TRUE);
+ gtk_widget_set_sensitive (popup_menu_forward, TRUE);
+ gtk_widget_set_sensitive (toolbar_forward, TRUE);
}
if (go_position == (num - 1) || num < 2) {
- gtk_widget_set_sensitive(popup_menu_back, FALSE);
- gtk_widget_set_sensitive(toolbar_back, FALSE);
+ gtk_widget_set_sensitive (popup_menu_back, FALSE);
+ gtk_widget_set_sensitive (toolbar_back, FALSE);
} else {
- gtk_widget_set_sensitive(popup_menu_back, TRUE);
- gtk_widget_set_sensitive(toolbar_back, TRUE);
+ gtk_widget_set_sensitive (popup_menu_back, TRUE);
+ gtk_widget_set_sensitive (toolbar_back, TRUE);
}
}
}
}
-static void remove_go_list(gpointer data, gpointer user_data) {
+static void remove_go_list (gpointer data, gpointer user_data) {
go_item *item = (go_item *)data;
if (item->widget)
- gtk_widget_destroy(item->widget);
+ gtk_widget_destroy (item->widget);
item->widget = NULL;
}
static void
-goto_url(const gchar *url, gint back_or_forward)
+goto_url (const gchar *url, gint back_or_forward)
{
gint tmp, i;
go_item *item;
@@ -1040,7 +1040,7 @@ goto_url(const gchar *url, gint back_or_forward)
/* Remove any pending redirection */
if (redirect_timerId) {
- g_source_remove(redirect_timerId);
+ g_source_remove (redirect_timerId);
redirect_timerId = 0;
}
@@ -1060,82 +1060,82 @@ goto_url(const gchar *url, gint back_or_forward)
/* Removes "Forward entries"*/
tmp = go_position;
while (tmp) {
- item = g_list_nth_data(go_list, --tmp);
- go_list = g_list_remove(go_list, item);
+ item = g_list_nth_data (go_list, --tmp);
+ go_list = g_list_remove (go_list, item);
if (item->url)
- g_free(item->url);
+ g_free (item->url);
if (item->title)
- g_free(item->title);
+ g_free (item->title);
if (item->url)
- gtk_widget_destroy(item->widget);
- g_free(item);
+ gtk_widget_destroy (item->widget);
+ g_free (item);
}
go_position = 0;
}
/* Removes old entries if the list is to big */
- tmp = g_list_length(go_list);
+ tmp = g_list_length (go_list);
while (tmp > MAX_GO_ENTRIES) {
- item = g_list_nth_data(go_list, MAX_GO_ENTRIES);
+ item = g_list_nth_data (go_list, MAX_GO_ENTRIES);
if (item->url)
- g_free(item->url);
+ g_free (item->url);
if (item->title)
- g_free(item->title);
+ g_free (item->title);
if (item->url)
- gtk_widget_destroy(item->widget);
- g_free(item);
+ gtk_widget_destroy (item->widget);
+ g_free (item);
- go_list = g_list_remove(go_list, item);
+ go_list = g_list_remove (go_list, item);
tmp--;
}
- gtk_widget_set_sensitive(popup_menu_forward, FALSE);
- gtk_widget_set_sensitive(toolbar_forward, FALSE);
+ gtk_widget_set_sensitive (popup_menu_forward, FALSE);
+ gtk_widget_set_sensitive (toolbar_forward, FALSE);
- item = g_malloc0(sizeof(go_item));
- item->url = g_strdup(full_url);
+ item = g_malloc0 (sizeof (go_item));
+ item->url = g_strdup (full_url);
/* Remove old go list */
- g_list_foreach(go_list, remove_go_list, NULL);
+ g_list_foreach (go_list, remove_go_list, NULL);
/* Add new url to go list */
- go_list = g_list_prepend(go_list, item);
+ go_list = g_list_prepend (go_list, item);
/* Create a new go list menu */
- tmp = g_list_length(go_list);
+ tmp = g_list_length (go_list);
group = NULL;
for (i=0;i<tmp;i++) {
- item = g_list_nth_data(go_list, i);
- item->widget = gtk_radio_menu_item_new_with_label(group, item->url);
+ item = g_list_nth_data (go_list, i);
+ item->widget = gtk_radio_menu_item_new_with_label (group, item->url);
g_signal_connect (item->widget, "activate",
G_CALLBACK (go_list_cb), GINT_TO_POINTER (i));
- group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(item->widget));
+ group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item->widget));
if (i == 0)
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item->widget), TRUE);
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item->widget), TRUE);
- gtk_widget_show(item->widget);
+ gtk_widget_show (item->widget);
}
/* Enable the "Back" button if there are more then one url in the list */
- if (g_list_length(go_list) > 1) {
+ if (g_list_length (go_list) > 1) {
- gtk_widget_set_sensitive(popup_menu_back, TRUE);
- gtk_widget_set_sensitive(toolbar_back, TRUE);
+ gtk_widget_set_sensitive (popup_menu_back, TRUE);
+ gtk_widget_set_sensitive (toolbar_back, TRUE);
}
} else {
/* Update current link in the go list */
- item = g_list_nth_data(go_list, go_position);
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item->widget), TRUE);
+ item = g_list_nth_data (go_list, go_position);
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item->widget), TRUE);
}
if (redirect_url) {
- g_free(redirect_url);
+ g_free (redirect_url);
redirect_url = NULL;
}
g_free (full_url);
@@ -1148,11 +1148,11 @@ bug_cb (GtkWidget *widget, gpointer data)
cwd = g_get_current_dir ();
filename = g_strdup_printf("%s/bugs.html", cwd);
- url = g_filename_to_uri(filename, NULL, NULL);
- goto_url(url, 0);
- g_free(url);
- g_free(filename);
- g_free(cwd);
+ url = g_filename_to_uri (filename, NULL, NULL);
+ goto_url (url, 0);
+ g_free (url);
+ g_free (filename);
+ g_free (cwd);
}
static void
@@ -1168,7 +1168,7 @@ motion_notify_event (GtkHTML *html, GdkEventMotion *event, gpointer data)
id = gtk_html_get_object_id_at (html, event->x, event->y);
if (id)
- change_status_bar(GTK_STATUSBAR (statusbar), id);
+ change_status_bar (GTK_STATUSBAR (statusbar), id);
return FALSE;
}
@@ -1190,7 +1190,7 @@ main (gint argc, gchar *argv[])
gpointer p = malloc (1024); /* to make linker happy with ccmalloc */
#endif
- gtk_init(&argc, &argv);
+ gtk_init (&argc, &argv);
app = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@@ -1264,7 +1264,7 @@ main (gint argc, gchar *argv[])
gtk_container_add (GTK_CONTAINER (scrolled_window), html_widget);
/* Create a popup menu with disabled back and forward items */
- popup_menu = gtk_menu_new();
+ popup_menu = gtk_menu_new ();
popup_menu_back = gtk_menu_item_new_with_label ("Back");
gtk_widget_set_sensitive (popup_menu_back, FALSE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
