[empathy: 8/26] empathy-theme-boxes.c: fix shadow declarations
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [empathy: 8/26] empathy-theme-boxes.c: fix shadow declarations
- Date: Thu, 22 Oct 2009 13:38:19 +0000 (UTC)
commit 05f02c1a884c7a6fd31cff468534a55f9bc248b2
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Wed Oct 21 17:24:01 2009 +0100
empathy-theme-boxes.c: fix shadow declarations
libempathy-gtk/empathy-theme-boxes.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/libempathy-gtk/empathy-theme-boxes.c b/libempathy-gtk/empathy-theme-boxes.c
index 3d8b8ae..e6a606d 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,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]