remove the whole unncessary if block, completing the last commit
authorPaul <paul@claws-mail.org>
Wed, 24 Feb 2016 20:19:08 +0000 (20:19 +0000)
committerPaul <paul@claws-mail.org>
Wed, 24 Feb 2016 20:19:08 +0000 (20:19 +0000)
src/common/utils.c

index 80e0d7e5ae4e7ed3d5d5f15ed95176c541d82ecd..ab063cee39ab784ff6b3755e14e212057c425e58 100644 (file)
@@ -4559,22 +4559,6 @@ static gchar *mailcap_get_command_in_file(const gchar *path, const gchar *type,
                        result = g_strdup(trimmed);
                        g_strfreev(parts);
                        fclose(fp);
-                       /* if there are no single quotes around %s, add them.
-                        * '.*%s.*' is ok, as in display 'png:%s'
-                        */
-                       if (strstr(result, "%s") 
-                       && !(strstr(result, "'") < strstr(result,"%s") &&
-                            strstr(strstr(result,"%s"), "'"))) {
-                               gchar *start = g_strdup(result);
-                               gchar *end = g_strdup(strstr(result, "%s")+2);
-                               gchar *tmp;
-                               *strstr(start, "%s") = '\0';
-                               tmp = g_strconcat(start,"%s",end, NULL);
-                               g_free(start);
-                               g_free(end);
-                               g_free(result);
-                               result = tmp;
-                       }
                        if (needsterminal) {
                                gchar *tmp = g_strdup_printf("xterm -e %s", result);
                                g_free(result);