Merge revisions 37200:3266 from trunk.

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

13 files changed, 88 insertions, 8 deletions

diff --git a/plugins/audio-inline/ChangeLog b/plugins/audio-inline/ChangeLog
index 7ec5b04a59..374d489fbe 100644
--- a/plugins/audio-inline/ChangeLog
+++ b/plugins/audio-inline/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-11  Andre Klapper  <a9016009@gmx.de>
+
+	* audio-inline.c:
+	Substitute some deprecated gtk+ functions.
+
 2008-10-03  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c
index 2568117b5a..67280e54c4 100644
--- a/plugins/audio-inline/audio-inline.c
+++ b/plugins/audio-inline/audio-inline.c
@@ -263,7 +263,7 @@ org_gnome_audio_inline_add_button (GtkWidget *box, const char *stock_icon, GCall
 	g_signal_connect (button, "clicked", cb, data);
 
 	gtk_widget_show (button);
-	gtk_box_pack_end_defaults (GTK_BOX (box), button);
+	gtk_box_pack_end (GTK_BOX (box), button, TRUE, TRUE, 0);
 
 	return button;
 }
diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
index f7a42114aa..ac0b257d17 100644
--- a/plugins/backup-restore/backup.c
+++ b/plugins/backup-restore/backup.c
@@ -76,7 +76,7 @@ static const GOptionEntry options[] = {
 	{ NULL }
 };
 
-#define d(x) x
+#define d(x)
 
 #define rc(x) G_STMT_START { g_message (x); system (x); } G_STMT_END
 
diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am
index 1f1ddfea46..a91fd41a60 100644
--- a/plugins/bbdb/Makefile.am
+++ b/plugins/bbdb/Makefile.am
@@ -1,6 +1,7 @@
 INCLUDES =						\
 	-I$(top_builddir)/composer			\
 	-I$(top_srcdir)					\
+	-I$(top_srcdir)/widgets				\
 	$(EVOLUTION_MAIL_CFLAGS)			\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
diff --git a/plugins/email-custom-header/ChangeLog b/plugins/email-custom-header/ChangeLog
index 20b2a9b3a4..b10181369b 100644
--- a/plugins/email-custom-header/ChangeLog
+++ b/plugins/email-custom-header/ChangeLog
@@ -1,3 +1,21 @@
+2009-02-13  Milan Crha  <mcrha@redhat.com>
+
+	** Fixes part of bug #564229
+
+	* email-custom-header.c: (e_plugin_lib_get_configure_widget):
+	Do not use uninitialized variable.
+
+2009-02-02  Takao Fujiwara  <takao.fujiwara@sun.com>
+
+	Reviewed by Srinivasa Ragavan  <sragavan@novell.com>
+
+	** Fix for bug #567568
+
+	* apps_evolution_email_custom_header.schemas.in:
+	Remove translatable <default> tag.
+	* email-custom-header.c (epech_setup_widgets):
+	Added gettext for the default custom header.
+
 2009-01-09  Takao Fujiwara  <takao.fujiwara@sun.com>
 
 	Reviewed by Matthew Barnes  <mbarnes@redhat.com>
diff --git a/plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in b/plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in
index 1648026d54..cb3bd97ce8 100644
--- a/plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in
+++ b/plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in
@@ -8,7 +8,6 @@
       <list_type>string</list_type>
       <default>[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]</default>
       <locale name="C">
-         <default><!-- Translators: '=' and ';' should not be changed but ASCII -->[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]</default>
          <short>List of Custom Headers</short>
          <long>The key specifies the list of custom headers that you can add  to an outgoing message. The format for specifying a Header and Header value is: Name of the custom header followed by "=" and the values separated by ";"</long>
       </locale>
diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index 5942d28c20..233804cd13 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -39,7 +39,7 @@
 #include "email-custom-header.h"
 
 
-#define d(x) x
+#define d(x)
 #define GCONF_KEY_CUSTOM_HEADER "/apps/evolution/eplugin/email_custom_header/customHeader"
 
 typedef struct {
@@ -329,6 +329,20 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch)
 	HeaderValueComboBox *sub_combo_box_ptr;
 	gint sub_index,row_combo,column_combo;
 	gint header_section_id,sub_type_index,row,column,label_row;
+	gint i;
+	gchar *str;
+	static gchar *security_field = N_("Security:");
+	static struct _security_values {
+		char *value, *str;
+	} security_values[] = {
+		{ "Personal", N_("Personal") } ,
+		{ "Unclassified", N_("Unclassified") },
+		{ "Protected", N_("Protected") },
+		{ "InConfidence", N_("Confidential") },
+		{ "Secret", N_("Secret") },
+		{ "Topsecret", N_("Top secret") },
+		{ NULL, NULL }
+	};
 
 	priv = mch->priv;
 	priv->combo_box_header_value = g_array_new (TRUE, FALSE, sizeof (HeaderValueComboBox)); 
