]> git.0d.be Git - empathy.git/commitdiff
empathy-theme-boxes.c: fix shadow declarations
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 21 Oct 2009 16:24:01 +0000 (17:24 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 22 Oct 2009 09:43:50 +0000 (10:43 +0100)
libempathy-gtk/empathy-theme-boxes.c

index 3d8b8ae7ddab7a4b24494516cc5d614365de998b..e6a606de186ea4b5d3d08d1a704c661c65d16066 100644 (file)
@@ -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,