Develop and Download Open Source Software

Revision: 3771
          http://svn.sourceforge.jp/view?root=kazehakase&view=rev&rev=3771
Author:   mtasaka
Date:     2009-04-22 02:38:24 +0900 (Wed, 22 Apr 2009)

Log Message:
-----------
Fix 2 issue on downloading: crash on cancel and malfunction when retrial

Modified Paths:
--------------
    kazehakase/trunk/ChangeLog
    kazehakase/trunk/src/kz-downloader-group.c
    kazehakase/trunk/src/kz-downloader.c

Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog	2009-04-19 07:17:56 UTC (rev 3770)
+++ kazehakase/trunk/ChangeLog	2009-04-21 17:38:24 UTC (rev 3771)
@@ -1,3 +1,11 @@
+2009-04-22  Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+
+	* src/kz-downloader-group.c: 
+	Fix crash when downloading is cancelled.
+	* src/kz-downloader.c :
+	g_file_create() will fail if file already exists. Changing
+	to g_file_replace().
+
 2009-04-19  Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 
 	* src/kz-window.c:

Modified: kazehakase/trunk/src/kz-downloader-group.c
===================================================================
--- kazehakase/trunk/src/kz-downloader-group.c	2009-04-19 07:17:56 UTC (rev 3770)
+++ kazehakase/trunk/src/kz-downloader-group.c	2009-04-21 17:38:24 UTC (rev 3771)
@@ -54,7 +54,7 @@
 					    KzDownloader      *dl);
 
 static void cb_download_complete (KzDownloader *dl, KzDownloaderGroup *dlgrp);
-static void cb_download_error    (KzDownloader *dl, KzDownloaderGroup *dlgrp);
+static void cb_download_error    (KzDownloader *dl, const gchar *error, KzDownloaderGroup *dlgrp);
 static void cb_download_progress (KzDownloader *dl, KzDownloaderGroup *dlgrp);
 
 static gint kz_downloader_group_signals[LAST_SIGNAL] = {0};
@@ -258,7 +258,7 @@
 
 
 static void
-cb_download_error (KzDownloader *dl, KzDownloaderGroup *dlgrp)
+cb_download_error (KzDownloader *dl, const gchar *error, KzDownloaderGroup *dlgrp)
 {
 	g_return_if_fail(KZ_IS_DOWNLOADER_GROUP(dlgrp));
 

Modified: kazehakase/trunk/src/kz-downloader.c
===================================================================
--- kazehakase/trunk/src/kz-downloader.c	2009-04-19 07:17:56 UTC (rev 3770)
+++ kazehakase/trunk/src/kz-downloader.c	2009-04-21 17:38:24 UTC (rev 3771)
@@ -346,8 +346,10 @@
 	if (priv->to_file && priv->file_name)
 	{
 		priv->local_file = g_file_new_for_path(priv->file_name);
-		priv->output_stream = g_file_create(priv->local_file,
-						    G_FILE_CREATE_REPLACE_DESTINATION,
+		priv->output_stream = g_file_replace(priv->local_file,
+						    NULL,
+						    FALSE,
+						    G_FILE_CREATE_PRIVATE|G_FILE_CREATE_REPLACE_DESTINATION,
 						    NULL, NULL);
 	}
 	g_input_stream_read_async(G_INPUT_STREAM(priv->input_stream),