[giggle/giggle-0-6: 8/10] Fix a compiler warning: "declaration of âcloneâ shadows a global declaration"

[Javier JardÃn <jjardon src gnome org>]

commit cab5e29446339be2f3acad0f97e7ecd5f6727177
Author: Javier JardÃn <jjardon gnome org>
Date:   Wed Oct 19 18:54:22 2011 +0100

    Fix a compiler warning: "declaration of âcloneâ shadows a global declaration"

 libgiggle-git/giggle-git-clone.c |   20 ++++++++++----------
 src/giggle-clone-dialog.c        |   14 +++++++-------
 2 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/libgiggle-git/giggle-git-clone.c b/libgiggle-git/giggle-git-clone.c
index 3f4924a..c0eda90 100644
--- a/libgiggle-git/giggle-git-clone.c
+++ b/libgiggle-git/giggle-git-clone.c
@@ -81,11 +81,11 @@ giggle_git_clone_class_init (GiggleGitCloneClass *class)
 }
 
 static void
-giggle_git_clone_init (GiggleGitClone *clone)
+giggle_git_clone_init (GiggleGitClone *self)
 {
-	clone->priv = G_TYPE_INSTANCE_GET_PRIVATE (clone,
-						   GIGGLE_TYPE_GIT_CLONE,
-						   GiggleGitClonePrivate);
+	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (clone,
+	                                          GIGGLE_TYPE_GIT_CLONE,
+	                                          GiggleGitClonePrivate);
 }
 
 static void
@@ -174,17 +174,17 @@ giggle_git_clone_new (const gchar *repo, const gchar *directory)
 }
 
 const gchar *
-giggle_git_clone_get_directory (GiggleGitClone *clone)
+giggle_git_clone_get_directory (GiggleGitClone *self)
 {
-	g_return_val_if_fail (GIGGLE_IS_GIT_CLONE (clone), NULL);
+	g_return_val_if_fail (GIGGLE_IS_GIT_CLONE (self), NULL);
 
-	return clone->priv->directory;
+	return self->priv->directory;
 }
 
 const gchar *
-giggle_git_clone_get_repo (GiggleGitClone *clone)
+giggle_git_clone_get_repo (GiggleGitClone *self)
 {
-	g_return_val_if_fail (GIGGLE_IS_GIT_CLONE (clone), NULL);
+	g_return_val_if_fail (GIGGLE_IS_GIT_CLONE (self), NULL);
 
-	return clone->priv->repo;
+	return self->priv->repo;
 }
diff --git a/src/giggle-clone-dialog.c b/src/giggle-clone-dialog.c
index a47913b..b8a12b8 100644
--- a/src/giggle-clone-dialog.c
+++ b/src/giggle-clone-dialog.c
@@ -382,15 +382,15 @@ giggle_clone_dialog_init (GiggleCloneDialog *dialog)
 static void
 giggle_clone_dialog_response (GtkDialog *dialog, GtkResponseType response_id)
 {
-	GiggleCloneDialog *clone;
+	GiggleCloneDialog *self = GIGGLE_CLONE_DIALOG (dialog);
+	GiggleCloneDialogPrivate *priv = self->priv;
 
-	clone = GIGGLE_CLONE_DIALOG (dialog);
-	if (response_id == GTK_RESPONSE_REJECT
-	    && clone->priv->git_directory) {
-		giggle_remove_directory_recursive (clone->priv->git_directory);
+	if (response_id == GTK_RESPONSE_REJECT &&
+	    priv->git_directory) {
+		giggle_remove_directory_recursive (priv->git_directory);
 
-		g_free (clone->priv->git_directory);
-		clone->priv->git_directory = NULL;
+		g_free (priv->git_directory);
+		priv->git_directory = NULL;
 	}
 }