Merge revisions 37200:3266 from trunk.

svn path=/branches/kill-bonobo/; revision=37270

2 files changed, 25 insertions, 0 deletions

diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index 7bd94c1240..97a2d6fbe1 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/ChangeLog
@@ -1,3 +1,11 @@
+2009-02-02  Srinivasa Ragavan  <sragavan@novell.com>
+
+	** Fix for bug #548787
+
+	* itip-view.c (set_info_items), (itip_view_init),
+	(itip_view_set_source_list): Enable CnP for all the text info present
+	in calendar related messages.
+
 2009-01-21  Suman Manjunath  <msuman@novell.com>
 
 	** Fix for bug #541209
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index 8c36da53d3..8ca120603d 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -737,6 +737,7 @@ set_info_items (GtkWidget *info_box, GSList *info_items)
 		}
 
 		label = gtk_label_new (item->message);
+		gtk_label_set_selectable (GTK_LABEL (label), TRUE);		
 		gtk_widget_show (label);
 		gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 6);
 
@@ -991,6 +992,7 @@ itip_view_init (ItipView *view)
 	/* The first section listing the sender */
 	/* FIXME What to do if the send and organizer do not match */
 	priv->sender_label = gtk_label_new (NULL);
+	gtk_label_set_selectable (GTK_LABEL (priv->sender_label), TRUE);
 	gtk_misc_set_alignment (GTK_MISC (priv->sender_label), 0, 0.5);
 	gtk_widget_show (priv->sender_label);
 	gtk_box_pack_start (GTK_BOX (vbox), priv->sender_label, FALSE, FALSE, 0);
@@ -1008,6 +1010,7 @@ itip_view_init (ItipView *view)
 
 	/* Summary */
 	priv->summary_label = gtk_label_new (NULL);
+	gtk_label_set_selectable (GTK_LABEL (priv->summary_label), TRUE);
 	gtk_misc_set_alignment (GTK_MISC (priv->summary_label), 0, 0.5);
 	gtk_label_set_line_wrap_mode (GTK_LABEL (priv->summary_label), PANGO_WRAP_WORD);
 	gtk_label_set_line_wrap (GTK_LABEL (priv->summary_label), TRUE);
@@ -1017,6 +1020,8 @@ itip_view_init (ItipView *view)
 	/* Location */
 	priv->location_header = gtk_label_new (_("Location:"));
 	priv->location_label = gtk_label_new (NULL);
