[gtkhtml] More whitespace cleanup.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkhtml] More whitespace cleanup.
- Date: Sun, 30 Jan 2011 16:02:05 +0000 (UTC)
commit b860e4813fb25e2d68fbf5ce0d98d5b2244cc2be
Author: Matthew Barnes <mbarnes redhat com>
Date: Sun Jan 30 10:23:26 2011 -0500
More whitespace cleanup.
a11y/cell.c | 2 +-
a11y/html.c | 2 +-
a11y/image.c | 2 +-
a11y/object.c | 6 +-
a11y/paragraph.c | 2 +-
a11y/table.c | 4 +-
a11y/text.c | 64 +++++++-------
components/editor/gtkhtml-editor-actions.c | 2 +-
components/editor/gtkhtml-editor-private.c | 2 +-
gtkhtml/dllmain.c | 62 +++++++-------
gtkhtml/gtkhtml-stream.c | 2 +-
gtkhtml/gtkhtml.c | 56 ++++++------
gtkhtml/htmlclueflow.c | 58 ++++++------
gtkhtml/htmlembedded.c | 6 +-
gtkhtml/htmlengine-edit-clueflowstyle.c | 2 +-
gtkhtml/htmlengine-edit-cursor.c | 6 +-
gtkhtml/htmlengine-edit-movement.c | 4 +-
gtkhtml/htmlengine-edit-table.c | 10 +-
gtkhtml/htmlengine.c | 6 +-
gtkhtml/htmlentity.c | 28 +++---
gtkhtml/htmlframeset.c | 2 +-
gtkhtml/htmliframe.c | 4 +-
gtkhtml/htmlimage.c | 4 +-
gtkhtml/htmlmarshal.c | 136 ++++++++++++++--------------
gtkhtml/htmlobject.c | 4 +-
gtkhtml/htmlrule.c | 2 +-
gtkhtml/htmltablecell.c | 2 +-
gtkhtml/htmltext.c | 16 ++--
gtkhtml/htmlurl.c | 4 +-
gtkhtml/testgtkhtml.c | 32 ++++----
30 files changed, 266 insertions(+), 266 deletions(-)
---
diff --git a/a11y/cell.c b/a11y/cell.c
index 4593ee8..6ed9f3b 100644
--- a/a11y/cell.c
+++ b/a11y/cell.c
@@ -61,7 +61,7 @@ html_a11y_cell_get_type (void)
static void
html_a11y_cell_finalize (GObject *obj)
{
- G_OBJECT_CLASS (parent_class)->finalize (obj);
+ G_OBJECT_CLASS (parent_class)->finalize (obj);
}
static void
diff --git a/a11y/html.c b/a11y/html.c
index ea92ddf..72674dd 100644
--- a/a11y/html.c
+++ b/a11y/html.c
@@ -100,7 +100,7 @@ atk_component_interface_init (AtkComponentIface *iface)
static void
html_a11y_finalize (GObject *obj)
{
- G_OBJECT_CLASS (parent_class)->finalize (obj);
+ G_OBJECT_CLASS (parent_class)->finalize (obj);
}
static void
diff --git a/a11y/image.c b/a11y/image.c
index 057747d..f931b7d 100644
--- a/a11y/image.c
+++ b/a11y/image.c
@@ -88,7 +88,7 @@ atk_image_interface_init (AtkImageIface *iface)
static void
html_a11y_image_finalize (GObject *obj)
{
- G_OBJECT_CLASS (parent_class)->finalize (obj);
+ G_OBJECT_CLASS (parent_class)->finalize (obj);
}
static void
diff --git a/a11y/object.c b/a11y/object.c
index 4ed4e70..b344270 100644
--- a/a11y/object.c
+++ b/a11y/object.c
@@ -151,7 +151,7 @@ gtk_html_a11y_get_type (void)
static void
gtk_html_a11y_finalize (GObject *obj)
{
- G_OBJECT_CLASS (parent_class)->finalize (obj);
+ G_OBJECT_CLASS (parent_class)->finalize (obj);
}
static void
@@ -279,7 +279,7 @@ gtk_html_a11y_get_focus_object (GtkWidget * widget)
{
GtkHTML * html;
HTMLObject * htmlobj = NULL;
- AtkObject *obj = NULL;
+ AtkObject *obj = NULL;
gint offset;
html = GTK_HTML (widget);
@@ -302,7 +302,7 @@ static AtkObject * gtk_html_a11y_focus_object = NULL;
static void
gtk_html_a11y_grab_focus_cb (GtkWidget * widget)
{
- AtkObject *focus_object, *obj, *clue;
+ AtkObject *focus_object, *obj, *clue;
focus_object = gtk_html_a11y_get_focus_object (widget);
if (focus_object == NULL)
diff --git a/a11y/paragraph.c b/a11y/paragraph.c
index d430072..460a737 100644
--- a/a11y/paragraph.c
+++ b/a11y/paragraph.c
@@ -57,7 +57,7 @@ html_a11y_paragraph_get_type (void)
static void
html_a11y_paragraph_finalize (GObject *obj)
{
- G_OBJECT_CLASS (parent_class)->finalize (obj);
+ G_OBJECT_CLASS (parent_class)->finalize (obj);
}
static void
diff --git a/a11y/table.c b/a11y/table.c
index d9debdb..c79dbb8 100644
--- a/a11y/table.c
+++ b/a11y/table.c
@@ -103,7 +103,7 @@ atk_table_interface_init (AtkTableIface *iface)
static void
html_a11y_table_finalize (GObject *obj)
{
- G_OBJECT_CLASS (parent_class)->finalize (obj);
+ G_OBJECT_CLASS (parent_class)->finalize (obj);
}
static void
@@ -174,7 +174,7 @@ is_valid (AtkObject *table)
g_object_unref (ss);
return FALSE;
}
- g_object_unref (ss);
+ g_object_unref (ss);
return TRUE;
}
diff --git a/a11y/text.c b/a11y/text.c
index 1492d49..579dd93 100644
--- a/a11y/text.c
+++ b/a11y/text.c
@@ -115,37 +115,37 @@ static AtkObjectClass *parent_class = NULL;
static gint
get_n_actions (AtkAction *action)
{
- return 1;
+ return 1;
}
static G_CONST_RETURN gchar *
action_get_name (AtkAction *action, gint i)
{
- if (i == 0)
+ if (i == 0)
return _("grab focus");
- return NULL;
+ return NULL;
}
static gboolean
do_action (AtkAction * action, gint i)
{
- switch (i) {
- case 0:
+ switch (i) {
+ case 0:
return html_a11y_text_grab_focus (ATK_COMPONENT (action));
- default:
- return FALSE;
- }
+ default:
+ return FALSE;
+ }
}
static void
atk_action_interface_init (AtkActionIface *iface)
{
- g_return_if_fail (iface != NULL);
+ g_return_if_fail (iface != NULL);
- iface->do_action = do_action;
- iface->get_n_actions = get_n_actions;
- iface->get_name = action_get_name;
+ iface->do_action = do_action;
+ iface->get_n_actions = get_n_actions;
+ iface->get_name = action_get_name;
}
GType
@@ -245,14 +245,14 @@ atk_text_interface_init (AtkTextIface *iface)
static void
html_a11y_text_finalize (GObject *obj)
{
- HTMLA11YText *ato = HTML_A11Y_TEXT (obj);
+ HTMLA11YText *ato = HTML_A11Y_TEXT (obj);
- if (ato->util != NULL) {
- g_object_unref (ato->util);
- ato->util = NULL;
- }
+ if (ato->util != NULL) {
+ g_object_unref (ato->util);
+ ato->util = NULL;
+ }
- G_OBJECT_CLASS (parent_class)->finalize (obj);
+ G_OBJECT_CLASS (parent_class)->finalize (obj);
}
static void
@@ -413,7 +413,7 @@ html_a11y_text_grab_focus (AtkComponent *comp)
html_engine_jump_to_object (html->engine, HTML_A11Y_HTML (comp), HTML_TEXT (HTML_A11Y_HTML (comp))->text_len);
g_signal_emit_by_name (html, "grab_focus");
- return TRUE;
+ return TRUE;
}
/*
@@ -1006,18 +1006,18 @@ html_a11y_text_set_text_contents (AtkEditableText *text,
/* fprintf(stderr, "atk set text contents called text %p\n", text);*/
g_return_if_fail (string);
- 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_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_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_engine_update_selection_if_necessary (html->engine);
html_engine_paste_text (html->engine, string, -1);
- html_engine_show_cursor (html->engine);
+ html_engine_show_cursor (html->engine);
g_signal_emit_by_name(html, "grab_focus");
}
@@ -1037,7 +1037,7 @@ html_a11y_text_insert_text (AtkEditableText *text,
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)));
+ 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);
@@ -1052,19 +1052,19 @@ 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)));
+ 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_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_engine_update_selection_if_necessary (html->engine);
html_engine_copy (html->engine);
- html_engine_show_cursor (html->engine);
+ html_engine_show_cursor (html->engine);
}
static void
@@ -1076,12 +1076,12 @@ 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)));
+ 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_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);
@@ -1101,7 +1101,7 @@ 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)));
+ 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);
@@ -1120,15 +1120,15 @@ 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)));
+ 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_engine_show_cursor (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);
+ html_engine_show_cursor (html->engine);
g_signal_emit_by_name(html, "grab_focus");
}
diff --git a/components/editor/gtkhtml-editor-actions.c b/components/editor/gtkhtml-editor-actions.c
index 7d9921d..05bfc6e 100644
--- a/components/editor/gtkhtml-editor-actions.c
+++ b/components/editor/gtkhtml-editor-actions.c
@@ -823,7 +823,7 @@ action_mode_cb (GtkRadioAction *action,
action_group = editor->priv->html_context_actions;
gtk_action_group_set_visible (action_group, html_mode);
- gtk_widget_set_sensitive (editor->priv->color_combo_box, html_mode);
+ gtk_widget_set_sensitive (editor->priv->color_combo_box, html_mode);
if (html_mode)
gtk_widget_show (editor->priv->html_toolbar);
diff --git a/components/editor/gtkhtml-editor-private.c b/components/editor/gtkhtml-editor-private.c
index ca59875..1a27682 100644
--- a/components/editor/gtkhtml-editor-private.c
+++ b/components/editor/gtkhtml-editor-private.c
@@ -193,7 +193,7 @@ gtkhtml_editor_private_init (GtkhtmlEditor *editor)
priv->builder = gtk_builder_new ();
/* To keep translated strings in subclasses */
- gtk_builder_set_translation_domain (priv->builder, GETTEXT_PACKAGE);
+ gtk_builder_set_translation_domain (priv->builder, GETTEXT_PACKAGE);
if (!gtk_builder_add_from_file (priv->builder, filename, &error)) {
g_critical ("Couldn't load builder file: %s\n", error->message);
g_clear_error (&error);
diff --git a/gtkhtml/dllmain.c b/gtkhtml/dllmain.c
index 52d34df..b97f38e 100644
--- a/gtkhtml/dllmain.c
+++ b/gtkhtml/dllmain.c
@@ -42,40 +42,40 @@ static gchar *
replace_prefix (const gchar *runtime_prefix,
const gchar *configure_time_path)
{
- if (runtime_prefix &&
+ if (runtime_prefix &&
strncmp (configure_time_path, PREFIX "/",
- strlen (PREFIX) + 1) == 0)
- return g_strconcat (runtime_prefix,
- configure_time_path + strlen (PREFIX),
- NULL);
- else
- return g_strdup (configure_time_path);
+ strlen (PREFIX) + 1) == 0)
+ return g_strconcat (runtime_prefix,
+ configure_time_path + strlen (PREFIX),
+ NULL);
+ else
+ return g_strdup (configure_time_path);
}
static void
setup (void)
{
- gchar *cp_prefix;
+ gchar *cp_prefix;
- G_LOCK (mutex);
- if (localedir != NULL) {
- G_UNLOCK (mutex);
- return;
- }
+ G_LOCK (mutex);
+ if (localedir != NULL) {
+ G_UNLOCK (mutex);
+ 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);
+ localedir = replace_prefix (cp_prefix, GNOMELOCALEDIR);
+ g_free (cp_prefix);
- libdir = replace_prefix (prefix, LIBDIR);
- datadir = replace_prefix (prefix, DATADIR);
- sysconfdir = replace_prefix (prefix, SYSCONFDIR);
- icondir = replace_prefix (prefix, ICONDIR);
- gtkhtml_datadir = replace_prefix (prefix, GTKHTML_DATADIR);
+ libdir = replace_prefix (prefix, LIBDIR);
+ datadir = replace_prefix (prefix, DATADIR);
+ sysconfdir = replace_prefix (prefix, SYSCONFDIR);
+ icondir = replace_prefix (prefix, ICONDIR);
+ gtkhtml_datadir = replace_prefix (prefix, GTKHTML_DATADIR);
- G_UNLOCK (mutex);
+ G_UNLOCK (mutex);
}
/* <windows.h> drags in a definition of DATADIR, argh. So #undef
@@ -95,12 +95,12 @@ DllMain (HINSTANCE hinstDLL,
DWORD fdwReason,
LPVOID lpvReserved)
{
- switch (fdwReason) {
- case DLL_PROCESS_ATTACH:
- hmodule = hinstDLL;
- break;
- }
- return TRUE;
+ switch (fdwReason) {
+ case DLL_PROCESS_ATTACH:
+ hmodule = hinstDLL;
+ break;
+ }
+ return TRUE;
}
/* Include gtkhtml-private.h now to get prototypes for the getter
@@ -114,8 +114,8 @@ DllMain (HINSTANCE hinstDLL,
const gchar * \
_get_##varbl (void) \
{ \
- setup (); \
- return varbl; \
+ setup (); \
+ return varbl; \
}
GETTER (prefix)
diff --git a/gtkhtml/gtkhtml-stream.c b/gtkhtml/gtkhtml-stream.c
index 4d27c7d..3b11312 100644
--- a/gtkhtml/gtkhtml-stream.c
+++ b/gtkhtml/gtkhtml-stream.c
@@ -175,7 +175,7 @@ stream_log_write (GtkHTMLStream *stream,
for (i=0; i<size; i++)
fprintf (log->file, "%c", buffer [i]);
- gtk_html_stream_write (log->stream, buffer, size);
+ gtk_html_stream_write (log->stream, buffer, size);
}
diff --git a/gtkhtml/gtkhtml.c b/gtkhtml/gtkhtml.c
index 8a63cef..07f1705 100644
--- a/gtkhtml/gtkhtml.c
+++ b/gtkhtml/gtkhtml.c
@@ -1111,7 +1111,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);
}
@@ -1206,7 +1206,7 @@ realize (GtkWidget *widget)
gdk_window_set_cursor (window, NULL);
/* This sets the backing pixmap to None, so that scrolling does not
- erase the newly exposed area, thus making the thing smoother. */
+ erase the newly exposed area, thus making the thing smoother. */
gdk_window_set_background_pattern (bin_window, NULL);
/* If someone was silly enough to stick us in something that doesn't
@@ -1583,7 +1583,7 @@ mouse_change_pos (GtkWidget *widget, GdkWindow *window, gint x, gint y, gint sta
remove_scroll_timeout (html);
/* This will put the mark at the position of the
- previous click. */
+ previous click. */
if (engine->mark == NULL && engine->editable)
html_engine_set_mark (engine);
@@ -1822,7 +1822,7 @@ gtk_html_get_url_object_relative (GtkHTML *html, HTMLObject *o, const gchar *url
if (e == html->engine)
g_warning ("engine matches engine");
*/
- return url ? expand_frame_url (e->widget, url) : NULL;
+ return url ? expand_frame_url (e->widget, url) : NULL;
}
static GtkWidget *
@@ -2766,24 +2766,24 @@ drag_data_received (GtkWidget *widget, GdkDragContext *context,
selection_data, widget);
pasted = TRUE;
break;
- case DND_TARGET_TYPE_MOZILLA_URL :
+ case DND_TARGET_TYPE_MOZILLA_URL :
break;
- case DND_TARGET_TYPE_TEXT_URI_LIST:
+ case DND_TARGET_TYPE_TEXT_URI_LIST:
if (!HTML_IS_PLAIN_PAINTER (engine->painter)) {
- HTMLObject *obj;
- gint list_len, len;
- gchar *uri;
+ HTMLObject *obj;
+ gint list_len, len;
+ gchar *uri;
html_undo_level_begin (engine->undo, "Dropped URI(s)", "Remove Dropped URI(s)");
- list_len = length;
- do {
- uri = next_uri ((guchar **) &data, &len, &list_len);
- obj = new_img_obj_from_uri (engine, uri, NULL, -1);
- if (obj) {
- html_engine_paste_object (engine, obj, html_object_get_length (obj));
- pasted = TRUE;
- }
- } while (list_len);
- html_undo_level_end (engine->undo, engine);
+ list_len = length;
+ do {
+ uri = next_uri ((guchar **) &data, &len, &list_len);
+ obj = new_img_obj_from_uri (engine, uri, NULL, -1);
+ if (obj) {
+ html_engine_paste_object (engine, obj, html_object_get_length (obj));
+ pasted = TRUE;
+ }
+ } while (list_len);
+ html_undo_level_end (engine->undo, engine);
}
break;
}
@@ -3271,17 +3271,17 @@ gtk_html_im_commit_cb (GtkIMContext *context, const gchar *str, GtkHTML *html)
html->priv->im_block_reset = TRUE;
- if (html->priv->im_pre_len > 0) {
+ if (html->priv->im_pre_len > 0) {
D_IM (printf ("IM delete last preedit %d + %d\n", html->priv->im_pre_pos, html->priv->im_pre_len);)
- html_undo_freeze (html->engine->undo);
- html_cursor_exactly_jump_to_position_no_spell (html->engine->cursor, html->engine, html->priv->im_pre_pos);
- html_engine_set_mark (html->engine);
- html_cursor_exactly_jump_to_position_no_spell (html->engine->cursor, html->engine, html->priv->im_pre_pos + html->priv->im_pre_len);
- html_engine_delete (html->engine);
- html->priv->im_pre_len = 0;
- html_undo_thaw (html->engine->undo);
- }
+ html_undo_freeze (html->engine->undo);
+ html_cursor_exactly_jump_to_position_no_spell (html->engine->cursor, html->engine, html->priv->im_pre_pos);
+ html_engine_set_mark (html->engine);
+ html_cursor_exactly_jump_to_position_no_spell (html->engine->cursor, html->engine, html->priv->im_pre_pos + html->priv->im_pre_len);
+ html_engine_delete (html->engine);
+ html->priv->im_pre_len = 0;
+ html_undo_thaw (html->engine->undo);
+ }
pos = html->engine->cursor->position;
if (html->engine->mark && html->engine->mark->position > pos)
diff --git a/gtkhtml/htmlclueflow.c b/gtkhtml/htmlclueflow.c
index 44c7b03..fffae76 100644
--- a/gtkhtml/htmlclueflow.c
+++ b/gtkhtml/htmlclueflow.c
@@ -450,7 +450,7 @@ need_blockquote_padding (HTMLClueFlow *flow, HTMLClueFlow *prev)
if (i < flow->levels->len || flow->levels->len == 0) {
if (i < prev->levels->len)
return TRUE;
- else
+ else
return FALSE;
}
@@ -821,35 +821,35 @@ update_top_height (HTMLObject *begin, HTMLObject *end, gint *a, gint *d, gint *h
inline HTMLHAlignType
html_clueflow_get_halignment (HTMLClueFlow *flow)
{
- g_return_val_if_fail (flow != NULL, HTML_HALIGN_NONE);
+ g_return_val_if_fail (flow != NULL, HTML_HALIGN_NONE);
- if (HTML_CLUE (flow)->halign == HTML_HALIGN_NONE) {
- HTMLHAlignType halign;
+ if (HTML_CLUE (flow)->halign == HTML_HALIGN_NONE) {
+ HTMLHAlignType halign;
- if (HTML_OBJECT (flow)->parent && HTML_IS_TABLE_CELL (HTML_OBJECT (flow)->parent))
- halign = HTML_CLUE (HTML_OBJECT (flow)->parent)->halign == HTML_HALIGN_NONE
- ? HTML_TABLE_CELL (HTML_OBJECT (flow)->parent)->heading ? HTML_HALIGN_CENTER : HTML_HALIGN_NONE
- : HTML_CLUE (HTML_OBJECT (flow)->parent)->halign;
- else
- halign = HTML_CLUE (HTML_OBJECT (flow)->parent)->halign;
+ if (HTML_OBJECT (flow)->parent && HTML_IS_TABLE_CELL (HTML_OBJECT (flow)->parent))
+ halign = HTML_CLUE (HTML_OBJECT (flow)->parent)->halign == HTML_HALIGN_NONE
+ ? HTML_TABLE_CELL (HTML_OBJECT (flow)->parent)->heading ? HTML_HALIGN_CENTER : HTML_HALIGN_NONE
+ : HTML_CLUE (HTML_OBJECT (flow)->parent)->halign;
+ else
+ halign = HTML_CLUE (HTML_OBJECT (flow)->parent)->halign;
- if (halign == HTML_HALIGN_NONE) {
- switch (html_object_get_direction (HTML_OBJECT (flow))) {
- case HTML_DIRECTION_LTR:
- halign = HTML_HALIGN_LEFT;
- break;
- case HTML_DIRECTION_RTL:
- halign = HTML_HALIGN_RIGHT;
- break;
- default:
- break;
- }
- }
+ if (halign == HTML_HALIGN_NONE) {
+ switch (html_object_get_direction (HTML_OBJECT (flow))) {
+ case HTML_DIRECTION_LTR:
+ halign = HTML_HALIGN_LEFT;
+ break;
+ case HTML_DIRECTION_RTL:
+ halign = HTML_HALIGN_RIGHT;
+ break;
+ default:
+ break;
+ }
+ }
- return halign;
+ return halign;
- } else
- return HTML_CLUE (flow)->halign;
+ } else
+ return HTML_CLUE (flow)->halign;
}
static inline void
@@ -1885,8 +1885,8 @@ plain_padding (HTMLClueFlow *flow, GString *out, gboolean firstline)
pad_string = g_string_new ("");
#define APPEND_PLAIN(w) \
- pad_len += strlen (w); \
- if (out) g_string_append (pad_string, w);
+ pad_len += strlen (w); \
+ if (out) g_string_append (pad_string, w);
if (flow->levels->len) {
for (i = 0; i < flow->levels->len; i++) {
@@ -1921,7 +1921,7 @@ static void
append_selection_string (HTMLObject *self,
GString *buffer)
{
- (*HTML_OBJECT_CLASS (parent_class)->append_selection_string) (self, buffer);
+ (*HTML_OBJECT_CLASS (parent_class)->append_selection_string) (self, buffer);
if (self->selected) {
g_string_append_c (buffer, '\n');
@@ -2363,7 +2363,7 @@ search_text (HTMLObject **beg, HTMLSearch *info)
unicode_info = g_utf8_get_char (info->text + eq_bytes);
unicode_par = g_utf8_get_char ((gchar *) par + index);
if (!info->case_sensitive) {
- unicode_info = g_unichar_toupper (unicode_info);
+ unicode_info = g_unichar_toupper (unicode_info);
unicode_par = g_unichar_toupper (unicode_par);
}
diff --git a/gtkhtml/htmlembedded.c b/gtkhtml/htmlembedded.c
index fdae86d..e35d0ea 100644
--- a/gtkhtml/htmlembedded.c
+++ b/gtkhtml/htmlembedded.c
@@ -238,9 +238,9 @@ html_embedded_encode_string (const gchar *before, const gchar *codepage)
{
const gchar * str = before;
static const gchar *safe = "$-._!*(),"; /* RFC 1738 */
- unsigned pos = 0;
+ unsigned pos = 0;
GString *encoded = g_string_new ("");
- gchar buffer[5], *ptr;
+ gchar buffer[5], *ptr;
guchar c;
GIConv iconv_cd = generate_iconv_to (codepage);
@@ -250,7 +250,7 @@ html_embedded_encode_string (const gchar *before, const gchar *codepage)
g_iconv_close (iconv_cd);
}
- while (pos < strlen (str)) {
+ while (pos < strlen (str)) {
c = (guchar) str[pos];
diff --git a/gtkhtml/htmlengine-edit-clueflowstyle.c b/gtkhtml/htmlengine-edit-clueflowstyle.c
index 0b99f03..6c3b68e 100644
--- a/gtkhtml/htmlengine-edit-clueflowstyle.c
+++ b/gtkhtml/htmlengine-edit-clueflowstyle.c
@@ -197,7 +197,7 @@ undo_or_redo (HTMLEngine *engine, HTMLUndoData *data, HTMLUndoDirection dir, gui
break;
/* Go forward object by object, until we find one
- whose parent (i.e. paragraph) is different. */
+ whose parent (i.e. paragraph) is different. */
do {
if (op->forward)
obj = html_object_next_leaf (obj);
diff --git a/gtkhtml/htmlengine-edit-cursor.c b/gtkhtml/htmlengine-edit-cursor.c
index 4a43578..ec3fd26 100644
--- a/gtkhtml/htmlengine-edit-cursor.c
+++ b/gtkhtml/htmlengine-edit-cursor.c
@@ -79,7 +79,7 @@ html_engine_hide_cursor (HTMLEngine *engine)
void
html_engine_show_cursor (HTMLEngine *engine)
{
- HTMLEngine * e = engine;
+ HTMLEngine * e = engine;
g_return_if_fail (engine != NULL);
g_return_if_fail (HTML_IS_ENGINE (engine));
@@ -322,8 +322,8 @@ html_engine_draw_cursor_in_area (HTMLEngine *engine,
y2 -= HTML_EMBEDDED (obj)->abs_y;
break;
}
- obj = obj->parent;
- }
+ obj = obj->parent;
+ }
/* get scroll offset */
hadj = gtk_layout_get_hadjustment (GTK_LAYOUT (engine->widget));
diff --git a/gtkhtml/htmlengine-edit-movement.c b/gtkhtml/htmlengine-edit-movement.c
index 0afb236..8139236 100644
--- a/gtkhtml/htmlengine-edit-movement.c
+++ b/gtkhtml/htmlengine-edit-movement.c
@@ -334,8 +334,8 @@ html_engine_scroll_up (HTMLEngine *engine,
html_object_get_cursor_base (cursor->object, engine->painter, cursor->offset, &x, &new_y);
/* FIXME html_cursor_down() is broken. It should
- return FALSE and TRUE appropriately. But I am lazy
- now. */
+ return FALSE and TRUE appropriately. But I am lazy
+ now. */
if (new_y == y)
break;
diff --git a/gtkhtml/htmlengine-edit-table.c b/gtkhtml/htmlengine-edit-table.c
index 8a24a0a..a22f53a 100644
--- a/gtkhtml/htmlengine-edit-table.c
+++ b/gtkhtml/htmlengine-edit-table.c
@@ -470,12 +470,12 @@ html_engine_delete_table_column (HTMLEngine *e)
gint start_col, end_col;
HTMLTable *table;
- table = html_engine_get_table (e);
- if (!table || !HTML_IS_TABLE (table) ||
- !html_engine_get_table_start_end_cells (e, &start_cell, &end_cell)) {
+ table = html_engine_get_table (e);
+ if (!table || !HTML_IS_TABLE (table) ||
+ !html_engine_get_table_start_end_cells (e, &start_cell, &end_cell)) {
g_warning ("Invalid table object! Row deletion failed!");
- return;
- }
+ return;
+ }
start_col = start_cell->col;
end_col = end_cell->col;
diff --git a/gtkhtml/htmlengine.c b/gtkhtml/htmlengine.c
index 2b3f8c2..0578c75 100644
--- a/gtkhtml/htmlengine.c
+++ b/gtkhtml/htmlengine.c
@@ -1627,7 +1627,7 @@ element_parse_object (HTMLEngine *e, HTMLObject *clue, const gchar *attr)
parse_object_params (e, clue);
/* create the object */
- object_found = FALSE;
+ object_found = FALSE;
gtk_html_debug_log (e->widget,
"requesting object classid: %s\n",
classid ? classid : "(null)");
@@ -1773,7 +1773,7 @@ element_parse_iframe (HTMLEngine *e, HTMLObject *clue, const gchar *str)
else if (g_ascii_strcasecmp ("bottom", value) == 0)
valign = HTML_VALIGN_BOTTOM;
}
- element->style = html_style_set_display (element->style, DISPLAY_NONE);
+ element->style = html_style_set_display (element->style, DISPLAY_NONE);
/*
html_element_get_attr (element, "longdesc", &value);
html_element_get_attr (element, "name", &value);
@@ -3188,7 +3188,7 @@ block_end_table (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
table = html_stack_top (e->table_stack);
html_stack_pop (e->table_stack);
- if (table) {
+ if (table) {
if (table->col == 0 && table->row == 0) {
DT(printf ("deleting empty table %p\n", table);)
html_object_destroy (HTML_OBJECT (table));
diff --git a/gtkhtml/htmlentity.c b/gtkhtml/htmlentity.c
index 0a0e982..7eea461 100644
--- a/gtkhtml/htmlentity.c
+++ b/gtkhtml/htmlentity.c
@@ -95,10 +95,10 @@ hash (register const gchar *str, register guint len)
739, 739, 739, 739, 739, 739, 739, 739, 739, 10,
35, 20, 0, 739, 739, 739, 739, 739, 739, 739,
739, 739, 739, 739, 739, 175, 135, 30, 60, 95,
- 5, 0, 5, 180, 739, 15, 5, 0, 15, 110,
+ 5, 0, 5, 180, 739, 15, 5, 0, 15, 110,
110, 739, 5, 5, 5, 100, 739, 739, 0, 20,
- 0, 739, 739, 739, 739, 739, 739, 5, 60, 50,
- 0, 15, 144, 115, 215, 10, 225, 10, 95, 125,
+ 0, 739, 739, 739, 739, 739, 739, 5, 60, 50,
+ 0, 15, 144, 115, 215, 10, 225, 10, 95, 125,
25, 0, 5, 218, 90, 20, 0, 65, 35, 55,
45, 115, 5, 15, 739, 739, 739, 739, 739, 739,
739, 739, 739, 739, 739, 739, 739, 739, 739, 739,
@@ -120,18 +120,18 @@ hash (register const gchar *str, register guint len)
switch (hval)
{
default:
- hval += asso_values[(guchar)str[4]];
+ hval += asso_values[(guchar)str[4]];
/*FALLTHROUGH*/
case 4:
case 3:
- hval += asso_values[(guchar)str[2]];
+ hval += asso_values[(guchar)str[2]];
/*FALLTHROUGH*/
case 2:
- hval += asso_values[(guchar)str[1]+1];
+ hval += asso_values[(guchar)str[1]+1];
/*FALLTHROUGH*/
case 1:
- hval += asso_values[(guchar)str[0]];
- break;
+ hval += asso_values[(guchar)str[0]];
+ break;
}
return hval + asso_values[(guchar)str[len - 1]];
}
@@ -853,13 +853,13 @@ html_entity_hash (register const gchar *str, register guint len)
register gint key = hash (str, len);
if (key <= MAX_HASH_VALUE && key >= 0)
- if (len == lengthtable[key])
- {
- register const gchar *s = wordlist[key].name;
+ if (len == lengthtable[key])
+ {
+ register const gchar *s = wordlist[key].name;
- if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
- return &wordlist[key];
- }
+ if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
+ return &wordlist[key];
+ }
}
return 0;
}
diff --git a/gtkhtml/htmlframeset.c b/gtkhtml/htmlframeset.c
index 0351054..34f0241 100644
--- a/gtkhtml/htmlframeset.c
+++ b/gtkhtml/htmlframeset.c
@@ -104,7 +104,7 @@ calc_dimension (GPtrArray *dim, gint *span, gint total)
if (len->type == HTML_LENGTH_TYPE_PIXELS)
span[i] = len->val;
- else if (len->type == HTML_LENGTH_TYPE_FRACTION)
+ else if (len->type == HTML_LENGTH_TYPE_FRACTION)
num_frac += len->val;
else if (len->type == HTML_LENGTH_TYPE_PERCENT)
span[i] = (total * len->val) / 100;
diff --git a/gtkhtml/htmliframe.c b/gtkhtml/htmliframe.c
index 8ffcf27..8560127 100644
--- a/gtkhtml/htmliframe.c
+++ b/gtkhtml/htmliframe.c
@@ -233,8 +233,8 @@ static void
copy (HTMLObject *self,
HTMLObject *dest)
{
- HTMLIFrame *s = HTML_IFRAME (self);
- HTMLIFrame *d = HTML_IFRAME (dest);
+ HTMLIFrame *s = HTML_IFRAME (self);
+ HTMLIFrame *d = HTML_IFRAME (dest);
(* HTML_OBJECT_CLASS (parent_class)->copy) (self, dest);
/*
diff --git a/gtkhtml/htmlimage.c b/gtkhtml/htmlimage.c
index 11f3152..48ebd09 100644
--- a/gtkhtml/htmlimage.c
+++ b/gtkhtml/htmlimage.c
@@ -81,7 +81,7 @@ html_image_get_actual_width (HTMLImage *image, HTMLPainter *painter)
if (image->percent_width) {
/* The cast to `gdouble' is to avoid overflow (eg. when
- printing). */
+ printing). */
width = ((gdouble) HTML_OBJECT (image)->max_width
* image->specified_width) / 100;
} else if (image->specified_width > 0) {
@@ -114,7 +114,7 @@ html_image_get_actual_height (HTMLImage *image, HTMLPainter *painter)
if (image->percent_height) {
/* The cast to `gdouble' is to avoid overflow (eg. when
- printing). */
+ printing). */
height = ((gdouble) html_engine_get_view_height (image->image_ptr->factory->engine)
* image->specified_height) / 100;
} else if (image->specified_height > 0) {
diff --git a/gtkhtml/htmlmarshal.c b/gtkhtml/htmlmarshal.c
index f91d409..ecf477f 100644
--- a/gtkhtml/htmlmarshal.c
+++ b/gtkhtml/htmlmarshal.c
@@ -56,8 +56,8 @@ html_g_cclosure_marshal_BOOLEAN__OBJECT (GClosure *closure,
gpointer marshal_data)
{
typedef gboolean (*GMarshalFunc_BOOLEAN__OBJECT) (gpointer data1,
- gpointer arg_1,
- gpointer data2);
+ gpointer arg_1,
+ gpointer data2);
register GMarshalFunc_BOOLEAN__OBJECT callback;
register GCClosure *cc = (GCClosure*) closure;
register gpointer data1, data2;
@@ -79,8 +79,8 @@ html_g_cclosure_marshal_BOOLEAN__OBJECT (GClosure *closure,
callback = (GMarshalFunc_BOOLEAN__OBJECT) (marshal_data ? marshal_data : cc->callback);
v_return = callback (data1,
- g_marshal_value_peek_object (param_values + 1),
- data2);
+ g_marshal_value_peek_object (param_values + 1),
+ data2);
g_value_set_boolean (return_value, v_return);
}
@@ -95,8 +95,8 @@ html_g_cclosure_marshal_BOOLEAN__ENUM (GClosure *closure,
gpointer marshal_data)
{
typedef gboolean (*GMarshalFunc_BOOLEAN__ENUM) (gpointer data1,
- gint arg_1,
- gpointer data2);
+ gint arg_1,
+ gpointer data2);
register GMarshalFunc_BOOLEAN__ENUM callback;
register GCClosure *cc = (GCClosure*) closure;
register gpointer data1, data2;
@@ -118,8 +118,8 @@ html_g_cclosure_marshal_BOOLEAN__ENUM (GClosure *closure,
callback = (GMarshalFunc_BOOLEAN__ENUM) (marshal_data ? marshal_data : cc->callback);
v_return = callback (data1,
- g_marshal_value_peek_enum (param_values + 1),
- data2);
+ g_marshal_value_peek_enum (param_values + 1),
+ data2);
g_value_set_boolean (return_value, v_return);
}
@@ -134,9 +134,9 @@ html_g_cclosure_marshal_VOID__STRING_POINTER (GClosure *closure,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__STRING_POINTER) (gpointer data1,
- gpointer arg_1,
- gpointer arg_2,
- gpointer data2);
+ gpointer arg_1,
+ gpointer arg_2,
+ gpointer data2);
register GMarshalFunc_VOID__STRING_POINTER callback;
register GCClosure *cc = (GCClosure*) closure;
register gpointer data1, data2;
@@ -156,9 +156,9 @@ html_g_cclosure_marshal_VOID__STRING_POINTER (GClosure *closure,
callback = (GMarshalFunc_VOID__STRING_POINTER) (marshal_data ? marshal_data : cc->callback);
callback (data1,
- g_marshal_value_peek_string (param_values + 1),
- g_marshal_value_peek_pointer (param_values + 2),
- data2);
+ g_marshal_value_peek_string (param_values + 1),
+ g_marshal_value_peek_pointer (param_values + 2),
+ data2);
}
/* VOID:POINTER,INT (htmlclosures.list:4) */
@@ -171,9 +171,9 @@ html_g_cclosure_marshal_VOID__POINTER_INT (GClosure *closure,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__POINTER_INT) (gpointer data1,
- gpointer arg_1,
- gint arg_2,
- gpointer data2);
+ gpointer arg_1,
+ gint arg_2,
+ gpointer data2);
register GMarshalFunc_VOID__POINTER_INT callback;
register GCClosure *cc = (GCClosure*) closure;
register gpointer data1, data2;
@@ -193,9 +193,9 @@ html_g_cclosure_marshal_VOID__POINTER_INT (GClosure *closure,
callback = (GMarshalFunc_VOID__POINTER_INT) (marshal_data ? marshal_data : cc->callback);
callback (data1,
- g_marshal_value_peek_pointer (param_values + 1),
- g_marshal_value_peek_int (param_values + 2),
- data2);
+ g_marshal_value_peek_pointer (param_values + 1),
+ g_marshal_value_peek_int (param_values + 2),
+ data2);
}
/* VOID:STRING,STRING,STRING (htmlclosures.list:5) */
@@ -208,10 +208,10 @@ html_g_cclosure_marshal_VOID__STRING_STRING_STRING (GClosure *closure,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__STRING_STRING_STRING) (gpointer data1,
- gpointer arg_1,
- gpointer arg_2,
- gpointer arg_3,
- gpointer data2);
+ gpointer arg_1,
+ gpointer arg_2,
+ gpointer arg_3,
+ gpointer data2);
register GMarshalFunc_VOID__STRING_STRING_STRING callback;
register GCClosure *cc = (GCClosure*) closure;
register gpointer data1, data2;
@@ -231,10 +231,10 @@ html_g_cclosure_marshal_VOID__STRING_STRING_STRING (GClosure *closure,
callback = (GMarshalFunc_VOID__STRING_STRING_STRING) (marshal_data ? marshal_data : cc->callback);
callback (data1,
- g_marshal_value_peek_string (param_values + 1),
- g_marshal_value_peek_string (param_values + 2),
- g_marshal_value_peek_string (param_values + 3),
- data2);
+ g_marshal_value_peek_string (param_values + 1),
+ g_marshal_value_peek_string (param_values + 2),
+ g_marshal_value_peek_string (param_values + 3),
+ data2);
}
/* VOID:INT,INT,FLOAT (htmlclosures.list:6) */
@@ -247,10 +247,10 @@ html_g_cclosure_marshal_VOID__INT_INT_FLOAT (GClosure *closure,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__INT_INT_FLOAT) (gpointer data1,
- gint arg_1,
- gint arg_2,
- gfloat arg_3,
- gpointer data2);
+ gint arg_1,
+ gint arg_2,
+ gfloat arg_3,
+ gpointer data2);
register GMarshalFunc_VOID__INT_INT_FLOAT callback;
register GCClosure *cc = (GCClosure*) closure;
register gpointer data1, data2;
@@ -270,10 +270,10 @@ html_g_cclosure_marshal_VOID__INT_INT_FLOAT (GClosure *closure,
callback = (GMarshalFunc_VOID__INT_INT_FLOAT) (marshal_data ? marshal_data : cc->callback);
callback (data1,
- g_marshal_value_peek_int (param_values + 1),
- g_marshal_value_peek_int (param_values + 2),
- g_marshal_value_peek_float (param_values + 3),
- data2);
+ g_marshal_value_peek_int (param_values + 1),
+ g_marshal_value_peek_int (param_values + 2),
+ g_marshal_value_peek_float (param_values + 3),
+ data2);
}
/* VOID:ENUM,ENUM,FLOAT (htmlclosures.list:7) */
@@ -286,10 +286,10 @@ html_g_cclosure_marshal_VOID__ENUM_ENUM_FLOAT (GClosure *closure,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__ENUM_ENUM_FLOAT) (gpointer data1,
- gint arg_1,
- gint arg_2,
- gfloat arg_3,
- gpointer data2);
+ gint arg_1,
+ gint arg_2,
+ gfloat arg_3,
+ gpointer data2);
register GMarshalFunc_VOID__ENUM_ENUM_FLOAT callback;
register GCClosure *cc = (GCClosure*) closure;
register gpointer data1, data2;
@@ -309,10 +309,10 @@ html_g_cclosure_marshal_VOID__ENUM_ENUM_FLOAT (GClosure *closure,
callback = (GMarshalFunc_VOID__ENUM_ENUM_FLOAT) (marshal_data ? marshal_data : cc->callback);
callback (data1,
- g_marshal_value_peek_enum (param_values + 1),
- g_marshal_value_peek_enum (param_values + 2),
- g_marshal_value_peek_float (param_values + 3),
- data2);
+ g_marshal_value_peek_enum (param_values + 1),
+ g_marshal_value_peek_enum (param_values + 2),
+ g_marshal_value_peek_float (param_values + 3),
+ data2);
}
/* VOID:INT,INT (htmlclosures.list:8) */
@@ -325,9 +325,9 @@ html_g_cclosure_marshal_VOID__INT_INT (GClosure *closure,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__INT_INT) (gpointer data1,
- gint arg_1,
- gint arg_2,
- gpointer data2);
+ gint arg_1,
+ gint arg_2,
+ gpointer data2);
register GMarshalFunc_VOID__INT_INT callback;
register GCClosure *cc = (GCClosure*) closure;
register gpointer data1, data2;
@@ -347,9 +347,9 @@ html_g_cclosure_marshal_VOID__INT_INT (GClosure *closure,
callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback);
callback (data1,
- g_marshal_value_peek_int (param_values + 1),
- g_marshal_value_peek_int (param_values + 2),
- data2);
+ g_marshal_value_peek_int (param_values + 1),
+ g_marshal_value_peek_int (param_values + 2),
+ data2);
}
/* VOID:ENUM,ENUM (htmlclosures.list:9) */
@@ -362,9 +362,9 @@ html_g_cclosure_marshal_VOID__ENUM_ENUM (GClosure *closure,
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__ENUM_ENUM) (gpointer data1,
- gint arg_1,
- gint arg_2,
- gpointer data2);
+ gint arg_1,
+ gint arg_2,
+ gpointer data2);
register GMarshalFunc_VOID__ENUM_ENUM callback;
register GCClosure *cc = (GCClosure*) closure;
register gpointer data1, data2;
@@ -384,9 +384,9 @@ html_g_cclosure_marshal_VOID__ENUM_ENUM (GClosure *closure,
callback = (GMarshalFunc_VOID__ENUM_ENUM) (marshal_data ? marshal_data : cc->callback);
callback (data1,
- g_marshal_value_peek_enum (param_values + 1),
- g_marshal_value_peek_enum (param_values + 2),
- data2);
+ g_marshal_value_peek_enum (param_values + 1),
+ g_marshal_value_peek_enum (param_values + 2),
+ data2);
}
/* VOID:POINTER,BOOL,BOOL,BOOL (htmlclosures.list:10) */
@@ -399,11 +399,11 @@ html_g_cclosure_marshal_VOID__POINTER_BOOLEAN_BOOLEAN_BOOLEAN (GClosure *clo
gpointer marshal_data)
{
typedef void (*GMarshalFunc_VOID__POINTER_BOOLEAN_BOOLEAN_BOOLEAN) (gpointer data1,
- gpointer arg_1,
- gboolean arg_2,
- gboolean arg_3,
- gboolean arg_4,
- gpointer data2);
+ gpointer arg_1,
+ gboolean arg_2,
+ gboolean arg_3,
+ gboolean arg_4,
+ gpointer data2);
register GMarshalFunc_VOID__POINTER_BOOLEAN_BOOLEAN_BOOLEAN callback;
register GCClosure *cc = (GCClosure*) closure;
register gpointer data1, data2;
@@ -423,11 +423,11 @@ html_g_cclosure_marshal_VOID__POINTER_BOOLEAN_BOOLEAN_BOOLEAN (GClosure *clo
callback = (GMarshalFunc_VOID__POINTER_BOOLEAN_BOOLEAN_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
callback (data1,
- g_marshal_value_peek_pointer (param_values + 1),
- g_marshal_value_peek_boolean (param_values + 2),
- g_marshal_value_peek_boolean (param_values + 3),
- g_marshal_value_peek_boolean (param_values + 4),
- data2);
+ g_marshal_value_peek_pointer (param_values + 1),
+ g_marshal_value_peek_boolean (param_values + 2),
+ g_marshal_value_peek_boolean (param_values + 3),
+ g_marshal_value_peek_boolean (param_values + 4),
+ data2);
}
/* POINTER:VOID (htmlclosures.list:11) */
@@ -440,7 +440,7 @@ html_g_cclosure_marshal_POINTER__VOID (GClosure *closure,
gpointer marshal_data)
{
typedef gpointer (*GMarshalFunc_POINTER__VOID) (gpointer data1,
- gpointer data2);
+ gpointer data2);
register GMarshalFunc_POINTER__VOID callback;
register GCClosure *cc = (GCClosure*) closure;
register gpointer data1, data2;
@@ -462,7 +462,7 @@ html_g_cclosure_marshal_POINTER__VOID (GClosure *closure,
callback = (GMarshalFunc_POINTER__VOID) (marshal_data ? marshal_data : cc->callback);
v_return = callback (data1,
- data2);
+ data2);
g_value_set_pointer (return_value, v_return);
}
diff --git a/gtkhtml/htmlobject.c b/gtkhtml/htmlobject.c
index 70d4ecb..b3e3c33 100644
--- a/gtkhtml/htmlobject.c
+++ b/gtkhtml/htmlobject.c
@@ -356,7 +356,7 @@ relayout (HTMLObject *self,
HTMLObject *child)
{
/* FIXME gint types of this stuff might change in `htmlobject.h',
- remember to sync. */
+ remember to sync. */
guint prev_width;
guint prev_ascent, prev_descent;
gboolean changed;
@@ -369,7 +369,7 @@ relayout (HTMLObject *self,
prev_descent = self->descent;
/* Notice that this will reset ascent and descent which we
- need afterwards. Yeah, yuck, bleargh. */
+ need afterwards. Yeah, yuck, bleargh. */
html_object_reset (self);
/* Crappy hack to make crappy htmlclueflow.c happy. */
diff --git a/gtkhtml/htmlrule.c b/gtkhtml/htmlrule.c
index 4ccfe5d..0b58214 100644
--- a/gtkhtml/htmlrule.c
+++ b/gtkhtml/htmlrule.c
@@ -168,7 +168,7 @@ html_rule_draw (HTMLObject *o,
w = o->width;
else
/* The cast to `gdouble' is to avoid overflow (eg. when
- printing). */
+ printing). */
w = ((gdouble) o->width * o->percent) / 100;
switch (rule->halign) {
diff --git a/gtkhtml/htmltablecell.c b/gtkhtml/htmltablecell.c
index 5d421be..119726e 100644
--- a/gtkhtml/htmltablecell.c
+++ b/gtkhtml/htmltablecell.c
@@ -307,7 +307,7 @@ save (HTMLObject *self,
SB " NOWRAP" SE;
if (HTML_CLUE (cell)->halign != HTML_HALIGN_NONE)
SB " ALIGN=\"%s\"",
- html_engine_save_get_paragraph_align (html_alignment_to_paragraph (HTML_CLUE (cell)->halign)) SE;
+ html_engine_save_get_paragraph_align (html_alignment_to_paragraph (HTML_CLUE (cell)->halign)) SE;
if (HTML_CLUE (cell)->valign != HTML_VALIGN_MIDDLE)
SB " VALIGN=\"%s\"",
HTML_CLUE (cell)->valign == HTML_VALIGN_TOP ? "top" : "bottom" SE;
diff --git a/gtkhtml/htmltext.c b/gtkhtml/htmltext.c
index e1ad367..e4c5905 100644
--- a/gtkhtml/htmltext.c
+++ b/gtkhtml/htmltext.c
@@ -1208,7 +1208,7 @@ html_text_prepare_attrs (HTMLText *text, HTMLPainter *painter)
if (flow && e) {
html_text_add_cite_color (attrs, text, flow, e);
- }
+ }
if (HTML_IS_PLAIN_PAINTER (painter)) {
attr = pango_attr_family_new (painter->font_manager.fixed.face);
@@ -3990,13 +3990,13 @@ 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);
- Link *link = html_text_get_link_at_offset (text,offset);
+ HTMLEngine *object_engine=html_object_engine (HTML_OBJECT (text),engine);
+ Link *link = html_text_get_link_at_offset (text,offset);
if (link) {
- link->is_visited = is_visited;
- html_text_change_set (text, HTML_CHANGE_RECALC_PI);
- html_text_queue_draw (text, object_engine, offset, 1);
- html_engine_flush_draw_queue (object_engine);
- }
+ link->is_visited = is_visited;
+ html_text_change_set (text, HTML_CHANGE_RECALC_PI);
+ html_text_queue_draw (text, object_engine, offset, 1);
+ html_engine_flush_draw_queue (object_engine);
+ }
}
diff --git a/gtkhtml/htmlurl.c b/gtkhtml/htmlurl.c
index 2844ebf..e5aca17 100644
--- a/gtkhtml/htmlurl.c
+++ b/gtkhtml/htmlurl.c
@@ -138,7 +138,7 @@ html_url_new (const gchar *s)
/* Scan for the protocol part. */
/* FIXME I am assuming that the correct regexp for detecting it is
- `^[a-zA-Z0-9]:'. */
+ `^[a-zA-Z0-9]:'. */
p = s;
while ((*p >= 'a' && *p <= 'z')
@@ -447,7 +447,7 @@ html_url_to_string (const HTMLURL *url)
}
/* Notice that the `path' part is always supposed to start with a
- slash, so we don't need to append the slash here. */
+ slash, so we don't need to append the slash here. */
if (path_length != 0)
APPEND_MEMBER (path);
diff --git a/gtkhtml/testgtkhtml.c b/gtkhtml/testgtkhtml.c
index 6d8edd8..e6bb1e6 100644
--- a/gtkhtml/testgtkhtml.c
+++ b/gtkhtml/testgtkhtml.c
@@ -1228,29 +1228,29 @@ main (gint argc, gchar *argv[])
main_table = gtk_table_new (1, 4, FALSE);
gtk_table_attach (GTK_TABLE (main_table),
- bar,
+ bar,
/* X direction */ /* Y direction */
- 0, 1, 0, 1,
- GTK_EXPAND | GTK_FILL, GTK_SHRINK,
- 0, 0);
+ 0, 1, 0, 1,
+ GTK_EXPAND | GTK_FILL, GTK_SHRINK,
+ 0, 0);
gtk_table_attach (GTK_TABLE (main_table),
- create_toolbars (),
+ create_toolbars (),
/* X direction */ /* Y direction */
- 0, 1, 1, 2,
- GTK_EXPAND | GTK_FILL, GTK_SHRINK,
- 0, 0);
+ 0, 1, 1, 2,
+ GTK_EXPAND | GTK_FILL, GTK_SHRINK,
+ 0, 0);
gtk_table_attach (GTK_TABLE (main_table),
- scrolled_window,
+ scrolled_window,
/* X direction */ /* Y direction */
- 0, 1, 2, 3,
- GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
- 0, 0);
+ 0, 1, 2, 3,
+ GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
+ 0, 0);
gtk_table_attach (GTK_TABLE (main_table),
- statusbar,
+ statusbar,
/* X direction */ /* Y direction */
- 0, 1, 3, 4,
- GTK_EXPAND | GTK_FILL, GTK_SHRINK,
- 0, 0);
+ 0, 1, 3, 4,
+ GTK_EXPAND | GTK_FILL, GTK_SHRINK,
+ 0, 0);
/*app*/
gtk_container_add (GTK_CONTAINER (app), main_table);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
