Re: [evolution-patches] mail, 309647, reply to selection messing up normal replies

[Not Zed <notzed ximian com>]

updated patch which adds an unrelated refcount fix

On Wed, 2005-08-03 at 17:32 +0800, Not Zed wrote:
> this has really been getting to me lately, this patch seems to fix it,
> so far anyway.
> 
> 
> _______________________________________________
> evolution-patches mailing list
> evolution-patches lists ximian com
> http://lists.ximian.com/mailman/listinfo/evolution-patches

? mail/Evolution-DataServer-Mail-common.c
? mail/Evolution-DataServer-Mail-skels.c
? mail/Evolution-DataServer-Mail-stubs.c
? mail/Evolution-DataServer-Mail.h
? mail/Evolution-DataServer-Mail.idl
? mail/Evolution-Mail-common.c
? mail/Evolution-Mail-skels.c
? mail/Evolution-Mail-stubs.c
? mail/Evolution-Mail.h
? mail/GNOME_Evolution_Mail.oaf
? mail/GNOME_Evolution_Mail.oafinfo
? mail/Mail-common.c
? mail/Mail-skels.c
? mail/Mail-stubs.c
? mail/Mail.h
? mail/Mailer-common.c
? mail/Mailer-skels.c
? mail/Mailer-stubs.c
? mail/Mailer.h
? mail/Makefile.save
? mail/a
? mail/a.diff
? mail/a.out
? mail/a.txt
? mail/all.txt
? mail/blah.c
? mail/blah.ps
? mail/changes.diff
? mail/conf.keys
? mail/day.diff
? mail/diff
? mail/e-plugin.html
? mail/e.diff
? mail/econf.h
? mail/em-message-view.h
? mail/em-security-info.c
? mail/em-store-view.c
? mail/em.diff
? mail/eprofile.20423
? mail/eprofile.7804
? mail/evolution-mail
? mail/evolution-mail-2.4.schemas
? mail/evolution-mail-ops.log
? mail/evolution-mbox-upgrade
? mail/f.diff
? mail/fix.ed
? mail/foo
? mail/hide-empty.diff
? mail/html.diff
? mail/lockdown.txt
? mail/m.diff
? mail/mail-config.c.save
? mail/mail-config.evolution
? mail/mail-search.gladep
? mail/mail-security.gladep
? mail/mail-send-recv.c.save
? mail/mail.diff
? mail/mail.error
? mail/map.sed
? mail/message-list.c.save
? mail/ml.diff
? mail/old
? mail/out
? mail/output.ps
? mail/plugins
? mail/search-types.xml
? mail/store_change.diff
? mail/subscribe-dialog-new.c
? mail/subscribe-dialog.c.new
? mail/subscribe-dialog.glade.backup
? mail/subscribe-dialog.glade.save
? mail/subscribe-dialog.gladep
? mail/test-mt
? mail/today-1.diff
? mail/today-2.diff
? mail/today-3.diff
? mail/today-4.diff
? mail/today-5.diff
? mail/today.diff
? mail/typescript
? mail/week.diff
? mail/default/zh_CN/Makefile
? mail/default/zh_CN/Makefile.in
? mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.oaf
? mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.oaf.in
? mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf
? mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.oaf
? mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.oaf.in
? mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf
? mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.oaf
? mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.oaf.in
? mail/importers/am.diff
? mail/importers/b
? mail/importers/elm-importer.c.new
? mail/importers/elm.ps
? mail/importers/im.diff
? mail/importers/org-gnome-evolution-mail-importers.eplug.xml
Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3672
diff -u -p -r1.3672 ChangeLog
--- mail/ChangeLog	3 Aug 2005 11:15:31 -0000	1.3672
+++ mail/ChangeLog	3 Aug 2005 11:24:18 -0000
@@ -1,3 +1,14 @@
+2005-08-03  Not Zed  <NotZed Ximian com>
+
+	* em-folder-browser.c (emfb_set_folder): not here.
+ 
+	* em-folder-view.c (emfv_set_folder): ref the folder here.
+
+2005-08-03  Not Zed  <NotZed Ximian com>
+
+	* em-folder-view.c (emfv_message_reply): try to fix #309647, only
+	act if the selection is actually active.
+
 2005-07-29  Arunprakash <arunp novell com>
 
 	* mail/em-folder-utils.c (em_folder_utils_delete_folder) : Allocated
Index: mail/em-folder-browser.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-browser.c,v
retrieving revision 1.65
diff -u -p -r1.65 em-folder-browser.c
--- mail/em-folder-browser.c	21 Jul 2005 07:08:45 -0000	1.65
+++ mail/em-folder-browser.c	3 Aug 2005 11:24:18 -0000
@@ -1020,7 +1020,6 @@ emfb_set_folder(EMFolderView *emfv, Came
 		int state;
 		GConfClient *gconf = mail_config_get_gconf_client();
 		
-		camel_object_ref(folder);
 		mail_refresh_folder(folder, NULL, NULL);
 
 		emfb->priv->folder_changed_id = camel_object_hook_event(folder, "folder_changed",
Index: mail/em-folder-view.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-view.c,v
retrieving revision 1.127
diff -u -p -r1.127 em-folder-view.c
--- mail/em-folder-view.c	21 Jul 2005 04:15:21 -0000	1.127
+++ mail/em-folder-view.c	3 Aug 2005 11:24:19 -0000
@@ -603,6 +603,7 @@ emfv_set_folder(EMFolderView *emfv, Came
 		/* We need to set this up to get the right view options for the message-list, 
 		 * even if we're not showing it */
 		emfv_setup_view_instance(emfv);
+		camel_object_ref(folder);
 	}
 	
 	emfv_enable_menus(emfv);
@@ -1388,7 +1389,7 @@ emfv_message_post_reply (BonoboUICompone
 static void
 emfv_message_reply(EMFolderView *emfv, int mode)
 {
-	char *selection_string;
+	char *html;
 	guint len;
 	
 	if (emfv->list->cursor_uid == NULL)
@@ -1397,8 +1398,9 @@ emfv_message_reply(EMFolderView *emfv, i
 	if (!em_utils_check_user_can_send_mail ((GtkWidget *) emfv))
 		return;
 
-	selection_string = gtk_html_get_selection_html (((EMFormatHTML *)emfv->preview)->html, &len);
-	if (selection_string && len) {
+	if (gtk_html_command(((EMFormatHTML *)emfv->preview)->html, "is-selection-active")
+	    && (html = gtk_html_get_selection_html (((EMFormatHTML *)emfv->preview)->html, &len))
+	    && len) {
 		CamelMimeMessage *msg, *src;
 		struct _camel_header_raw *header;
 		
@@ -1414,7 +1416,7 @@ emfv_message_reply(EMFolderView *emfv, i
 		}
 		camel_mime_part_set_encoding((CamelMimePart *)msg, CAMEL_TRANSFER_ENCODING_8BIT);
 		camel_mime_part_set_content((CamelMimePart *)msg,
-					    selection_string, len, "text/html");
+					    html, len, "text/html");
 		em_utils_reply_to_message (emfv->folder, emfv->list->cursor_uid, msg, mode, NULL);
 		camel_object_unref(msg);
 	} else {