aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2010-05-21 15:38:09 +0800
committerDanielle Madeley <danielle.madeley@collabora.co.uk>2010-05-21 15:38:09 +0800
commit64d4af1b917c249a571f8b608c1976fb065dca49 (patch)
tree972033ecbb880eeedee03e25909315a23c779c1a /src
parentb1c4c4d2ed01fd1e87f1b3f815b5282fc63183c9 (diff)
downloadgsoc2013-empathy-64d4af1b917c249a571f8b608c1976fb065dca49.tar
gsoc2013-empathy-64d4af1b917c249a571f8b608c1976fb065dca49.tar.gz
gsoc2013-empathy-64d4af1b917c249a571f8b608c1976fb065dca49.tar.bz2
gsoc2013-empathy-64d4af1b917c249a571f8b608c1976fb065dca49.tar.lz
gsoc2013-empathy-64d4af1b917c249a571f8b608c1976fb065dca49.tar.xz
gsoc2013-empathy-64d4af1b917c249a571f8b608c1976fb065dca49.tar.zst
gsoc2013-empathy-64d4af1b917c249a571f8b608c1976fb065dca49.zip
Change names of variables that shadow libc symbols
Diffstat (limited to 'src')
-rw-r--r--src/empathy-about-dialog.c4
-rw-r--r--src/empathy-debug-window.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/empathy-about-dialog.c b/src/empathy-about-dialog.c
index 6a8f14cc4..e3176c057 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 2cdf9967c..be79a6d94 100644
--- 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);
}