+	gtk_label_set_selectable (GTK_LABEL (priv->location_header), TRUE);
+	gtk_label_set_selectable (GTK_LABEL (priv->location_label), TRUE);
 	gtk_misc_set_alignment (GTK_MISC (priv->location_header), 0, 0.5);
 	gtk_misc_set_alignment (GTK_MISC (priv->location_label), 0, 0.5);
 	gtk_table_attach (GTK_TABLE (table), priv->location_header, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
@@ -1025,6 +1030,8 @@ itip_view_init (ItipView *view)
 	/* Start time */
 	priv->start_header = gtk_label_new (_("Start time:"));
 	priv->start_label = gtk_label_new (NULL);
+	gtk_label_set_selectable (GTK_LABEL (priv->start_header), TRUE);
+	gtk_label_set_selectable (GTK_LABEL (priv->start_label), TRUE);	
 	gtk_misc_set_alignment (GTK_MISC (priv->start_header), 0, 0.5);
 	gtk_misc_set_alignment (GTK_MISC (priv->start_label), 0, 0.5);
 	gtk_widget_show (priv->start_header);
@@ -1034,6 +1041,8 @@ itip_view_init (ItipView *view)
 	/* End time */
 	priv->end_header = gtk_label_new (_("End time:"));
 	priv->end_label = gtk_label_new (NULL);
+	gtk_label_set_selectable (GTK_LABEL (priv->end_header), TRUE);
+	gtk_label_set_selectable (GTK_LABEL (priv->end_label), TRUE);
 	gtk_misc_set_alignment (GTK_MISC (priv->end_header), 0, 0.5);
 	gtk_misc_set_alignment (GTK_MISC (priv->end_label), 0, 0.5);
 	gtk_table_attach (GTK_TABLE (table), priv->end_header, 0, 1, 3, 4, GTK_FILL, 0, 0, 0);
@@ -1042,6 +1051,8 @@ itip_view_init (ItipView *view)
 	/* Status */
 	priv->status_header = gtk_label_new (_("Status:"));
 	priv->status_label = gtk_label_new (NULL);
+	gtk_label_set_selectable (GTK_LABEL (priv->status_header), TRUE);
+	gtk_label_set_selectable (GTK_LABEL (priv->status_label), TRUE);
 	gtk_misc_set_alignment (GTK_MISC (priv->status_header), 0, 0.5);
 	gtk_misc_set_alignment (GTK_MISC (priv->status_label), 0, 0.5);
 	gtk_table_attach (GTK_TABLE (table), priv->status_header, 0, 1, 4, 5, GTK_FILL, 0, 0, 0);
@@ -1050,6 +1061,8 @@ itip_view_init (ItipView *view)
 	/* Comment */
 	priv->comment_header = gtk_label_new (_("Comment:"));
 	priv->comment_label = gtk_label_new (NULL);
+	gtk_label_set_selectable (GTK_LABEL (priv->comment_header), TRUE);
+	gtk_label_set_selectable (GTK_LABEL (priv->comment_label), TRUE);
 	gtk_misc_set_alignment (GTK_MISC (priv->comment_header), 0, 0.5);
 	gtk_misc_set_alignment (GTK_MISC (priv->comment_label), 0, 0.5);
 	gtk_table_attach (GTK_TABLE (table), priv->comment_header, 0, 1, 5, 6, GTK_FILL, 0, 0, 0);
@@ -1062,6 +1075,7 @@ itip_view_init (ItipView *view)
 
 	/* Description */
 	priv->description_label = gtk_label_new (NULL);
+	gtk_label_set_selectable (GTK_LABEL (priv->description_label), TRUE);	
 	gtk_label_set_line_wrap (GTK_LABEL (priv->description_label), TRUE);
 	gtk_misc_set_alignment (GTK_MISC (priv->description_label), 0, 0.5);
 	gtk_box_pack_start (GTK_BOX (vbox), priv->description_label, FALSE, FALSE, 0);
@@ -1095,10 +1109,12 @@ itip_view_init (ItipView *view)
 	gtk_box_pack_start (GTK_BOX (priv->rsvp_box), hbox, FALSE, FALSE, 0);
 
 	label = gtk_label_new (NULL);
+	gtk_label_set_selectable (GTK_LABEL (label), TRUE);	
 	gtk_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 
 	priv->rsvp_comment_header = gtk_label_new (_("Comment:"));
+	gtk_label_set_selectable (GTK_LABEL (priv->rsvp_comment_header), TRUE);	
 	gtk_widget_set_sensitive (priv->rsvp_comment_header, FALSE);
 	gtk_widget_show (priv->rsvp_comment_header);
 	gtk_box_pack_start (GTK_BOX (hbox), priv->rsvp_comment_header, FALSE, FALSE, 0);
@@ -1896,6 +1912,7 @@ itip_view_set_source_list (ItipView *view, ESourceList *source_list)
 		else if (priv->type == E_CAL_SOURCE_TYPE_JOURNAL)
 			priv->escb_header = gtk_label_new_with_mnemonic (_("Memos :"));
 
+		gtk_label_set_selectable (GTK_LABEL (priv->escb_header), TRUE);
 		gtk_label_set_mnemonic_widget (GTK_LABEL (priv->escb_header), priv->escb);
 		gtk_widget_show (priv->escb_header);
 	}