aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-01-06 23:25:39 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-01-06 23:25:39 +0800
commita8260d4f1de4ab185922be3b7713c15f55f1f0a3 (patch)
tree038111c7606f30454973f27c62031627c358d466
parente38cc7c99febaf760bc07e118c8ce3f2d1ffe615 (diff)
downloadgsoc2013-empathy-a8260d4f1de4ab185922be3b7713c15f55f1f0a3.tar
gsoc2013-empathy-a8260d4f1de4ab185922be3b7713c15f55f1f0a3.tar.gz
gsoc2013-empathy-a8260d4f1de4ab185922be3b7713c15f55f1f0a3.tar.bz2
gsoc2013-empathy-a8260d4f1de4ab185922be3b7713c15f55f1f0a3.tar.lz
gsoc2013-empathy-a8260d4f1de4ab185922be3b7713c15f55f1f0a3.tar.xz
gsoc2013-empathy-a8260d4f1de4ab185922be3b7713c15f55f1f0a3.tar.zst
gsoc2013-empathy-a8260d4f1de4ab185922be3b7713c15f55f1f0a3.zip
rename 'location' to 'loc' to fix shadow declaration
-rw-r--r--libempathy-gtk/empathy-contact-widget.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index 8b1522dc4..7a3c04ec8 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -1366,9 +1366,9 @@ contact_widget_location_update (EmpathyContactWidget *information)
value = g_hash_table_lookup (location, EMPATHY_LOCATION_TIMESTAMP);
if (value == NULL)
{
- gchar *location = g_strdup_printf ("<b>%s</b>", _("Location"));
- gtk_label_set_markup (GTK_LABEL (information->label_location), location);
- g_free (location);
+ gchar *loc = g_strdup_printf ("<b>%s</b>", _("Location"));
+ gtk_label_set_markup (GTK_LABEL (information->label_location), loc);
+ g_free (loc);
}
else
{