[empathy/gnome-2-30] Change names of variables that shadow libc symbols

[Guillaume Desmottes <gdesmott src gnome org>]

commit 4bb0c7a1c1120081e5063b0f3d79ab1e21adf39b
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Fri May 21 17:38:09 2010 +1000

    Change names of variables that shadow libc symbols

 libempathy-gtk/empathy-ui-utils.c |    4 ++--
 src/empathy-about-dialog.c        |    4 ++--
 src/empathy-debug-window.c        |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 0a868d2..314e3d3 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -1525,10 +1525,10 @@ empathy_url_show (GtkWidget *parent,
 
 static void
 link_button_hook (GtkLinkButton *button,
-		  const gchar *link,
+		  const gchar *link_,
 		  gpointer user_data)
 {
-	empathy_url_show (GTK_WIDGET (button), link);
+	empathy_url_show (GTK_WIDGET (button), link_);
 }
 
 GtkWidget *
diff --git a/src/empathy-about-dialog.c b/src/empathy-about-dialog.c
index 6a8f14c..e3176c0 100644
--- a/src/empathy-about-dialog.c
+++ b/src/empathy-about-dialog.c
@@ -97,10 +97,10 @@ static const char *license[] = {
 
 static void
 about_dialog_activate_link_cb (GtkAboutDialog *about,
-			       const gchar    *link,
+			       const gchar    *link_,
 			       gpointer        data)
 {
-	empathy_url_show (GTK_WIDGET (about), link);
+	empathy_url_show (GTK_WIDGET (about), link_);
 }
 
 void
diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index 6c0c9c6..eca7a6d 100644
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -768,12 +768,12 @@ debug_window_fill_cm_chooser (EmpathyDebugWindow *debug_window)
 }
 
 static void
-debug_window_pause_toggled_cb (GtkToggleToolButton *pause,
+debug_window_pause_toggled_cb (GtkToggleToolButton *pause_,
     EmpathyDebugWindow *debug_window)
 {
   EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window);
 
-  priv->paused = gtk_toggle_tool_button_get_active (pause);
+  priv->paused = gtk_toggle_tool_button_get_active (pause_);
 
   debug_window_set_enabled (debug_window, !priv->paused);
 }