diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2010-05-21 15:38:09 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-07-06 17:20:26 +0800 |
| commit | 4bb0c7a1c1120081e5063b0f3d79ab1e21adf39b (patch) | |
| tree | 31e306c61c856e4ee4a2eaaea6b2410d8be21043 | |
| parent | 2ef3eae87e929ed67ad4b36ff612dda60febedb4 (diff) | |
| download | gsoc2013-empathy-4bb0c7a1c1120081e5063b0f3d79ab1e21adf39b.tar gsoc2013-empathy-4bb0c7a1c1120081e5063b0f3d79ab1e21adf39b.tar.gz gsoc2013-empathy-4bb0c7a1c1120081e5063b0f3d79ab1e21adf39b.tar.bz2 gsoc2013-empathy-4bb0c7a1c1120081e5063b0f3d79ab1e21adf39b.tar.lz gsoc2013-empathy-4bb0c7a1c1120081e5063b0f3d79ab1e21adf39b.tar.xz gsoc2013-empathy-4bb0c7a1c1120081e5063b0f3d79ab1e21adf39b.tar.zst gsoc2013-empathy-4bb0c7a1c1120081e5063b0f3d79ab1e21adf39b.zip | |
Change names of variables that shadow libc symbols
| -rw-r--r-- | libempathy-gtk/empathy-ui-utils.c | 4 | ||||
| -rw-r--r-- | src/empathy-about-dialog.c | 4 | ||||
| -rw-r--r-- | 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 0a868d240..314e3d3f3 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 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 6c0c9c69e..eca7a6d3d 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); } |