switched to using sprintf for download formatting, way cleaner

1 files changed, 7 insertions, 2 deletions

diff --git a/callbacks.c b/callbacks.c
index 5fa0747..39556f7 100644
--- a/callbacks.c
+++ b/callbacks.c
@@ -48,11 +48,16 @@ return FALSE;
 
 /* download callback */
 void cb_download(WebKitWebView *web_view, GObject *d, gpointer user_data) {
+  gchar *command;
   
-const gchar *c = webkit_download_get_uri(WEBKIT_DOWNLOAD(d));
-gchar *command = g_strconcat(DEFAULT_DOWNLOAD_COMMAND, DEFAULT_DOWNLOAD_LOCATION, "/ ", g_strdup(c), NULL);
+const gchar *download_url = webkit_download_get_uri(WEBKIT_DOWNLOAD(d));
+const gchar *requested_name = webkit_download_get_suggested_filename(WEBKIT_DOWNLOAD(d));
+command = g_new0(gchar, strlen(DEFAULT_DOWNLOAD_COMMAND) + strlen(DEFAULT_DOWNLOAD_LOCATION) + strlen(requested_name) + strlen(download_url) + 1);
+g_sprintf(command, DEFAULT_DOWNLOAD_COMMAND, DEFAULT_DOWNLOAD_LOCATION, requested_name, download_url);
+
 g_spawn_command_line_async(command, NULL);
 g_free(command);
+
 }