issue 226 - contributed patch to fix comments with markup

2 files changed, 28 insertions, 15 deletions

diff --git a/src/trg-general-panel.c b/src/trg-general-panel.c
index 2e74d9d..cec641a 100644
--- a/src/trg-general-panel.c
+++ b/src/trg-general-panel.c
@@ -181,10 +181,8 @@ trg_general_panel_update(TrgGeneralPanel * panel, JsonObject * t,
                        torrent_get_download_dir(t));
 
     comment = add_links_to_text(torrent_get_comment(t));
-    markup = g_markup_printf_escaped("%s", comment);
-    gtk_label_set_markup(GTK_LABEL(priv->gen_comment_label), markup);
+    gtk_label_set_markup(GTK_LABEL(priv->gen_comment_label), comment);
     g_free(comment);
-    g_free(markup);
 
     errorStr = torrent_get_errorstr(t);
     keyLabel =
diff --git a/src/util.c b/src/util.c
index 55db4dc..312c564 100644
--- a/src/util.c
+++ b/src/util.c
@@ -305,8 +305,8 @@ GtkWidget *my_scrolledwin_new(GtkWidget * child)
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_win),
                                    GTK_POLICY_AUTOMATIC,
                                    GTK_POLICY_AUTOMATIC);
-    gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW(scrolled_win), 
-					 GTK_SHADOW_ETCHED_IN);
+    gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW(scrolled_win),
+                                        GTK_SHADOW_ETCHED_IN);
     gtk_container_add(GTK_CONTAINER(scrolled_win), child);
     return scrolled_win;
 }
@@ -513,18 +513,33 @@ gchar *epoch_to_string(gint64 epoch)
 
 gchar *add_links_to_text(const gchar * original)
 {
-    /* only perform replacement if string doesn't contains links */
-    if (!g_regex_match_simple("<a\\s.*>", original, 0, 0)) {
-        GRegex *regex =
-            g_regex_new("(https?://[a-zA-Z0-9_\\-\\./?=]+)", 0, 0,
-                        NULL);
-        gchar *newText = g_regex_replace(regex, original, -1, 0,
-                                         "<a href='\\1'>\\1</a>", 0, NULL);
-        g_regex_unref(regex);
-        return newText;
+    /* return if original already contains links */
+    if (g_regex_match_simple("<a\\s.*>", original, 0, 0)) {
+      return g_strdup(original);
+    }
+
+    gchar *newText, *url, *link;
+    GMatchInfo *match_info;
+    GRegex *regex =
+      g_regex_new("(https?://[a-zA-Z0-9_\\-\\./?=&]+)", 0, 0, NULL);
+
+    // extract url and build escaped link
+    g_regex_match(regex, original, 0, &match_info);
+    url = g_match_info_fetch(match_info, 1);
+
+    if(url) {
+      link = g_markup_printf_escaped("<a href='%s'>%s</a>", url, url);
+      newText = g_regex_replace(regex, original, -1, 0, link,
+                                       0, NULL);
+      g_free(url);
+      g_free(link);
     } else {
-        return g_strdup(original);
+      newText = g_strdup(original);
     }
+
+    g_regex_unref(regex);
+    g_match_info_unref(match_info);
+    return newText;
 }
 
 size_t tr_strlcpy(char *dst, const void *src, size_t siz)