rpms/evolution/F-7 evolution-2.10.1-saving-attachments.patch, 1.2, 1.3

[Matthew Barnes (mbarnes)]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17108

Modified Files:
	evolution-2.10.1-saving-attachments.patch 
Log Message:
- Fix misapplied patch.


evolution-2.10.1-saving-attachments.patch:

Index: evolution-2.10.1-saving-attachments.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-7/evolution-2.10.1-saving-attachments.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- evolution-2.10.1-saving-attachments.patch	29 May 2007 04:09:29 -0000	1.2
+++ evolution-2.10.1-saving-attachments.patch	29 May 2007 05:29:07 -0000	1.3
@@ -1,5 +1,5 @@
---- evolution-2.10.2/mail/em-utils.c.saving-attachments	2007-05-28 23:24:04.000000000 -0400
-+++ evolution-2.10.2/mail/em-utils.c	2007-05-28 23:26:18.000000000 -0400
+--- evolution-2.10.2/mail/em-utils.c.saving-attachments	2007-05-29 00:07:55.000000000 -0400
++++ evolution-2.10.2/mail/em-utils.c	2007-05-29 01:26:46.000000000 -0400
 @@ -354,28 +354,23 @@
  
  /* Saving messages... */
@@ -42,52 +42,20 @@
  }
  
  /**
-@@ -387,73 +382,78 @@
+@@ -387,85 +382,79 @@
   * Saves a mime part to disk (prompting the user for filename).
   **/
  void
 -em_utils_save_part(GtkWidget *parent, const char *prompt, CamelMimePart *part)
 +em_utils_save_part (GtkWidget *parent, const char *prompt, CamelMimePart *part)
-+  {
+ {
+-	const char *name;
+-	GtkWidget *filesel;
 +	GtkWidget *file_chooser;
 +	const gchar *filename;
 +	gchar *uri = NULL;
 +  
 +	filename = emu_save_get_filename_for_part (part);
-+
-+	file_chooser = e_file_get_save_filesel (
-+		parent, prompt, filename, GTK_FILE_CHOOSER_ACTION_SAVE);
-+
-+	if (gtk_dialog_run (GTK_DIALOG (file_chooser)) != GTK_RESPONSE_OK)
-+		goto exit;
-+
-+	uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (file_chooser));
-+
-+	/* XXX Would be nice to mention _why_ we can't save. */
-+	if (!e_file_can_save (GTK_WINDOW (file_chooser), uri)) {
-+		g_warning ("Unable to save %s", uri);
-+		goto exit;
-+  	}
-+  
-+	e_file_update_save_path (
-+		gtk_file_chooser_get_current_folder_uri (
-+		GTK_FILE_CHOOSER (file_chooser)), TRUE);
-+
-+	mail_save_part (part, uri, NULL, NULL, FALSE);
-+
-+exit:
-+	gtk_widget_destroy (file_chooser);
-+	g_free (uri);
-+  }
-+  
-+void
-+em_utils_save_parts (GtkWidget *parent, const gchar *prompt, GSList *parts)
- {
--	const char *name;
--	GtkWidget *filesel;
-+	GtkWidget *file_chooser;
-+	gchar *path_uri;
-+	GSList *iter;
  
 -	name = camel_mime_part_get_filename(part);
 -	if (name == NULL) {
@@ -100,7 +68,7 @@
 -		}
 -	}
 +	file_chooser = e_file_get_save_filesel (
-+		parent, prompt, NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
++		parent, prompt, filename, GTK_FILE_CHOOSER_ACTION_SAVE);
  
 -	filesel = e_file_get_save_filesel(parent, prompt, name, GTK_FILE_CHOOSER_ACTION_SAVE);
 -	camel_object_ref(part);
@@ -145,6 +113,53 @@
 -				mail_save_part(part, file_path, NULL, NULL, FALSE);
 -			else
 -				g_warning ("Could not save %s. File already exists", file_path);
++	uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (file_chooser));
++
++	/* XXX Would be nice to mention _why_ we can't save. */
++	if (!e_file_can_save (GTK_WINDOW (file_chooser), uri)) {
++		g_warning ("Unable to save %s", uri);
++		goto exit;
++	}
++  
++	e_file_update_save_path (
++		gtk_file_chooser_get_current_folder_uri (
++		GTK_FILE_CHOOSER (file_chooser)), TRUE);
+ 
+-			g_free (file_path);
+-			g_free (safe_name);
+-                }
++	mail_save_part (part, uri, NULL, NULL, FALSE);
+ 
+-		g_free (uri);
+-        }
+-	
+-	g_slist_free (parts);
+-	gtk_widget_destroy((GtkWidget *)filesel);
++exit:
++	gtk_widget_destroy (file_chooser);
++	g_free (uri);
+ }
+-
++  
+ void
+-em_utils_save_parts (GtkWidget *parent, const char *prompt, GSList * parts)
++em_utils_save_parts (GtkWidget *parent, const gchar *prompt, GSList *parts)
+ {
+-        GtkWidget *filesel;
++	GtkWidget *file_chooser;
++	gchar *path_uri;
++	GSList *iter;
+ 
+-        filesel = e_file_get_save_filesel (parent, prompt, NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+-        g_signal_connect (filesel, "response", G_CALLBACK (emu_save_parts_response), parts);
+-        gtk_widget_show (filesel);
+-}
++	file_chooser = e_file_get_save_filesel (
++		parent, prompt, NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
++
++	if (gtk_dialog_run (GTK_DIALOG (file_chooser)) != GTK_RESPONSE_OK)
++		goto exit;
++
 +	path_uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (file_chooser));
 +
 +	e_file_update_save_path (path_uri, FALSE);
@@ -153,10 +168,7 @@
 +		CamelMimePart *part = iter->data;
 +		const gchar *filename;
 +		gchar *uri;
- 
--			g_free (file_path);
--			g_free (safe_name);
--                }
++
 +		filename = emu_save_get_filename_for_part (part);
  
 +		uri = g_build_path ("/", path_uri, filename, NULL);
@@ -167,22 +179,19 @@
 +		else
 +			g_warning ("Unable to save %s", uri);
 +  
- 		g_free (uri);
--        }
--	
--	g_slist_free (parts);
--	gtk_widget_destroy((GtkWidget *)filesel);
++		g_free (uri);
 +	}
 +  
 +	g_free (path_uri);
 +  
 +exit:
 +	gtk_widget_destroy (file_chooser);
- }
++}
  
- void
---- evolution-2.10.2/mail/em-format-html-display.c.saving-attachments	2007-05-28 23:24:04.000000000 -0400
-+++ evolution-2.10.2/mail/em-format-html-display.c	2007-05-28 23:24:05.000000000 -0400
+ /**
+  * em_utils_save_part_to_file:
+--- evolution-2.10.2/mail/em-format-html-display.c.saving-attachments	2007-05-29 00:07:55.000000000 -0400
++++ evolution-2.10.2/mail/em-format-html-display.c	2007-05-29 00:07:55.000000000 -0400
 @@ -2099,12 +2099,24 @@
  }