[gthumb: 9/57] esthetic changes
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gthumb: 9/57] esthetic changes
- Date: Sun, 20 Jun 2010 16:22:30 +0000 (UTC)
commit 0e0e5b1ceaaaa98619d5772fa79f24a56d4e9c90
Author: Paolo Bacchilega <paobac src gnome org>
Date: Fri Jun 4 10:40:16 2010 +0200
esthetic changes
gthumb/dom.c | 418 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 209 insertions(+), 209 deletions(-)
---
diff --git a/gthumb/dom.c b/gthumb/dom.c
index 1138738..bb9904c 100644
--- a/gthumb/dom.c
+++ b/gthumb/dom.c
@@ -47,21 +47,21 @@ dom_error_quark (void)
}
-static void
-_g_list_free_g_object_unref (GList *self)
+static void
+_g_list_free_g_object_unref (GList *self)
{
g_list_foreach (self, ((GFunc) (g_object_unref)), NULL);
g_list_free (self);
}
-static void
+static void
_g_string_append_c_n_times (GString *string,
- char c,
- int times)
+ char c,
+ int times)
{
int i;
-
+
for (i = 1; i <= times; i++)
g_string_append_c (string, c);
}
@@ -73,11 +73,11 @@ _g_xml_attribute_quote (char *value)
char *escaped;
GString *dest;
const char *p;
-
+
g_return_val_if_fail (value != NULL, NULL);
-
+
escaped = g_markup_escape_text (value, -1);
-
+
dest = g_string_new ("\"");
for (p = escaped; (*p); p++) {
if (*p == '"')
@@ -86,15 +86,15 @@ _g_xml_attribute_quote (char *value)
g_string_append_c (dest, *p);
}
g_string_append_c (dest, '"');
-
+
g_free (escaped);
-
+
return g_string_free (dest, FALSE);
}
static gboolean
-_g_xml_tag_is_special (const char *tag_name)
+_g_xml_tag_is_special (const char *tag_name)
{
return (*tag_name == '#');
}
@@ -110,7 +110,7 @@ dom_attribute_dump (gpointer key,
{
GString *xml = user_data;
char *quoted_value;
-
+
g_string_append_c (xml, ' ');
g_string_append (xml, key);
g_string_append_c (xml, '=');
@@ -120,57 +120,57 @@ dom_attribute_dump (gpointer key,
}
-static char *
-dom_element_dump (DomElement *self,
- int level)
+static char *
+dom_element_dump (DomElement *self,
+ int level)
{
return DOM_ELEMENT_GET_CLASS (self)->dump (self, level);
}
-static char *
-dom_element_real_dump (DomElement *self,
- int level)
+static char *
+dom_element_real_dump (DomElement *self,
+ int level)
{
GString *xml;
GList *scan;
-
+
xml = g_string_new ("");
-
+
if ((self->parent_node != NULL) && (self != self->parent_node->first_child))
g_string_append (xml, XML_RC);
-
+
/* start tag */
-
+
if (! _g_xml_tag_is_special (self->tag_name)) {
- _g_string_append_c_n_times (xml, ' ', level * XML_TAB_WIDTH);
+ _g_string_append_c_n_times (xml, ' ', level * XML_TAB_WIDTH);
g_string_append_c (xml, '<');
g_string_append (xml, self->tag_name);
- g_hash_table_foreach (self->attributes, (GHFunc) dom_attribute_dump, xml);
+ g_hash_table_foreach (self->attributes, (GHFunc) dom_attribute_dump, xml);
if (self->child_nodes != NULL) {
g_string_append_c (xml, '>');
if (! DOM_IS_TEXT_NODE (self->first_child))
g_string_append (xml, XML_RC);
- }
+ }
else {
g_string_append (xml, "/>");
- return g_string_free (xml, FALSE);
+ return g_string_free (xml, FALSE);
}
}
-
+
/* tag children */
-
+
for (scan = self->child_nodes; scan != NULL; scan = scan->next) {
DomElement *child = scan->data;
char *child_dump;
-
+
child_dump = dom_element_dump (child, level + 1);
g_string_append (xml, child_dump);
g_free (child_dump);
}
-
+
/* end tag */
-
+
if (! _g_xml_tag_is_special (self->tag_name)) {
if ((self->child_nodes != NULL) && ! DOM_IS_TEXT_NODE (self->first_child)) {
g_string_append (xml, XML_RC);
@@ -180,19 +180,19 @@ dom_element_real_dump (DomElement *self,
g_string_append (xml, self->tag_name);
g_string_append_c (xml, '>');
}
-
+
return g_string_free (xml, FALSE);
}
-static void
-dom_element_instance_init (DomElement *self)
+static void
+dom_element_instance_init (DomElement *self)
{
self->tag_name = NULL;
self->prefix = NULL;
- self->attributes = g_hash_table_new_full (g_str_hash,
- g_str_equal,
- (GDestroyNotify) g_free,
+ self->attributes = g_hash_table_new_full (g_str_hash,
+ g_str_equal,
+ (GDestroyNotify) g_free,
(GDestroyNotify )g_free);
self->next_sibling = NULL;
self->previous_sibling = NULL;
@@ -203,8 +203,8 @@ dom_element_instance_init (DomElement *self)
}
-static void
-dom_element_finalize (GObject *obj)
+static void
+dom_element_finalize (GObject *obj)
{
DomElement *self;
@@ -218,8 +218,8 @@ dom_element_finalize (GObject *obj)
}
-static void
-dom_element_class_init (DomElementClass *klass)
+static void
+dom_element_class_init (DomElementClass *klass)
{
dom_element_parent_class = g_type_class_peek_parent (klass);
G_OBJECT_CLASS (klass)->finalize = dom_element_finalize;
@@ -227,34 +227,34 @@ dom_element_class_init (DomElementClass *klass)
}
-GType
-dom_element_get_type (void)
+GType
+dom_element_get_type (void)
{
static GType dom_element_type_id = 0;
if (dom_element_type_id == 0) {
- static const GTypeInfo g_define_type_info = {
- sizeof (DomElementClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) dom_element_class_init,
- (GClassFinalizeFunc) NULL,
- NULL,
- sizeof (DomElement),
- 0,
- (GInstanceInitFunc) dom_element_instance_init,
- NULL
+ static const GTypeInfo g_define_type_info = {
+ sizeof (DomElementClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) dom_element_class_init,
+ (GClassFinalizeFunc) NULL,
+ NULL,
+ sizeof (DomElement),
+ 0,
+ (GInstanceInitFunc) dom_element_instance_init,
+ NULL
};
- dom_element_type_id = g_type_register_static (G_TYPE_INITIALLY_UNOWNED,
- "DomElement",
- &g_define_type_info,
+ dom_element_type_id = g_type_register_static (G_TYPE_INITIALLY_UNOWNED,
+ "DomElement",
+ &g_define_type_info,
0);
}
return dom_element_type_id;
}
-static DomElement *
-dom_element_new (const char *a_tag_name)
+static DomElement *
+dom_element_new (const char *a_tag_name)
{
DomElement *self;
@@ -267,42 +267,42 @@ dom_element_new (const char *a_tag_name)
}
-void
-dom_element_append_child (DomElement *self,
- DomElement *child)
+void
+dom_element_append_child (DomElement *self,
+ DomElement *child)
{
GList *child_link;
-
+
g_return_if_fail (DOM_IS_ELEMENT (self));
g_return_if_fail (DOM_IS_ELEMENT (child));
self->child_nodes = g_list_append (self->child_nodes, g_object_ref_sink (child));
-
+
/* update child attributes */
-
+
child_link = g_list_find (self->child_nodes, child);
child->parent_node = self;
if (child_link->prev != NULL) {
DomElement *prev_sibling;
-
+
prev_sibling = child_link->prev->data;
child->previous_sibling = prev_sibling;
prev_sibling->next_sibling = child;
}
- else
+ else
child->previous_sibling = NULL;
child->next_sibling = NULL;
-
+
/* update self attributes */
-
+
self->first_child = (self->first_child == NULL) ? child_link->data : self->first_child;
self->last_child = child;
}
-const char *
-dom_element_get_attribute (DomElement *self,
- const char *name)
+const char *
+dom_element_get_attribute (DomElement *self,
+ const char *name)
{
g_return_val_if_fail (DOM_IS_ELEMENT (self), NULL);
g_return_val_if_fail (name != NULL, NULL);
@@ -311,9 +311,9 @@ dom_element_get_attribute (DomElement *self,
}
-gboolean
-dom_element_has_attribute (DomElement *self,
- const char *name)
+gboolean
+dom_element_has_attribute (DomElement *self,
+ const char *name)
{
g_return_val_if_fail (DOM_IS_ELEMENT (self), FALSE);
g_return_val_if_fail (name != NULL, FALSE);
@@ -322,18 +322,18 @@ dom_element_has_attribute (DomElement *self,
}
-gboolean
-dom_element_has_child_nodes (DomElement *self)
+gboolean
+dom_element_has_child_nodes (DomElement *self)
{
g_return_val_if_fail (DOM_IS_ELEMENT (self), FALSE);
-
+
return self->child_nodes != NULL;
}
-void
-dom_element_remove_attribute (DomElement *self,
- const char *name)
+void
+dom_element_remove_attribute (DomElement *self,
+ const char *name)
{
g_return_if_fail (DOM_IS_ELEMENT (self));
g_return_if_fail (name != NULL);
@@ -343,8 +343,8 @@ dom_element_remove_attribute (DomElement *self,
DomElement *
-dom_element_remove_child (DomElement *self,
- DomElement *node)
+dom_element_remove_child (DomElement *self,
+ DomElement *node)
{
g_return_val_if_fail (DOM_IS_ELEMENT (self), NULL);
g_return_val_if_fail (DOM_IS_ELEMENT (node), NULL);
@@ -354,10 +354,10 @@ dom_element_remove_child (DomElement *self,
}
-void
-dom_element_replace_child (DomElement *self,
- DomElement *new_child,
- DomElement *old_child)
+void
+dom_element_replace_child (DomElement *self,
+ DomElement *new_child,
+ DomElement *old_child)
{
GList *link;
@@ -368,15 +368,15 @@ dom_element_replace_child (DomElement *self,
link = g_list_find (self->child_nodes, old_child);
if (link == NULL)
return;
- g_object_unref (link->data);
- link->data = g_object_ref (new_child);
+ g_object_unref (link->data);
+ link->data = g_object_ref (new_child);
}
-void
-dom_element_set_attribute (DomElement *self,
- const char *name,
- const char *value)
+void
+dom_element_set_attribute (DomElement *self,
+ const char *name,
+ const char *value)
{
g_return_if_fail (DOM_IS_ELEMENT (self));
g_return_if_fail (name != NULL);
@@ -399,9 +399,9 @@ dom_element_get_inner_text (DomElement *self)
/* -- DomTextNode -- */
-static char *
-dom_text_node_real_dump (DomElement *base,
- int level)
+static char *
+dom_text_node_real_dump (DomElement *base,
+ int level)
{
DomTextNode *self;
@@ -410,11 +410,11 @@ dom_text_node_real_dump (DomElement *base,
}
-static void
-dom_text_node_finalize (GObject *obj)
+static void
+dom_text_node_finalize (GObject *obj)
{
DomTextNode *self;
-
+
self = DOM_TEXT_NODE (obj);
g_free (self->data);
@@ -422,8 +422,8 @@ dom_text_node_finalize (GObject *obj)
}
-static void
-dom_text_node_class_init (DomTextNodeClass *klass)
+static void
+dom_text_node_class_init (DomTextNodeClass *klass)
{
dom_text_node_parent_class = g_type_class_peek_parent (klass);
G_OBJECT_CLASS (klass)->finalize = dom_text_node_finalize;
@@ -431,48 +431,48 @@ dom_text_node_class_init (DomTextNodeClass *klass)
}
-static void
-dom_text_node_instance_init (DomTextNode *self)
+static void
+dom_text_node_instance_init (DomTextNode *self)
{
DOM_ELEMENT (self)->tag_name = g_strdup (XML_TEXT_NODE_TAG_NAME);
self->data = NULL;
}
-GType
-dom_text_node_get_type (void)
+GType
+dom_text_node_get_type (void)
{
static GType dom_text_node_type_id = 0;
if (dom_text_node_type_id == 0) {
- static const GTypeInfo g_define_type_info = {
- sizeof (DomTextNodeClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) dom_text_node_class_init,
- (GClassFinalizeFunc) NULL,
- NULL,
- sizeof (DomTextNode),
- 0,
- (GInstanceInitFunc) dom_text_node_instance_init,
- NULL
+ static const GTypeInfo g_define_type_info = {
+ sizeof (DomTextNodeClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) dom_text_node_class_init,
+ (GClassFinalizeFunc) NULL,
+ NULL,
+ sizeof (DomTextNode),
+ 0,
+ (GInstanceInitFunc) dom_text_node_instance_init,
+ NULL
};
- dom_text_node_type_id = g_type_register_static (DOM_TYPE_ELEMENT,
- "DomTextNode",
- &g_define_type_info,
+ dom_text_node_type_id = g_type_register_static (DOM_TYPE_ELEMENT,
+ "DomTextNode",
+ &g_define_type_info,
0);
}
return dom_text_node_type_id;
}
-static DomTextNode *
-dom_text_node_new (const char *a_data)
+static DomTextNode *
+dom_text_node_new (const char *a_data)
{
DomTextNode *self;
-
+
self = g_object_newv (DOM_TYPE_TEXT_NODE, 0, NULL);
- self->data = (a_data == NULL ? g_strdup ("") : g_strdup (a_data));
-
+ self->data = (a_data == NULL ? g_strdup ("") : g_strdup (a_data));
+
return self;
}
@@ -480,32 +480,32 @@ dom_text_node_new (const char *a_data)
/* -- DomDocument -- */
-static void
-dom_document_finalize (GObject *obj)
+static void
+dom_document_finalize (GObject *obj)
{
DomDocument *self;
-
+
self = DOM_DOCUMENT (obj);
if (self->priv != NULL) {
g_queue_free (self->priv->open_nodes);
g_free (self->priv);
}
-
+
G_OBJECT_CLASS (dom_document_parent_class)->finalize (obj);
}
-static void
-dom_document_class_init (DomDocumentClass *klass)
+static void
+dom_document_class_init (DomDocumentClass *klass)
{
dom_document_parent_class = g_type_class_peek_parent (klass);
G_OBJECT_CLASS (klass)->finalize = dom_document_finalize;
}
-static void
-dom_document_instance_init (DomDocument *self)
+static void
+dom_document_instance_init (DomDocument *self)
{
DOM_ELEMENT (self)->tag_name = g_strdup (XML_DOCUMENT_TAG_NAME);
@@ -514,26 +514,26 @@ dom_document_instance_init (DomDocument *self)
}
-GType
-dom_document_get_type (void)
+GType
+dom_document_get_type (void)
{
static GType dom_document_type_id = 0;
if (dom_document_type_id == 0) {
- static const GTypeInfo g_define_type_info = {
- sizeof (DomDocumentClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) dom_document_class_init,
- (GClassFinalizeFunc) NULL,
- NULL,
- sizeof (DomDocument),
- 0,
- (GInstanceInitFunc) dom_document_instance_init,
- NULL
+ static const GTypeInfo g_define_type_info = {
+ sizeof (DomDocumentClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) dom_document_class_init,
+ (GClassFinalizeFunc) NULL,
+ NULL,
+ sizeof (DomDocument),
+ 0,
+ (GInstanceInitFunc) dom_document_instance_init,
+ NULL
};
- dom_document_type_id = g_type_register_static (DOM_TYPE_ELEMENT,
- "DomDocument",
- &g_define_type_info,
+ dom_document_type_id = g_type_register_static (DOM_TYPE_ELEMENT,
+ "DomDocument",
+ &g_define_type_info,
0);
}
return dom_document_type_id;
@@ -541,46 +541,46 @@ dom_document_get_type (void)
DomDocument *
-dom_document_new (void)
+dom_document_new (void)
{
DomDocument *self;
- self = g_object_newv (DOM_TYPE_DOCUMENT, 0, NULL);
+ self = g_object_newv (DOM_TYPE_DOCUMENT, 0, NULL);
return g_object_ref_sink (self);
}
-DomElement *
-dom_document_create_element (DomDocument *self,
+DomElement *
+dom_document_create_element (DomDocument *self,
const char *tag_name,
const char *first_attr,
- ...)
+ ...)
{
DomElement *element;
va_list var_args;
const char *attr;
const char *value;
-
+
g_return_val_if_fail (DOM_IS_DOCUMENT (self), NULL);
g_return_val_if_fail (tag_name != NULL, NULL);
element = dom_element_new (tag_name);
va_start (var_args, first_attr);
attr = first_attr;
- while (attr != NULL) {
+ while (attr != NULL) {
value = va_arg (var_args, const char *);
dom_element_set_attribute (element, attr, value);
attr = va_arg (var_args, const char *);
}
va_end (var_args);
-
+
return element;
}
-DomElement *
-dom_document_create_text_node (DomDocument *self,
- const char *data)
+DomElement *
+dom_document_create_text_node (DomDocument *self,
+ const char *data)
{
g_return_val_if_fail (DOM_IS_DOCUMENT (self), NULL);
g_return_val_if_fail (data != NULL, NULL);
@@ -591,32 +591,32 @@ dom_document_create_text_node (DomDocument *self,
DomElement *
dom_document_create_element_with_text (DomDocument *self,
- const char *text_data,
+ const char *text_data,
const char *tag_name,
const char *first_attr,
...)
{
- DomElement *element;
+ DomElement *element;
va_list var_args;
const char *attr;
const char *value;
-
+
g_return_val_if_fail (DOM_IS_DOCUMENT (self), NULL);
g_return_val_if_fail (tag_name != NULL, NULL);
element = dom_element_new (tag_name);
va_start (var_args, first_attr);
attr = first_attr;
- while (attr != NULL) {
+ while (attr != NULL) {
value = va_arg (var_args, const char *);
dom_element_set_attribute (element, attr, value);
attr = va_arg (var_args, const char *);
}
va_end (var_args);
-
- if (text_data != NULL)
+
+ if (text_data != NULL)
dom_element_append_child (element, dom_document_create_text_node (self, text_data));
-
+
return element;
}
@@ -627,15 +627,15 @@ dom_document_dump (DomDocument *self,
{
GString *xml;
char *body;
-
+
xml = g_string_sized_new (4096);
g_string_append (xml, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
g_string_append (xml, XML_RC);
-
+
body = dom_element_dump (DOM_ELEMENT (self), -1);
g_string_append (xml, body);
g_free (body);
-
+
if (dom_element_has_child_nodes (DOM_ELEMENT (self)))
g_string_append (xml, XML_RC);
@@ -646,7 +646,7 @@ dom_document_dump (DomDocument *self,
}
-static void
+static void
start_element_cb (GMarkupParseContext *context,
const char *element_name,
const char **attribute_names,
@@ -657,24 +657,24 @@ start_element_cb (GMarkupParseContext *context,
DomDocument *doc = user_data;
DomElement *node;
int i;
-
+
node = dom_document_create_element (doc, element_name, NULL);
- for (i = 0; attribute_names[i]; i++)
+ for (i = 0; attribute_names[i]; i++)
dom_element_set_attribute (node, attribute_names[i], attribute_values[i]);
dom_element_append_child (DOM_ELEMENT (g_queue_peek_head (doc->priv->open_nodes)), node);
-
+
g_queue_push_head (doc->priv->open_nodes, node);
}
-static void
+static void
end_element_cb (GMarkupParseContext *context,
const char *element_name,
gpointer user_data,
GError **error)
{
DomDocument *doc = user_data;
-
+
g_queue_pop_head (doc->priv->open_nodes);
}
@@ -682,16 +682,16 @@ end_element_cb (GMarkupParseContext *context,
static void
text_cb (GMarkupParseContext *context,
const char *text,
- gsize text_len,
+ gsize text_len,
gpointer user_data,
GError **error)
{
DomDocument *doc = user_data;
char *data;
-
+
data = g_strndup (text, text_len);
- dom_element_append_child (DOM_ELEMENT (g_queue_peek_head (doc->priv->open_nodes)),
- dom_document_create_text_node (doc, data));
+ dom_element_append_child (DOM_ELEMENT (g_queue_peek_head (doc->priv->open_nodes)),
+ dom_document_create_text_node (doc, data));
g_free (data);
}
@@ -705,27 +705,27 @@ static const GMarkupParser markup_parser = {
};
-gboolean
-dom_document_load (DomDocument *self,
+gboolean
+dom_document_load (DomDocument *self,
const char *xml,
gssize len,
- GError **error)
+ GError **error)
{
GMarkupParseContext *context;
-
+
g_return_val_if_fail (DOM_IS_DOCUMENT (self), FALSE);
g_return_val_if_fail (xml != NULL, FALSE);
-
+
g_queue_clear (self->priv->open_nodes);
g_queue_push_head (self->priv->open_nodes, self);
-
+
context = g_markup_parse_context_new (&markup_parser, 0, self, NULL);
if (! g_markup_parse_context_parse (context, xml, (len < 0) ? strlen (xml) : len, error))
return FALSE;
if (! g_markup_parse_context_end_parse (context, error))
return FALSE;
g_markup_parse_context_free (context);
-
+
return TRUE;
}
@@ -733,42 +733,42 @@ dom_document_load (DomDocument *self,
/* -- DomDomizable -- */
-DomElement *
-dom_domizable_create_element (DomDomizable *self,
- DomDocument *doc)
+DomElement *
+dom_domizable_create_element (DomDomizable *self,
+ DomDocument *doc)
{
return DOM_DOMIZABLE_GET_INTERFACE (self)->create_element (self, doc);
}
-void
-dom_domizable_load_from_element (DomDomizable *self,
- DomElement *e)
+void
+dom_domizable_load_from_element (DomDomizable *self,
+ DomElement *e)
{
DOM_DOMIZABLE_GET_INTERFACE (self)->load_from_element (self, e);
}
-GType
-dom_domizable_get_type (void)
+GType
+dom_domizable_get_type (void)
{
static GType dom_domizable_type_id = 0;
if (dom_domizable_type_id == 0) {
- static const GTypeInfo g_define_type_info = {
- sizeof (DomDomizableIface),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) NULL,
- (GClassFinalizeFunc) NULL,
- NULL,
- 0,
- 0,
- (GInstanceInitFunc) NULL,
- NULL
+ static const GTypeInfo g_define_type_info = {
+ sizeof (DomDomizableIface),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) NULL,
+ (GClassFinalizeFunc) NULL,
+ NULL,
+ 0,
+ 0,
+ (GInstanceInitFunc) NULL,
+ NULL
};
- dom_domizable_type_id = g_type_register_static (G_TYPE_INTERFACE,
- "DomDomizable",
- &g_define_type_info,
+ dom_domizable_type_id = g_type_register_static (G_TYPE_INTERFACE,
+ "DomDomizable",
+ &g_define_type_info,
0);
}
return dom_domizable_type_id;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
