[monkey-bubble: 713/753] Merge from branch
- From: Sven Herzberg <herzi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [monkey-bubble: 713/753] Merge from branch
- Date: Wed, 14 Jul 2010 22:55:37 +0000 (UTC)
commit a5fb44494d49b3185dfad0dec7279b3d9fc54dc1
Author: Kjartan Maraas <kmaraas src gnome org>
Date: Thu May 1 16:28:06 2003 +0000
Merge from branch
libgnomeui/gnome-scores.c | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/libgnomeui/gnome-scores.c b/libgnomeui/gnome-scores.c
index 474efa4..7708096 100644
--- a/libgnomeui/gnome-scores.c
+++ b/libgnomeui/gnome-scores.c
@@ -191,7 +191,7 @@ gnome_scores_construct ( GnomeScores *gs,
/* TRANSLATORS NOTE: Date format used when showing scores in games.
* Please refer to manpage of strftime(3) for complete reference.
*/
- if(strftime(tmp2, sizeof(tmp2), _("%a %b %d %T %Y"),
+ if(strftime(tmp2, sizeof(tmp2), _("%a %b %x %X %Y"),
localtime( &(times[i]) )) == 0) {
/* according to docs, if the string does not fit, the
* contents of tmp2 are undefined, thus just use
@@ -487,11 +487,12 @@ gnome_scores_display (const gchar *title, const gchar *app_name, const gchar *le
gnome_scores_set_current_player(GNOME_SCORES(hs), pos-1);
gtk_widget_show (hs);
- g_strfreev(names);
- g_free(scores);
- g_free(scoretimes);
}
+ g_strfreev(names);
+ g_free(scores);
+ g_free(scoretimes);
+
return hs;
}
@@ -526,10 +527,11 @@ gnome_scores_display_with_pixmap (const gchar *pixmap_logo, const gchar *app_nam
gnome_scores_set_current_player(GNOME_SCORES(hs), pos-1);
gtk_widget_show (hs);
- g_strfreev(names);
- g_free(scores);
- g_free(scoretimes);
}
+ g_strfreev(names);
+ g_free(scores);
+ g_free(scoretimes);
+
return hs;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]