@@ -339,7 +353,11 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch)
 		// To create an empty label widget. Text will be added dynamically.
 		priv->header_type_name_label = gtk_label_new ("");
 		temp_header_ptr = &g_array_index(priv->email_custom_header_details, EmailCustomHeaderDetails,header_section_id);
-		gtk_label_set_markup (GTK_LABEL (priv->header_type_name_label),(temp_header_ptr->header_type_value)->str);
+                str = (temp_header_ptr->header_type_value)->str;
+                if (strcmp (str, security_field) == 0) {
+                	str = _(security_field);
+                }
+		gtk_label_set_markup (GTK_LABEL (priv->header_type_name_label), str);
 
 		gtk_table_attach (GTK_TABLE (priv->header_table), priv->header_type_name_label, 0, 1, row, column,
 			(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
@@ -363,8 +381,15 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch)
 
 		for (sub_type_index = 0; sub_type_index < temp->number_of_subtype_header; sub_type_index++) {
 			temp_header_value_ptr = &g_array_index(temp->sub_header_type_value, CustomSubHeader,sub_type_index); 
+			str = (temp_header_value_ptr->sub_header_string_value)->str;
+			for (i = 0; security_values[i].value != NULL; i++) {
+				if (strcmp (str, security_values[i].value) == 0) {
+                			str = _(security_values[i].str);
+                			break;
+				}
+			}
 			gtk_combo_box_append_text (GTK_COMBO_BOX (sub_combo_box_ptr->header_value_combo_box),
-				(temp_header_value_ptr->sub_header_string_value)->str);
+				str);
 		}
 
 		gtk_combo_box_append_text (GTK_COMBO_BOX (sub_combo_box_ptr->header_value_combo_box), _("None"));
@@ -878,7 +903,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
 	gtk_tree_view_set_model (GTK_TREE_VIEW (cd->treeview), GTK_TREE_MODEL (cd->store));
 
 	renderer = gtk_cell_renderer_text_new ();
-	gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (cd->treeview), -1, _("Key"),
+	col_pos = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (cd->treeview), -1, _("Key"),
 			renderer, "text", HEADER_KEY_COLUMN, NULL);
 	col = gtk_tree_view_get_column (GTK_TREE_VIEW (cd->treeview), col_pos -1);
         gtk_tree_view_column_set_resizable (col, TRUE);
diff --git a/plugins/face/face.c b/plugins/face/face.c
index eff4fa5794..ba683e91aa 100644
--- a/plugins/face/face.c
+++ b/plugins/face/face.c
@@ -32,7 +32,7 @@
 #include <e-util/e-error.h>
 #include <e-util/e-util.h>
 
-#define d(x) x
+#define d(x)
 
 gboolean	e_plugin_ui_init		(GtkUIManager *manager,
 						 EMsgComposer *composer);
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);
 	}
diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am
index 8915fe92ad..7e56421987 100644
--- a/plugins/mail-notification/Makefile.am
+++ b/plugins/mail-notification/Makefile.am
@@ -7,6 +7,7 @@ endif
 
 INCLUDES =					\
 	-I$(top_srcdir)				\
+	-I$(top_srcdir)/widgets			\
 	$(EVOLUTION_MAIL_CFLAGS)		\
 	$(LIBNOTIFY_CFLAGS)			
 
diff --git a/plugins/mono/ChangeLog b/plugins/mono/ChangeLog
index 45b669ec56..d994cc06f5 100644
--- a/plugins/mono/ChangeLog
+++ b/plugins/mono/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-05  Suman Manjunath  <msuman@novell.com>
+
+	* mono-plugin.c: Include <mono/metadata/mono-config.h> to fix an implicit-
+	function-declaration compiler warning.
+
 2009-01-28  Suman Manjunath  <msuman@novell.com>
 
 	* mono-plugin.c: Include <mono/metadata/threads.h> to fix an implicit-
diff --git a/plugins/mono/mono-plugin.c b/plugins/mono/mono-plugin.c
index 18b113c614..5dd92e8609 100644
--- a/plugins/mono/mono-plugin.c
+++ b/plugins/mono/mono-plugin.c
@@ -29,6 +29,7 @@
 #include <mono/metadata/appdomain.h>
 #include <mono/metadata/assembly.h>
 #include <mono/metadata/threads.h>
+#include <mono/metadata/mono-config.h>
 #include <mono/jit/jit.h>
 
 #define d(x) (x)