Re: [evolution-patches][Shell] Fixes for bug#323853

[ShiPu <Shi Pu Sun COM>]

hi, i'm sorry for missing the patch about plugins/save-attachment, this
part uses GnomeFileEntry too. pls review it again.

sorry for making you in trouble.

regards,

jerry

On Tue, 2006-02-28 at 14:03 +0530, Parthasarathi Susarla wrote:
> The mailer part looks fine.
> 
> Cheers,
> partha
> On Tue, 2006-02-28 at 16:12 +0800, ShiPu wrote:
> > hi guys,
> > 	these patches are for #323853.  pls review them for me.
> > 
> > regards,
> > 
> > jerry
> > _______________________________________________
> > Evolution-patches mailing list
> > Evolution-patches gnome org
> > http://mail.gnome.org/mailman/listinfo/evolution-patches
> 
> _______________________________________________
> Evolution-patches mailing list
> Evolution-patches gnome org
> http://mail.gnome.org/mailman/listinfo/evolution-patches

Index: plugins/save-attachments/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/save-attachments/ChangeLog,v
retrieving revision 1.12
diff -u -p -r1.12 ChangeLog
--- plugins/save-attachments/ChangeLog	17 Dec 2005 18:59:58 -0000	1.12
+++ plugins/save-attachments/ChangeLog	28 Feb 2006 09:46:33 -0000
@@ -1,3 +1,11 @@
+2006-02-28  Shi Pu <shi pu sun com>
+
+	** Fixes #323853
+
+	* save-attachments.c: (save_response), (entry_changed),
+	(save_got_message):
+	replace GnomeFileEntry by GtkFileChooserButton.
+
 2005-12-17  Tor Lillqvist  <tml novell com>
 
 	* save-attachments.c (entry_changed): Use GLib API to manipulate
Index: plugins/save-attachments/save-attachments.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/save-attachments/save-attachments.c,v
retrieving revision 1.6
diff -u -p -r1.6 save-attachments.c
--- plugins/save-attachments/save-attachments.c	17 Dec 2005 18:59:58 -0000	1.6
+++ plugins/save-attachments/save-attachments.c	28 Feb 2006 09:46:34 -0000
@@ -50,7 +50,7 @@
 #include <gtk/gtklabel.h>
 #include <gtk/gtkalignment.h>
 #include <gtk/gtkscrolledwindow.h>
-#include <libgnomeui/gnome-file-entry.h>
+#include <gtk/gtkfilechooserbutton.h>
 
 #include <camel/camel-folder.h>
 #include <camel/camel-exception.h>
@@ -243,7 +243,7 @@ save_response(GtkWidget *d, int id, stru
 	if (id == GTK_RESPONSE_OK) {
 		char *tmp;
 
-		data->base = gnome_file_entry_get_full_path((GnomeFileEntry *)data->entry, FALSE);
+		data->base = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (data->entry));
 		data->path = g_strdup(data->base);
 		tmp = strrchr(data->path, '/');
 		if (tmp)
@@ -279,7 +279,7 @@ entry_changed(GtkWidget *entry, struct _
 	char *basename = NULL;
 	const char *file;
 
-	path = gnome_file_entry_get_full_path((GnomeFileEntry *)data->entry, FALSE);
+	path = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (data->entry));
 	if (path == NULL
 	    || G_IS_DIR_SEPARATOR (path[strlen(path)-1])
 	    || (basename = g_path_get_basename(path)) == NULL
@@ -335,14 +335,13 @@ save_got_message(CamelFolder *folder, co
 							  GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 							  GTK_STOCK_SAVE, GTK_RESPONSE_OK,
 							  NULL);
-	w = gnome_file_entry_new("save-attachments", _("Select save base name"));
+	w = gtk_file_chooser_button_new (_("Select save base name"), GTK_FILE_CHOOSER_ACTION_OPEN);
 	data->entry = w;
 	g_object_set(w, "filechooser_action", GTK_FILE_CHOOSER_ACTION_SAVE, NULL);
 	gtk_widget_show(w);
 	gtk_box_pack_start((GtkBox *)dialog->vbox, w, FALSE, TRUE, 6);
 
-	w = gnome_file_entry_gtk_entry((GnomeFileEntry *)data->entry);
-	g_signal_connect(w, "changed", G_CALLBACK(entry_changed), data);
+	g_signal_connect(GTK_FILE_CHOOSER_BUTTON (w), "selection-changed", G_CALLBACK(entry_changed), data);
 
 	model = gtk_tree_store_new(5, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER);
 	data->model = model;