diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2012-06-12 15:11:28 +0200 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2012-06-12 17:29:46 +0200 |
| commit | 95d42f9a3236a3415a4d30aa823520123e21ea0d (patch) | |
| tree | c0ab94e9ca81db1ca09f1636d8b8202ee9461bfb | |
| parent | 3084c95cf968dcb4d901b77ee73672e25fa07484 (diff) | |
| download | gtk-vlc-player-95d42f9a3236a3415a4d30aa823520123e21ea0d.tar.gz | |
remove trailing whitespaces from contribution texts
necessary because they are visible when contribution texts are right-aligned
* declare some static functions
| -rw-r--r-- | lib/experiment-reader/experiment-reader.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/experiment-reader/experiment-reader.c b/lib/experiment-reader/experiment-reader.c index b5aa398..9f00e7e 100644 --- a/lib/experiment-reader/experiment-reader.c +++ b/lib/experiment-reader/experiment-reader.c @@ -50,6 +50,9 @@ static gboolean generic_foreach_topic(ExperimentReader *reader, xmlNodeSet *node static gint experiment_reader_contrib_cmp(const ExperimentReaderContrib *a, const ExperimentReaderContrib *b); +static void insert_contribution(gint64 start_time, gchar *text, GList **list); +static inline void process_contribution(xmlDoc *doc, xmlNode *contrib, + GList **list); /** @private */ #define XML_CHAR(STR) \ @@ -189,7 +192,7 @@ experiment_reader_contrib_cmp(const ExperimentReaderContrib *a, } static void -insert_contribution(gint64 start_time, const gchar *text, GList **list) +insert_contribution(gint64 start_time, gchar *text, GList **list) { ExperimentReaderContrib *contrib; @@ -198,7 +201,7 @@ insert_contribution(gint64 start_time, const gchar *text, GList **list) contrib = g_malloc(sizeof(ExperimentReaderContrib) + strlen(text) + 1); contrib->start_time = start_time; - g_stpcpy(contrib->text, text); + g_stpcpy(contrib->text, g_strchomp(text)); *list = g_list_insert_sorted(*list, contrib, (GCompareFunc)experiment_reader_contrib_cmp); @@ -244,9 +247,11 @@ process_contribution(xmlDoc *doc, xmlNode *contrib, GList **list) if (!xmlStrcmp(duration, XML_CHAR("micro")) || !xmlStrcmp(duration, XML_CHAR("short"))) new = g_strconcat(text != NULL ? text : "", - " ...", NULL); + "... ", NULL); + else if (text == NULL) + new = g_strdup("...\n"); else - new = g_strconcat(text != NULL ? text : "", + new = g_strconcat(g_strchomp(text), "\n", NULL); g_free(text); text = new; |