Change names of variables that shadow libc symbols

diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 586eaee16216bf5263b4a59bbd1872ea28f40a5c..13ca0c727331aae1ccf7600cc3d0fd19ef64be2a 100644 (file)
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -1530,10 +1530,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 6a8f14cc4c5c3f5ac83dd6c2a42ccee1391cdf37..e3176c0577fd66fcb4f7699629a1ff8f0bd1423c 100644 (file)
--- 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 2cdf9967ca7d1f804877989a951355749ea88ed1..be79a6d949990ba18fe5e7b636a16bbeec1a26b7 100644 (file)
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -776,12 +776,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);
 }