aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-10-22 00:24:01 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-10-22 17:43:50 +0800
commit05f02c1a884c7a6fd31cff468534a55f9bc248b2 (patch)
tree10ae3febc65e856e48dc41df8c7bbacee6b66e0e
parentb4d5fc6e7190ef220edd48f0b77a5591a5b20b7b (diff)
downloadgsoc2013-empathy-05f02c1a884c7a6fd31cff468534a55f9bc248b2.tar
gsoc2013-empathy-05f02c1a884c7a6fd31cff468534a55f9bc248b2.tar.gz
gsoc2013-empathy-05f02c1a884c7a6fd31cff468534a55f9bc248b2.tar.bz2
gsoc2013-empathy-05f02c1a884c7a6fd31cff468534a55f9bc248b2.tar.lz
gsoc2013-empathy-05f02c1a884c7a6fd31cff468534a55f9bc248b2.tar.xz
gsoc2013-empathy-05f02c1a884c7a6fd31cff468534a55f9bc248b2.tar.zst
gsoc2013-empathy-05f02c1a884c7a6fd31cff468534a55f9bc248b2.zip
empathy-theme-boxes.c: fix shadow declarations
-rw-r--r--libempathy-gtk/empathy-theme-boxes.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libempathy-gtk/empathy-theme-boxes.c b/libempathy-gtk/empathy-theme-boxes.c
index 3d8b8ae7d..e6a606de1 100644
--- a/libempathy-gtk/empathy-theme-boxes.c
+++ b/libempathy-gtk/empathy-theme-boxes.c
@@ -193,7 +193,7 @@ theme_boxes_maybe_append_header (EmpathyThemeBoxes *theme,
GtkTextChildAnchor *anchor;
GtkWidget *box;
gchar *str;
- time_t time;
+ time_t time_;
gchar *tmp;
GtkTextIter start;
gboolean color_set;
@@ -259,8 +259,8 @@ theme_boxes_maybe_append_header (EmpathyThemeBoxes *theme,
g_free (str);
/* Add the message receive time */
- time = empathy_message_get_timestamp (msg);
- tmp = empathy_time_to_string_local (time,
+ time_ = empathy_message_get_timestamp (msg);
+ tmp = empathy_time_to_string_local (time_,
EMPATHY_TIME_FORMAT_DISPLAY_SHORT);
str = g_strdup_printf ("<i>%s</i>", tmp);
label2 = g_object_new (GTK_TYPE_LABEL,