[gthumb/ext] esthetic changes

[Paolo Bacchilega <paobac src gnome org>]

commit 601ec84527b941743d6531f3d06460aa7b224807
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sat Sep 19 20:16:45 2009 +0200

    esthetic changes

 gthumb/gth-test.c |  159 ++++++++++++++++++++++++++---------------------------
 gthumb/gth-test.h |    6 +-
 2 files changed, 81 insertions(+), 84 deletions(-)
---
diff --git a/gthumb/gth-test.c b/gthumb/gth-test.c
index 8a2d15d..0236429 100644
--- a/gthumb/gth-test.c
+++ b/gthumb/gth-test.c
@@ -45,8 +45,7 @@ enum {
         LAST_SIGNAL
 };
 
-struct _GthTestPrivate
-{
+struct _GthTestPrivate {
 	char      *id;
 	char      *attributes;
 	char      *display_name;
@@ -69,34 +68,34 @@ gth_test_error_quark (void)
 static void
 gth_test_finalize (GObject *object)
 {
-	GthTest *test;
+	GthTest *self;
 
-	test = GTH_TEST (object);
+	self = GTH_TEST (object);
 
-	g_free (test->priv->id);
-	g_free (test->priv->display_name);
-	g_free (test->files);
+	g_free (self->priv->id);
+	g_free (self->priv->display_name);
+	g_free (self->files);
 
 	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 
 const char *
-base_get_attributes (GthTest *test)
+base_get_attributes (GthTest *self)
 {
-	return test->priv->attributes;
+	return self->priv->attributes;
 }
 
 
 static GtkWidget *
-base_create_control (GthTest *test)
+base_create_control (GthTest *self)
 {
 	return NULL;
 }
 
 
 static gboolean
-base_update_from_control (GthTest   *test,
+base_update_from_control (GthTest   *self,
 			  GError   **error)
 {
 	return TRUE;
@@ -104,13 +103,13 @@ base_update_from_control (GthTest   *test,
 
 
 static void
-base_reset (GthTest *test)
+base_reset (GthTest *self)
 {
 }
 
 
 static GthMatch
-base_match (GthTest     *test,
+base_match (GthTest     *self,
 	    GthFileData *fdata)
 {
 	return GTH_MATCH_YES;
@@ -118,39 +117,39 @@ base_match (GthTest     *test,
 
 
 void
-base_set_file_list (GthTest *test,
+base_set_file_list (GthTest *self,
 	 	    GList   *files)
 {
 	GList *scan;
 	int    i;
 
-	test->n_files = g_list_length (files);
+	self->n_files = g_list_length (files);
 
-	g_free (test->files);
-	test->files = g_malloc (sizeof (GthFileData*) * (test->n_files + 1));
+	g_free (self->files);
+	self->files = g_malloc (sizeof (GthFileData*) * (self->n_files + 1));
 
 	for (scan = files, i = 0; scan; scan = scan->next)
-		test->files[i++] = scan->data;
-	test->files[i++] = NULL;
+		self->files[i++] = scan->data;
+	self->files[i++] = NULL;
 
-	test->iterator = 0;
+	self->iterator = 0;
 }
 
 
 GthFileData *
-base_get_next (GthTest *test)
+base_get_next (GthTest *self)
 {
 	GthFileData *file = NULL;
 	GthMatch     match = GTH_MATCH_NO;
 
-	if (test->files == NULL)
+	if (self->files == NULL)
 		return NULL;
 
 	while (match == GTH_MATCH_NO) {
-		file = test->files[test->iterator];
+		file = self->files[self->iterator];
 		if (file != NULL) {
-			match = gth_test_match (test, file);
-			test->iterator++;
+			match = gth_test_match (self, file);
+			self->iterator++;
 		}
 		else
 			match = GTH_MATCH_LIMIT_REACHED;
@@ -160,8 +159,8 @@ base_get_next (GthTest *test)
 		file = NULL;
 
 	if (file == NULL) {
-		g_free (test->files);
-		test->files = NULL;
+		g_free (self->files);
+		self->files = NULL;
 	}
 
 	return file;
@@ -171,14 +170,14 @@ base_get_next (GthTest *test)
 GObject *
 gth_test_real_duplicate (GthDuplicable *duplicable)
 {
-	GthTest *test = GTH_TEST (duplicable);
+	GthTest *self = GTH_TEST (duplicable);
 	GthTest *new_test;
 
 	new_test = g_object_new (GTH_TYPE_TEST,
-				 "id", gth_test_get_id (test),
-				 "attributes", gth_test_get_attributes (test),
-				 "display-name", gth_test_get_display_name (test),
-				 "visible", gth_test_is_visible (test),
+				 "id", gth_test_get_id (self),
+				 "attributes", gth_test_get_attributes (self),
+				 "display-name", gth_test_get_display_name (self),
+				 "visible", gth_test_is_visible (self),
 				 NULL);
 
 	return (GObject *) new_test;
@@ -191,31 +190,31 @@ gth_test_set_property (GObject      *object,
 		       const GValue *value,
 		       GParamSpec   *pspec)
 {
-	GthTest *test;
+	GthTest *self;
 
-        test = GTH_TEST (object);
+        self = GTH_TEST (object);
 
 	switch (property_id) {
 	case PROP_ID:
-		g_free (test->priv->id);
-		test->priv->id = g_value_dup_string (value);
-		if (test->priv->id == NULL)
-			test->priv->id = g_strdup ("");
+		g_free (self->priv->id);
+		self->priv->id = g_value_dup_string (value);
+		if (self->priv->id == NULL)
+			self->priv->id = g_strdup ("");
 		break;
 	case PROP_ATTRIBUTES:
-		g_free (test->priv->attributes);
-		test->priv->attributes = g_value_dup_string (value);
-		if (test->priv->attributes == NULL)
-			test->priv->attributes = g_strdup ("");
+		g_free (self->priv->attributes);
+		self->priv->attributes = g_value_dup_string (value);
+		if (self->priv->attributes == NULL)
+			self->priv->attributes = g_strdup ("");
 		break;
 	case PROP_DISPLAY_NAME:
-		g_free (test->priv->display_name);
-		test->priv->display_name = g_value_dup_string (value);
-		if (test->priv->display_name == NULL)
-			test->priv->display_name = g_strdup ("");
+		g_free (self->priv->display_name);
+		self->priv->display_name = g_value_dup_string (value);
+		if (self->priv->display_name == NULL)
+			self->priv->display_name = g_strdup ("");
 		break;
 	case PROP_VISIBLE:
-		test->priv->visible = g_value_get_boolean (value);
+		self->priv->visible = g_value_get_boolean (value);
 		break;
 	default:
 		break;
@@ -229,22 +228,22 @@ gth_test_get_property (GObject    *object,
 		       GValue     *value,
 		       GParamSpec *pspec)
 {
-	GthTest *test;
+	GthTest *self;
 
-        test = GTH_TEST (object);
+        self = GTH_TEST (object);
 
 	switch (property_id) {
 	case PROP_ID:
-		g_value_set_string (value, test->priv->id);
+		g_value_set_string (value, self->priv->id);
 		break;
 	case PROP_ATTRIBUTES:
-		g_value_set_string (value, test->priv->attributes);
+		g_value_set_string (value, self->priv->attributes);
 		break;
 	case PROP_DISPLAY_NAME:
-		g_value_set_string (value, test->priv->display_name);
+		g_value_set_string (value, self->priv->display_name);
 		break;
 	case PROP_VISIBLE:
-		g_value_set_boolean (value, test->priv->visible);
+		g_value_set_boolean (value, self->priv->visible);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -328,12 +327,12 @@ gth_test_gth_duplicable_interface_init (GthDuplicableIface *iface)
 
 
 static void
-gth_test_init (GthTest *test)
+gth_test_init (GthTest *self)
 {
-	test->priv = G_TYPE_INSTANCE_GET_PRIVATE (test, GTH_TYPE_TEST, GthTestPrivate);
-	test->priv->id = g_strdup ("");
-	test->priv->display_name = g_strdup ("");
-	test->priv->visible = FALSE;
+	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_TEST, GthTestPrivate);
+	self->priv->id = g_strdup ("");
+	self->priv->display_name = g_strdup ("");
+	self->priv->visible = FALSE;
 }
 
 
@@ -379,79 +378,79 @@ gth_test_new (void)
 
 
 const char *
-gth_test_get_id (GthTest *test)
+gth_test_get_id (GthTest *self)
 {
-	return test->priv->id;
+	return self->priv->id;
 }
 
 
 const char *
-gth_test_get_display_name (GthTest *test)
+gth_test_get_display_name (GthTest *self)
 {
-	return test->priv->display_name;
+	return self->priv->display_name;
 }
 
 
 gboolean
-gth_test_is_visible (GthTest *test)
+gth_test_is_visible (GthTest *self)
 {
-	return test->priv->visible;
+	return self->priv->visible;
 }
 
 
 const char *
-gth_test_get_attributes (GthTest *test)
+gth_test_get_attributes (GthTest *self)
 {
-	return GTH_TEST_GET_CLASS (test)->get_attributes (test);
+	return GTH_TEST_GET_CLASS (self)->get_attributes (self);
 }
 
 
 GtkWidget *
-gth_test_create_control (GthTest *test)
+gth_test_create_control (GthTest *self)
 {
-	return GTH_TEST_GET_CLASS (test)->create_control (test);
+	return GTH_TEST_GET_CLASS (self)->create_control (self);
 }
 
 
 gboolean
-gth_test_update_from_control (GthTest   *test,
+gth_test_update_from_control (GthTest   *self,
 			      GError   **error)
 {
-	return GTH_TEST_GET_CLASS (test)->update_from_control (test, error);
+	return GTH_TEST_GET_CLASS (self)->update_from_control (self, error);
 }
 
 
 void
-gth_test_changed (GthTest *test)
+gth_test_changed (GthTest *self)
 {
-	g_signal_emit (test, gth_test_signals[CHANGED], 0);
+	g_signal_emit (self, gth_test_signals[CHANGED], 0);
 }
 
 
 void
-gth_test_reset (GthTest *test)
+gth_test_reset (GthTest *self)
 {
-	return GTH_TEST_GET_CLASS (test)->reset (test);
+	return GTH_TEST_GET_CLASS (self)->reset (self);
 }
 
 
 GthMatch
-gth_test_match (GthTest     *test,
+gth_test_match (GthTest     *self,
 		GthFileData *fdata)
 {
-	return GTH_TEST_GET_CLASS (test)->match (test, fdata);
+	return GTH_TEST_GET_CLASS (self)->match (self, fdata);
 }
 
 void
-gth_test_set_file_list (GthTest *test,
+gth_test_set_file_list (GthTest *self,
 		        GList   *files)
 {
-	GTH_TEST_GET_CLASS (test)->set_file_list (test, files);
+	GTH_TEST_GET_CLASS (self)->set_file_list (self, files);
 }
 
 
 GthFileData *
-gth_test_get_next (GthTest *test)
+gth_test_get_next (GthTest *self)
 {
-	return GTH_TEST_GET_CLASS (test)->get_next (test);
+	return GTH_TEST_GET_CLASS (self)->get_next (self);
 }
diff --git a/gthumb/gth-test.h b/gthumb/gth-test.h
index cf52d4f..6112105 100644
--- a/gthumb/gth-test.h
+++ b/gthumb/gth-test.h
@@ -62,8 +62,7 @@ typedef enum {
 	GTH_TEST_OP_AFTER
 } GthTestOp;
 
-struct _GthTest
-{
+struct _GthTest {
 	GObject __parent;
 	GthTestPrivate *priv;
 
@@ -74,8 +73,7 @@ struct _GthTest
 	int            iterator;
 };
 
-struct _GthTestClass
-{
+struct _GthTestClass {
 	GObjectClass __parent_class;
 
 	/*< signals >*/