Merge commit 'EVOLUTION_2_27_5' into kill-bonobo

4 files changed, 35 insertions, 2 deletions

diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am
index 41b3f91170..20fd6bf812 100644
--- a/plugins/groupwise-features/Makefile.am
+++ b/plugins/groupwise-features/Makefile.am
@@ -64,6 +64,7 @@ error_DATA = 				\
 	org-gnome-shared-folder.error	\
 	org-gnome-proxy.error		\
 	org-gnome-proxy-login.error     \
+	org-gnome-process-meeting.error \
 	org-gnome-mail-retract.error
 
 errordir = $(privdatadir)/errors
@@ -75,6 +76,7 @@ EXTRA_DIST =						\
 	org-gnome-compose-send-options.xml		\
 	org-gnome-groupwise-features.eplug.xml		\
 	org-gnome-shared-folder.error.xml		\
+	org-gnome-process-meeting.error.xml		\
 	org-gnome-proxy.error.xml			\
 	org-gnome-proxy-login.error.xml     		\
 	org-gnome-mail-retract.error.xml
diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c
index 4faaf9bbc6..8244088f8a 100644
--- a/plugins/groupwise-features/mail-send-options.c
+++ b/plugins/groupwise-features/mail-send-options.c
@@ -44,6 +44,7 @@
 static ESendOptionsDialog * dialog = NULL;
 
 void org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t);
+void org_gnome_composer_message_reply (EPlugin *ep, EMEventTargetMessage *t);
 
 static time_t
 add_day_to_time (time_t time, gint days)
@@ -171,3 +172,22 @@ org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t)
 				  G_CALLBACK (send_options_commit), dialog);
 }
 
+void
+org_gnome_composer_message_reply (EPlugin *ep, EMEventTargetMessage *t)
+{
+	EMsgComposer *comp = (struct _EMsgComposer *)t->composer;
+	EComposerHeaderTable *table;
+	EAccount *account = NULL;
+	gchar *temp = NULL;
+
+	table = e_msg_composer_get_header_table (comp);
+	account = e_composer_header_table_get_account (table);
+	if (!account)
+		return;
+
+	temp = strstr (account->transport->url, "groupwise");
+	if (!temp) {
+		return;
+	}
+	e_msg_composer_add_header (comp, "X-GW-ORIG-ITEM-ID", t->uid);
+}
diff --git a/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml b/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
index 8bb6651acf..ea4f06a6e7 100644
--- a/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
+++ b/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
@@ -72,7 +72,16 @@
 			   enable="sendoption"
 			/>
 		</hook>
-	
+
+		<hook class="org.gnome.evolution.mail.events:1.0">
+			<event
+			   id="message.replying"
+			   handle="org_gnome_composer_message_reply"
+			   target="message"
+			   enable="reply"
+			/>
+		</hook>
+
 		<hook class="org.gnome.evolution.mail.config:1.0">
 			<group id="org.gnome.evolution.mail.config.accountEditor" 
 				target="account" commit = "proxy_commit" abort="proxy_abort">
diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c
index cc572a6893..123fc0641b 100644
--- a/plugins/groupwise-features/proxy-login.c
+++ b/plugins/groupwise-features/proxy-login.c
@@ -401,7 +401,9 @@ proxy_login_tree_view_changed_cb(GtkDialog *dialog)
 
 	account_select = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->tree));
 	gtk_tree_selection_get_selected (account_select, &model, &iter);
-        gtk_tree_model_get (model, &iter, ACCOUNT_NAME, &account_mailid, -1);
+	if ((priv->store)->stamp != (&iter)->stamp)
+		return;
+	gtk_tree_model_get (model, &iter, ACCOUNT_NAME, &account_mailid, -1);
 	account_mailid = g_strrstr (account_mailid, "\n") + 1;
 	account_name_tbox = glade_xml_get_widget (priv->xml, "account_name");
 	gtk_entry_set_text((GtkEntry*) account_name_tbox,account_mailid);