evolution r35304 - in branches/mbarnes-composer: addressbook addressbook/gui/component addressbook/gui/contact-editor addressbook/gui/widgets calendar calendar/gui calendar/gui/dialogs help help/es/figures mail plugins/calendar-http plugins/calendar-weather plugins/google-account-setup plugins/groupwise-features plugins/itip-formatter plugins/mono plugins/tnef-attachments po widgets/misc widgets/table

From: mbarnes svn gnome org
To: svn-commits-list gnome org
Subject: evolution r35304 - in branches/mbarnes-composer: addressbook addressbook/gui/component addressbook/gui/contact-editor addressbook/gui/widgets calendar calendar/gui calendar/gui/dialogs help help/es/figures mail plugins/calendar-http plugins/calendar-weather plugins/google-account-setup plugins/groupwise-features plugins/itip-formatter plugins/mono plugins/tnef-attachments po widgets/misc widgets/table
Date: Tue, 1 Apr 2008 20:45:49 +0100 (BST)
Author: mbarnes
Date: Tue Apr  1 20:45:48 2008
New Revision: 35304
URL: http://svn.gnome.org/viewvc/evolution?rev=35304&view=rev

Log:
Merge revisions 35255:35302 from trunk.


Removed:
   branches/mbarnes-composer/help/es/figures/evo_label_a.PNG
Modified:
   branches/mbarnes-composer/addressbook/ChangeLog
   branches/mbarnes-composer/addressbook/addressbook.error.xml
   branches/mbarnes-composer/addressbook/gui/component/ldap-config.glade
   branches/mbarnes-composer/addressbook/gui/contact-editor/e-contact-editor-address.c
   branches/mbarnes-composer/addressbook/gui/widgets/e-minicard.c
   branches/mbarnes-composer/addressbook/gui/widgets/eab-contact-display.c
   branches/mbarnes-composer/calendar/ChangeLog
   branches/mbarnes-composer/calendar/calendar.error.xml
   branches/mbarnes-composer/calendar/gui/dialogs/calendar-setup.c
   branches/mbarnes-composer/calendar/gui/dialogs/comp-editor.c
   branches/mbarnes-composer/calendar/gui/e-day-view.c
   branches/mbarnes-composer/help/ChangeLog
   branches/mbarnes-composer/mail/ChangeLog
   branches/mbarnes-composer/mail/em-composer-prefs.c
   branches/mbarnes-composer/mail/em-network-prefs.c
   branches/mbarnes-composer/mail/em-popup.c
   branches/mbarnes-composer/mail/mail-config.glade
   branches/mbarnes-composer/mail/mail-folder-cache.c
   branches/mbarnes-composer/mail/message-list.c
   branches/mbarnes-composer/mail/message-list.h
   branches/mbarnes-composer/plugins/calendar-http/ChangeLog
   branches/mbarnes-composer/plugins/calendar-http/calendar-http.c
   branches/mbarnes-composer/plugins/calendar-weather/ChangeLog
   branches/mbarnes-composer/plugins/calendar-weather/calendar-weather.c
   branches/mbarnes-composer/plugins/google-account-setup/ChangeLog
   branches/mbarnes-composer/plugins/google-account-setup/google-source.c
   branches/mbarnes-composer/plugins/groupwise-features/ChangeLog
   branches/mbarnes-composer/plugins/groupwise-features/org-gnome-mail-retract-errors.xml
   branches/mbarnes-composer/plugins/groupwise-features/org-gnome-proxy-errors.xml
   branches/mbarnes-composer/plugins/groupwise-features/org-gnome-proxy-login-errors.xml
   branches/mbarnes-composer/plugins/groupwise-features/org-gnome-shared-folder.errors.xml
   branches/mbarnes-composer/plugins/groupwise-features/properties.glade
   branches/mbarnes-composer/plugins/groupwise-features/share-folder.c
   branches/mbarnes-composer/plugins/itip-formatter/ChangeLog
   branches/mbarnes-composer/plugins/itip-formatter/itip-formatter.c
   branches/mbarnes-composer/plugins/mono/Camel.cs
   branches/mbarnes-composer/plugins/mono/ChangeLog
   branches/mbarnes-composer/plugins/tnef-attachments/ChangeLog
   branches/mbarnes-composer/plugins/tnef-attachments/Makefile.am
   branches/mbarnes-composer/po/ChangeLog
   branches/mbarnes-composer/po/POTFILES.in
   branches/mbarnes-composer/po/de.po
   branches/mbarnes-composer/po/sv.po
   branches/mbarnes-composer/widgets/misc/ChangeLog
   branches/mbarnes-composer/widgets/misc/e-send-options.glade
   branches/mbarnes-composer/widgets/table/ChangeLog
   branches/mbarnes-composer/widgets/table/e-tree-table-adapter.c

Modified: branches/mbarnes-composer/addressbook/addressbook.error.xml
==============================================================================
--- branches/mbarnes-composer/addressbook/addressbook.error.xml	(original)
+++ branches/mbarnes-composer/addressbook/addressbook.error.xml	Tue Apr  1 20:45:48 2008
@@ -115,7 +115,7 @@
 
  <error id="contact-delete-error-perm" type="warning">
   <_primary>Failed to delete contact</_primary> 
-  <_secondary>Permission Denied.</_secondary>
+  <_secondary>You do not have enough permissions to delete contact in this Address Book.</_secondary>
  </error>
 
  <error id="error-read-only" type="error" default="GTK_RESPONSE_YES">

Modified: branches/mbarnes-composer/addressbook/gui/component/ldap-config.glade
==============================================================================
--- branches/mbarnes-composer/addressbook/gui/component/ldap-config.glade	(original)
+++ branches/mbarnes-composer/addressbook/gui/component/ldap-config.glade	Tue Apr  1 20:45:48 2008
@@ -85,7 +85,7 @@
 	      <child>
 		<widget class="GtkLabel" id="label564">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Display&lt;/b&gt;</property>
+		  <property name="label" translatable="no">Display</property>
 		  <property name="use_underline">False</property>
 		  <property name="use_markup">True</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -199,7 +199,7 @@
 		  <child>
 		    <widget class="GtkLabel" id="label557">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Server Information&lt;/b&gt;</property>
+		      <property name="label" translatable="no">Server Information</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1823,7 +1823,7 @@
 		  <child>
 		    <widget class="GtkLabel" id="label38">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Display&lt;/b&gt;</property>
+		      <property name="label" translatable="no">Display</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2100,7 +2100,7 @@
 		  <child>
 		    <widget class="GtkLabel" id="label39">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Server Information&lt;/b&gt;</property>
+		      <property name="label" translatable="no">Server Information</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>

Modified: branches/mbarnes-composer/addressbook/gui/contact-editor/e-contact-editor-address.c
==============================================================================
--- branches/mbarnes-composer/addressbook/gui/contact-editor/e-contact-editor-address.c	(original)
+++ branches/mbarnes-composer/addressbook/gui/contact-editor/e-contact-editor-address.c	Tue Apr  1 20:45:48 2008
@@ -225,7 +225,7 @@
 	N_("Guatemala"),
 	N_("Guernsey"),
 	N_("Guinea"),
-	N_("Guinea-bissau"),
+	N_("Guinea-Bissau"),
 	N_("Guyana"),
 	N_("Haiti"),
 	N_("Heard And McDonald Islands"),

Modified: branches/mbarnes-composer/addressbook/gui/widgets/e-minicard.c
==============================================================================
--- branches/mbarnes-composer/addressbook/gui/widgets/e-minicard.c	(original)
+++ branches/mbarnes-composer/addressbook/gui/widgets/e-minicard.c	Tue Apr  1 20:45:48 2008
@@ -830,7 +830,7 @@
 			return _(common_location [i].pretty_name);
 	}
 
-	return NULL;
+	return _("Other Email");
 }
 
 static void
@@ -854,10 +854,7 @@
 		gboolean parser_check;
 
 		tmp = get_email_location ((EVCardAttribute *) l->data);
-		if (tmp)
-			name = g_strdup_printf ("%s:", tmp);
-		else
-			name = g_strdup ("");
+		name = g_strdup_printf ("%s:", tmp);
 
 		parser_check = eab_parse_qp_email ((const gchar *) le->data, &parsed_name, &email);
 		if (parser_check) {

Modified: branches/mbarnes-composer/addressbook/gui/widgets/eab-contact-display.c
==============================================================================
--- branches/mbarnes-composer/addressbook/gui/widgets/eab-contact-display.c	(original)
+++ branches/mbarnes-composer/addressbook/gui/widgets/eab-contact-display.c	Tue Apr  1 20:45:48 2008
@@ -525,7 +525,7 @@
 			return _(common_location [i].pretty_name);
 	}
 
-	return NULL;
+	return _("Other");
 }
 
 static void
@@ -751,14 +751,33 @@
 		const char *str;
 		char *html;
 		EContactPhoto *photo;
+		guint bg_frame = 0x000000, bg_body = 0xEEEEEE;
+		GtkStyle *style;
+
+		style = gtk_widget_get_style (GTK_WIDGET (display));
+		if (style) {
+			gushort r, g, b;
+
+			r = style->black.red >> 8;
+			g = style->black.green >> 8;
+			b = style->black.blue >> 8;
+			bg_frame = ((r << 16) | (g << 8) | b) & 0xffffff;
+
+			#define DARKER(a) (((a) >= 0x22) ? ((a) - 0x22) : 0)
+			r = DARKER (style->bg[GTK_STATE_NORMAL].red >> 8);
+			g = DARKER (style->bg[GTK_STATE_NORMAL].green >> 8);
+			b = DARKER (style->bg[GTK_STATE_NORMAL].blue >> 8);
+			bg_body = ((r << 16) | (g << 8) | b) & 0xffffff;
+			#undef DARKER
+		}
 
 		gtk_html_stream_printf (html_stream,
-					"<table width=\"100%%\" cellpadding=1 cellspacing=0 bgcolor=\"#000000\">"
+					"<table width=\"100%%\" cellpadding=1 cellspacing=0 bgcolor=\"#%06X\">"
 					"<tr><td valign=\"top\">"
-					"<table width=\"100%%\" cellpadding=0 cellspacing=0 bgcolor=\"#eeeeee\">"
+					"<table width=\"100%%\" cellpadding=0 cellspacing=0 bgcolor=\"#%06X\">"
 					"<tr><td valign=\"top\">"
 					"<table>"
-					"<tr><td valign=\"top\">");
+					"<tr><td valign=\"top\">", bg_frame, bg_body);
 
 		photo = e_contact_get (contact, E_CONTACT_PHOTO);
 		if (!photo)

Modified: branches/mbarnes-composer/calendar/calendar.error.xml
==============================================================================
--- branches/mbarnes-composer/calendar/calendar.error.xml	(original)
+++ branches/mbarnes-composer/calendar/calendar.error.xml	Tue Apr  1 20:45:48 2008
@@ -235,6 +235,13 @@
   <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
  </error>
 
+ <error id="prompt-read-only-cal-editor" type="error" default="GTK_RESPONSE_YES">
+  <_primary>Cannot save event</_primary>
+  <!-- For Translators: {0} is the name of the calendar source -->
+  <_secondary>'{0}' is a read-only calendar source. Change Calendar to one that can accept appointments.</_secondary>
+  <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
+ </error>
+
  <error id="prompt-no-contents-offline-tasks" type="error" default="GTK_RESPONSE_YES">
   <_primary>Error loading task list</_primary>
   <_secondary>The task list is not marked for offline usage.</_secondary>

Modified: branches/mbarnes-composer/calendar/gui/dialogs/calendar-setup.c
==============================================================================
--- branches/mbarnes-composer/calendar/gui/dialogs/calendar-setup.c	(original)
+++ branches/mbarnes-composer/calendar/gui/dialogs/calendar-setup.c	Tue Apr  1 20:45:48 2008
@@ -343,7 +343,7 @@
 		g_warning ("Unknown color \"%s\" in calendar \"%s\"",
 			color_spec, e_source_peek_name (sdialog->source));
 
-	label = gtk_label_new_with_mnemonic (_("C_olor:"));
+	label = gtk_label_new_with_mnemonic (_("Colo_r:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 	gtk_table_attach (
 		GTK_TABLE (parent), label,
@@ -474,10 +474,7 @@
 	target->source_type = E_CAL_SOURCE_TYPE_EVENT;
 	e_config_set_target ((EConfig *) ec, (EConfigTarget *) target);
 
-	if (source)
-		sdialog->window = e_config_create_window ((EConfig *)ec, NULL, _("Calendar Properties"));
-	else
-		sdialog->window = e_config_create_window ((EConfig *)ec, NULL, _("New Calendar"));
+	sdialog->window = e_config_create_window ((EConfig *)ec, NULL, source ? _("Calendar Properties") : _("New Calendar"));
 
 	/* forces initial validation */
 	if (!sdialog->original_source)
@@ -533,7 +530,7 @@
 	target->source_type = E_CAL_SOURCE_TYPE_TODO;
 	e_config_set_target ((EConfig *) ec, (EConfigTarget *) target);
 
-	sdialog->window = e_config_create_window ((EConfig *)ec, NULL, _("Task List Properties"));
+	sdialog->window = e_config_create_window ((EConfig *)ec, NULL, source ? _("Task List Properties") : _("New Task List"));
 
 	/* forces initial validation */
 	if (!sdialog->original_source)
@@ -589,7 +586,7 @@
 	target->source_type = E_CAL_SOURCE_TYPE_JOURNAL;
 	e_config_set_target ((EConfig *) ec, (EConfigTarget *) target);
 
-	sdialog->window = e_config_create_window ((EConfig *)ec, NULL, _("New Memo List"));
+	sdialog->window = e_config_create_window ((EConfig *)ec, NULL, source ? _("Memo List Properties") : _("New Memo List"));
 
 	/* forces initial validation */
 	if (!sdialog->original_source)

Modified: branches/mbarnes-composer/calendar/gui/dialogs/comp-editor.c
==============================================================================
--- branches/mbarnes-composer/calendar/gui/dialogs/comp-editor.c	(original)
+++ branches/mbarnes-composer/calendar/gui/dialogs/comp-editor.c	Tue Apr  1 20:45:48 2008
@@ -915,7 +915,7 @@
 	switch (save_component_dialog (GTK_WINDOW(editor), priv->comp)) {
 	case GTK_RESPONSE_YES: /* Save */
 		if (!e_cal_is_read_only (priv->client, &read_only, NULL) || read_only) {
-			e_error_run ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (editor)), "calendar:prompt-read-only-cal", e_source_peek_name (e_cal_get_source (priv->client)), NULL);
+			e_error_run ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (editor)), "calendar:prompt-read-only-cal-editor", e_source_peek_name (e_cal_get_source (priv->client)), NULL);
 			/* don't discard changes when selected readonly calendar */
 			return FALSE;
 		}
@@ -1290,7 +1290,7 @@
 	}
 
 	if (!e_cal_is_read_only (priv->client, &read_only, NULL) || read_only) {
-		e_error_run ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (editor)), "calendar:prompt-read-only-cal", e_source_peek_name (e_cal_get_source (priv->client)), NULL);
+		e_error_run ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (editor)), "calendar:prompt-read-only-cal-editor", e_source_peek_name (e_cal_get_source (priv->client)), NULL);
 		return;
 	}
 

Modified: branches/mbarnes-composer/calendar/gui/e-day-view.c
==============================================================================
--- branches/mbarnes-composer/calendar/gui/e-day-view.c	(original)
+++ branches/mbarnes-composer/calendar/gui/e-day-view.c	Tue Apr  1 20:45:48 2008
@@ -3899,8 +3899,6 @@
 							     e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
 		e_cal_component_set_dtstart (comp, &date);
 	} else {
-		ECalComponentDateTime ecdt;
-
 		e_cal_component_get_dtend (comp, &date);
 		is_date = date.value->is_date;
 		if (!is_date)

Modified: branches/mbarnes-composer/mail/em-composer-prefs.c
==============================================================================
--- branches/mbarnes-composer/mail/em-composer-prefs.c	(original)
+++ branches/mbarnes-composer/mail/em-composer-prefs.c	Tue Apr  1 20:45:48 2008
@@ -729,6 +729,19 @@
  * End of Spell checking
  */
 
+static int
+attach_style_reply_new_order (int style_id, gboolean from_enum_to_option_id)
+{
+	int values[] = {MAIL_CONFIG_REPLY_ATTACH, 0, MAIL_CONFIG_REPLY_OUTLOOK, 1, MAIL_CONFIG_REPLY_QUOTED, 2, MAIL_CONFIG_REPLY_DO_NOT_QUOTE, 3, -1, -1};
+	int i;
+
+	for (i = from_enum_to_option_id ? 0 : 1; values[i] != -1; i += 2) {
+		if (values[i] == style_id)
+			return values [from_enum_to_option_id ? i + 1 : i - 1];
+	}
+
+	return style_id;
+}
 
 static void
 attach_style_info (GtkWidget *item, gpointer user_data)
@@ -741,6 +754,16 @@
 }
 
 static void
+attach_style_info_reply (GtkWidget *item, gpointer user_data)
+{
+	int *style = user_data;
+
+	g_object_set_data ((GObject *) item, "style", GINT_TO_POINTER (attach_style_reply_new_order (*style, FALSE)));
+
+	(*style)++;
+}
+
+static void
 toggle_button_toggled (GtkToggleButton *toggle, EMComposerPrefs *prefs)
 {
 	const char *key;
@@ -984,10 +1007,10 @@
 
 	prefs->reply_style = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuReplyStyle"));
 	style = gconf_client_get_int (prefs->gconf, "/apps/evolution/mail/format/reply_style", NULL);
-	gtk_option_menu_set_history (prefs->reply_style, style);
+	gtk_option_menu_set_history (prefs->reply_style, attach_style_reply_new_order (style, TRUE));
 	style = 0;
 	gtk_container_foreach (GTK_CONTAINER (gtk_option_menu_get_menu (prefs->reply_style)),
-			       attach_style_info, &style);
+			       attach_style_info_reply, &style);
 	option_menu_connect (prefs, prefs->reply_style, G_CALLBACK (style_activate),
 			     "/apps/evolution/mail/format/reply_style");
 

Modified: branches/mbarnes-composer/mail/em-network-prefs.c
==============================================================================
--- branches/mbarnes-composer/mail/em-network-prefs.c	(original)
+++ branches/mbarnes-composer/mail/em-network-prefs.c	Tue Apr  1 20:45:48 2008
@@ -138,8 +138,6 @@
 static void
 em_network_prefs_finalise (GObject *obj)
 {
-	EMNetworkPrefs *prefs = (EMNetworkPrefs *) obj;
-
 	d(g_print ("Network preferences finalize is called\n"));
 	
 	/* do something here */
@@ -149,7 +147,6 @@
 static void
 em_network_prefs_destroy (GtkObject *obj)
 {
-	EMNetworkPrefs *prefs = (EMNetworkPrefs *) obj;
 	d(g_print ("Network preferences destroy is called\n"));
 
 	GTK_OBJECT_CLASS (parent_class)->destroy (obj);
@@ -232,7 +229,6 @@
 static void
 emnp_parse_ignore_hosts (gpointer data, gpointer user_data)
 {
-	char *input = (char *)data;
 	GString *str = (GString *)user_data;
 
 	if (!str)

Modified: branches/mbarnes-composer/mail/em-popup.c
==============================================================================
--- branches/mbarnes-composer/mail/em-popup.c	(original)
+++ branches/mbarnes-composer/mail/em-popup.c	Tue Apr  1 20:45:48 2008
@@ -788,6 +788,12 @@
 	}
 
 	if (mime_type) {
+                gchar *cp;
+
+                /* GNOME-VFS expects lowercase MIME types. */
+                for (cp = mime_type; *cp != '\0'; cp++)
+                        *cp = g_ascii_tolower (*cp);
+
 		apps = gnome_vfs_mime_get_all_applications(mime_type);
 
 		if (apps == NULL && strcmp(mime_type, "application/octet-stream") == 0) {

Modified: branches/mbarnes-composer/mail/mail-config.glade
==============================================================================
--- branches/mbarnes-composer/mail/mail-config.glade	(original)
+++ branches/mbarnes-composer/mail/mail-config.glade	Tue Apr  1 20:45:48 2008
@@ -7146,38 +7146,38 @@
 					  <child internal-child="menu">
 					    <widget class="GtkMenu" id="convertwidget33">
 					      <property name="visible">True</property>
-
 					      <child>
-						<widget class="GtkMenuItem" id="convertwidget34">
+						<widget class="GtkMenuItem" id="convertwidget36">
 						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">Quote original message</property>
+						  <property name="label" translatable="yes">Attachment</property>
 						  <property name="use_underline">True</property>
 						</widget>
 					      </child>
 
 					      <child>
-						<widget class="GtkMenuItem" id="convertwidget35">
+						<widget class="GtkMenuItem" id="convertwidget50">
 						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">Do not quote original message</property>
+						  <property name="label" translatable="yes">Inline (Outlook style)</property>
 						  <property name="use_underline">True</property>
 						</widget>
 					      </child>
 
 					      <child>
-						<widget class="GtkMenuItem" id="convertwidget36">
+						<widget class="GtkMenuItem" id="convertwidget34">
 						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">Attach original message</property>
+						  <property name="label" translatable="yes">Quoted</property>
 						  <property name="use_underline">True</property>
 						</widget>
 					      </child>
 
 					      <child>
-						<widget class="GtkMenuItem" id="convertwidget50">
+						<widget class="GtkMenuItem" id="convertwidget35">
 						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">Inline original message (Outlook style)</property>
+						  <property name="label" translatable="yes">Do not quote</property>
 						  <property name="use_underline">True</property>
 						</widget>
 					      </child>
+					      
 					    </widget>
 					  </child>
 					</widget>

Modified: branches/mbarnes-composer/mail/mail-folder-cache.c
==============================================================================
--- branches/mbarnes-composer/mail/mail-folder-cache.c	(original)
+++ branches/mbarnes-composer/mail/mail-folder-cache.c	Tue Apr  1 20:45:48 2008
@@ -389,6 +389,7 @@
 static void
 folder_changed (CamelObject *o, gpointer event_data, gpointer user_data)
 {
+	static time_t last_newmail = 0;
 	CamelFolderChangeInfo *changes = event_data;
 	CamelFolder *folder = (CamelFolder *)o;
 	CamelStore *store = folder->parent_store;
@@ -414,12 +415,16 @@
 				flags = camel_message_info_flags (info);
 				if (((flags & CAMEL_MESSAGE_SEEN) == 0) &&
 				    ((flags & CAMEL_MESSAGE_JUNK) == 0) &&
-				    ((flags & CAMEL_MESSAGE_DELETED) == 0))
+				    ((flags & CAMEL_MESSAGE_DELETED) == 0) &&
+				    (camel_message_info_date_received (info) > last_newmail))
 					new++;
 			}
 		}
 	}
 
+	if (new > 0 || !last_newmail)
+		time (&last_newmail);
+
 	LOCK(info_lock);
 	if (stores != NULL
 	    && (si = g_hash_table_lookup(stores, store)) != NULL

Modified: branches/mbarnes-composer/mail/message-list.c
==============================================================================
--- branches/mbarnes-composer/mail/message-list.c	(original)
+++ branches/mbarnes-composer/mail/message-list.c	Tue Apr  1 20:45:48 2008
@@ -1411,7 +1411,7 @@
 		return GINT_TO_POINTER (!(flags & CAMEL_MESSAGE_SEEN));
 	}
 	case COL_COLOUR: {
-		const char *colour, *due_by, *completed;
+		const char *colour, *due_by, *completed, *followup;
 		char *labels_string = NULL;
 		int n;
 
@@ -1425,6 +1425,7 @@
 		colour = camel_message_info_user_tag(msg_info, "colour");
 		due_by = camel_message_info_user_tag(msg_info, "due-by");
 		completed = camel_message_info_user_tag(msg_info, "completed-on");
+		followup = camel_message_info_user_tag(msg_info, "follow-up");
 		if (colour == NULL) {
 			if ((n = get_all_labels (msg_info,  &labels_string, TRUE)) == 1) {
 
@@ -1432,12 +1433,10 @@
 			} else if (camel_message_info_flags(msg_info) & CAMEL_MESSAGE_FLAGGED) {
 				/* FIXME: extract from the important.xpm somehow. */
 				colour = "#A7453E";
-			} else if ((due_by && *due_by) && !(completed && *completed)) {
+			} else if (((followup && *followup) || (due_by && *due_by)) && !(completed && *completed)) {
 				time_t now = time (NULL);
-				time_t target_date;
 
-				target_date = camel_header_decode_date (due_by, NULL);
-				if (now >= target_date)
+				if ((followup && *followup) || now >= camel_header_decode_date (due_by, NULL))
 					colour = "#A7453E";
 			}
 		}
@@ -1473,10 +1472,11 @@
  			euri = em_uri_from_camel(url);
  			curl = camel_url_new (euri, &ex);
  			if (curl->host && !strcmp(curl->host, "local") && curl->user && !strcmp(curl->user, "local"))
- 				location = g_strconcat ("On This Computer", ":",curl->path, NULL);
+ 				location = g_strconcat (_("On This Computer"), ":",curl->path, NULL);
  		}
 
  		camel_exception_clear (&ex);
+		camel_url_free (curl);
  		g_free (url);
  		g_free (euri);
 
@@ -3547,17 +3547,6 @@
 }
 
 void
-message_list_set_expand_all (MessageList *ml, gboolean threaded)
-{
-	if (ml->threaded != threaded) {
-		ml->threaded = threaded;
-
-		if (ml->frozen == 0)
-			mail_regen_list (ml, ml->search, NULL, NULL);
-	}
-}
-
-void
 message_list_set_hidedeleted (MessageList *ml, gboolean hidedeleted)
 {
 	if (ml->hidedeleted != hidedeleted) {
@@ -4063,8 +4052,8 @@
 		else
 			load_tree_state (m->ml);
 
-		m->ml->expand_all = FALSE;
-		m->ml->collapse_all = FALSE;
+		m->ml->expand_all = 0;
+		m->ml->collapse_all = 0;
 	} else
 		build_flat (m->ml, m->summary, m->changes);
 

Modified: branches/mbarnes-composer/mail/message-list.h
==============================================================================
--- branches/mbarnes-composer/mail/message-list.h	(original)
+++ branches/mbarnes-composer/mail/message-list.h	Tue Apr  1 20:45:48 2008
@@ -219,7 +219,6 @@
 void           message_list_set_threaded_expand_all (MessageList *ml);
 void           message_list_set_threaded_collapse_all (MessageList *ml);
 
-void           message_list_set_expand_all (MessageList *ml, gboolean threaded);
 void	       message_list_set_hidedeleted (MessageList *ml, gboolean hidedeleted);
 void	       message_list_set_search (MessageList *ml, const char *search);
 

Modified: branches/mbarnes-composer/plugins/calendar-http/calendar-http.c
==============================================================================
--- branches/mbarnes-composer/plugins/calendar-http/calendar-http.c	(original)
+++ branches/mbarnes-composer/plugins/calendar-http/calendar-http.c	Tue Apr  1 20:45:48 2008
@@ -270,7 +270,7 @@
 
 	row = ((GtkTable*)parent)->nrows;
 
-	label = gtk_label_new_with_mnemonic (_("_Refresh:"));
+	label = gtk_label_new_with_mnemonic (_("Re_fresh:"));
 	gtk_widget_show (label);
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 	gtk_table_attach (GTK_TABLE (parent), label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0);

Modified: branches/mbarnes-composer/plugins/calendar-weather/calendar-weather.c
==============================================================================
--- branches/mbarnes-composer/plugins/calendar-weather/calendar-weather.c	(original)
+++ branches/mbarnes-composer/plugins/calendar-weather/calendar-weather.c	Tue Apr  1 20:45:48 2008
@@ -543,7 +543,7 @@
 
 	row = ((GtkTable*)parent)->nrows;
 
-	label = gtk_label_new_with_mnemonic (_("_Refresh:"));
+	label = gtk_label_new_with_mnemonic (_("Re_fresh:"));
 	gtk_widget_show (label);
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 	gtk_table_attach (GTK_TABLE (parent), label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0);

Modified: branches/mbarnes-composer/plugins/google-account-setup/google-source.c
==============================================================================
--- branches/mbarnes-composer/plugins/google-account-setup/google-source.c	(original)
+++ branches/mbarnes-composer/plugins/google-account-setup/google-source.c	Tue Apr  1 20:45:48 2008
@@ -372,7 +372,7 @@
 
 	gtk_label_set_mnemonic_widget (GTK_LABEL (luser), user);
 
-	GtkWidget *label = gtk_label_new_with_mnemonic (_("_Refresh:"));
+	GtkWidget *label = gtk_label_new_with_mnemonic (_("Re_fresh:"));
 	gtk_widget_show (label);
 	gtk_misc_set_alignment (GTK_MISC(label), 0.0, 0.5);
 	gtk_table_attach (GTK_TABLE (parent),

Modified: branches/mbarnes-composer/plugins/groupwise-features/org-gnome-mail-retract-errors.xml
==============================================================================
--- branches/mbarnes-composer/plugins/groupwise-features/org-gnome-mail-retract-errors.xml	(original)
+++ branches/mbarnes-composer/plugins/groupwise-features/org-gnome-mail-retract-errors.xml	Tue Apr  1 20:45:48 2008
@@ -2,7 +2,7 @@
 
 <error-list domain="org.gnome.evolution.message.retract">
 	<error id="retract-failure" type="error">
-		<primary>Message retract failed</primary>
-		<secondary>The server did not allow the selected message to be retracted.</secondary>
+		<_primary>Message retract failed</_primary>
+		<_secondary>The server did not allow the selected message to be retracted.</_secondary>
 	</error>
 </error-list> 

Modified: branches/mbarnes-composer/plugins/groupwise-features/org-gnome-proxy-errors.xml
==============================================================================
--- branches/mbarnes-composer/plugins/groupwise-features/org-gnome-proxy-errors.xml	(original)
+++ branches/mbarnes-composer/plugins/groupwise-features/org-gnome-proxy-errors.xml	Tue Apr  1 20:45:48 2008
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <error-list domain="org.gnome.evolution.proxy">
 <error id="invalid-user" type="error">
-<primary>Invalid user</primary>
-<secondary>
+<_primary>Invalid user</_primary>
+<_secondary>
 Proxy access cannot be given to user &quot;{0}&quot; 
-</secondary>
+</_secondary>
 </error>
 
 <error id="no-user" type="error">
-<primary>Specify User</primary>
-<secondary>
+<_primary>Specify User</_primary>
+<_secondary>
 You have to specify a valid user name to give proxy rights.
-</secondary>
+</_secondary>
 </error>
 
 <error id="user-is-proxy" type="error">
-<primary>Specify User</primary>
-<secondary>
+<_primary>Specify User</_primary>
+<_secondary>
 You have already given proxy permissions to this user. 
-</secondary>
+</_secondary>
 </error>
 
 </error-list>

Modified: branches/mbarnes-composer/plugins/groupwise-features/org-gnome-proxy-login-errors.xml
==============================================================================
--- branches/mbarnes-composer/plugins/groupwise-features/org-gnome-proxy-login-errors.xml	(original)
+++ branches/mbarnes-composer/plugins/groupwise-features/org-gnome-proxy-login-errors.xml	Tue Apr  1 20:45:48 2008
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <error-list domain="org.gnome.evolution.proxy-login">
 <error id="invalid-user" type="error">
-<primary>Invalid user</primary>
-<secondary>
+<_primary>Invalid user</_primary>
+<_secondary>
 Proxy login as &quot;{0}&quot; was unsuccessful. Please check Email Id and try again. 
-</secondary>
+</_secondary>
 </error>
 
 <error id="already-loggedin" type="error">
-	<primary>Account Already Exists</primary>
-	<secondary>Account &quot;{0}&quot; already exists. Please check your folder tree.</secondary>
+	<_primary>Account Already Exists</_primary>
+	<_secondary>Account &quot;{0}&quot; already exists. Please check your folder tree.</_secondary>
 </error>
 
 </error-list>

Modified: branches/mbarnes-composer/plugins/groupwise-features/org-gnome-shared-folder.errors.xml
==============================================================================
--- branches/mbarnes-composer/plugins/groupwise-features/org-gnome-shared-folder.errors.xml	(original)
+++ branches/mbarnes-composer/plugins/groupwise-features/org-gnome-shared-folder.errors.xml	Tue Apr  1 20:45:48 2008
@@ -1,28 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <error-list domain="org.gnome.evolution.mail_shared_folder">
+
 <error id="invalid-user" type="error">
-<primary>Invalid user</primary>
-<secondary>
+<_primary>Invalid user</_primary>
+<_secondary>
 You cannot share folder with specified user &quot;{0}&quot; 
-</secondary>
+</_secondary>
 </error>
 
 <error id="no-user" type="error">
-<primary>Specify User</primary>
-<secondary>
+<_primary>Specify User</_primary>
+<_secondary>
 	You have to specify a user name whom you want to add to the list 
-</secondary>
+</_secondary>
 </error>
 
 <error id="recurrence" type="question" default="GTK_RESPONSE_YES">
-<primary>This is a recurring meeting</primary>
-<secondary>What would you like to {0}?</secondary>
+<_primary>This is a recurring meeting</_primary>
+<_secondary>What would you like to {0}?</_secondary>
  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
- <button label="This instance" response="GTK_RESPONSE_NO"/>
- <button label="All instances" response="GTK_RESPONSE_YES"/>
+ <button _label="This instance" response="GTK_RESPONSE_NO"/>
+ <button _label="All instances" response="GTK_RESPONSE_YES"/>
 </error>
 
-
-
 </error-list>
 

Modified: branches/mbarnes-composer/plugins/groupwise-features/properties.glade
==============================================================================
--- branches/mbarnes-composer/plugins/groupwise-features/properties.glade	(original)
+++ branches/mbarnes-composer/plugins/groupwise-features/properties.glade	Tue Apr  1 20:45:48 2008
@@ -241,7 +241,6 @@
 
 				  <child>
 				    <widget class="GtkButton" id="Address">
-				      <property name="width_request">96</property>
 				      <property name="visible">True</property>
 				      <property name="can_focus">True</property>
 				      <property name="relief">GTK_RELIEF_NORMAL</property>
@@ -316,7 +315,6 @@
 
 				  <child>
 				    <widget class="GtkButton" id="Add">
-				      <property name="width_request">61</property>
 				      <property name="visible">True</property>
 				      <property name="can_focus">True</property>
 				      <property name="relief">GTK_RELIEF_NORMAL</property>
@@ -359,7 +357,6 @@
 
 					      <child>
 						<widget class="GtkLabel" id="label561">
-						  <property name="width_request">29</property>
 						  <property name="visible">True</property>
 						  <property name="label" translatable="yes">_Add</property>
 						  <property name="use_underline">True</property>
@@ -732,11 +729,12 @@
 
 	      <child>
 		<widget class="GtkScrolledWindow" id="scrolledwindow3">
+		  <property name="border_width">0</property>
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
-		  <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-		  <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-		  <property name="shadow_type">GTK_SHADOW_NONE</property>
+		  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		  <property name="shadow_type">GTK_SHADOW_IN</property>
 		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 		  <child>
@@ -788,7 +786,6 @@
 
 	  <child>
 	    <widget class="GtkLabel" id="label555">
-	      <property name="width_request">248</property>
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes"></property>
 	      <property name="use_underline">False</property>
@@ -848,8 +845,8 @@
 	  </child>
 	</widget>
 	<packing>
-	  <property name="padding">42</property>
-	  <property name="expand">True</property>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
 	  <property name="fill">True</property>
 	</packing>
       </child>

Modified: branches/mbarnes-composer/plugins/groupwise-features/share-folder.c
==============================================================================
--- branches/mbarnes-composer/plugins/groupwise-features/share-folder.c	(original)
+++ branches/mbarnes-composer/plugins/groupwise-features/share-folder.c	Tue Apr  1 20:45:48 2008
@@ -524,6 +524,7 @@
 	char *gladefile;
 
 	sf->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+	gtk_window_set_type_hint (GTK_WINDOW (sf->window), GDK_WINDOW_TYPE_HINT_DIALOG);
 
 	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
 				      "properties.glade",
@@ -540,14 +541,13 @@
 	g_signal_connect ((gpointer) not_ok, "clicked", G_CALLBACK (not_ok_clicked), sf);
 	not_cancel = GTK_BUTTON (glade_xml_get_widget (xmln, "nCancel"));
 	g_signal_connect ((gpointer) not_cancel, "clicked", G_CALLBACK (not_cancel_clicked), sf->window);
-	gtk_window_set_title (GTK_WINDOW (sf->window), "Custom Notification");
+	gtk_window_set_title (GTK_WINDOW (sf->window), _("Custom Notification"));
 	gtk_window_set_position (GTK_WINDOW (sf->window) , GTK_WIN_POS_CENTER_ALWAYS);
 	gtk_window_set_default_size (GTK_WINDOW (sf->window), 100, 200);
-	gtk_widget_reparent (GTK_WIDGET (sf->window), GTK_WIDGET (sf->vbox));
-	gtk_window_set_transient_for ((GtkWindow *)sf->window, GTK_WINDOW(sf->vbox));
+	gtk_window_set_transient_for ((GtkWindow *)sf->window, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (sf->table))));
 	gtk_window_set_modal ((GtkWindow *)sf->window, TRUE);
-	gtk_window_present ((GtkWindow *)sf->window);
 	gtk_widget_show_all (sf->window);
+	gtk_window_present ((GtkWindow *)sf->window);
 }
 
 static void

Modified: branches/mbarnes-composer/plugins/itip-formatter/itip-formatter.c
==============================================================================
--- branches/mbarnes-composer/plugins/itip-formatter/itip-formatter.c	(original)
+++ branches/mbarnes-composer/plugins/itip-formatter/itip-formatter.c	Tue Apr  1 20:45:48 2008
@@ -790,6 +790,8 @@
 			fd->puri = pitip;
 			fd->uid = g_strdup (uid);
 			fd->rid = rid;
+			/* avoid free this at the end */
+			rid = NULL;
 
 			if (pitip->start_time && pitip->end_time) {
 				start = isodate_from_time_t (pitip->start_time);
@@ -815,6 +817,7 @@
 	g_slist_free (all_sources);
 	g_slist_free (sources_conflict);
 	g_free (uri);
+	g_free (rid);
 }
 
 static void

Modified: branches/mbarnes-composer/plugins/mono/Camel.cs
==============================================================================
--- branches/mbarnes-composer/plugins/mono/Camel.cs	(original)
+++ branches/mbarnes-composer/plugins/mono/Camel.cs	Tue Apr  1 20:45:48 2008
@@ -392,18 +392,18 @@
 		}
 
 		public enum Tag {
-			NAME = 0x1400 + Arg.Tag.STR,
-			FULL_NAME = 0x1401 + Arg.Tag.STR,
-			STORE = 0x1402 + Arg.Tag.OBJ,
-			PERMANENTFLAGS = 0x1403 + Arg.Tag.INT,
-			TOTAL = 0x1404 + Arg.Tag.INT,
-			UNREAD = 0x1405 + Arg.Tag.INT,
-			DELETED = 0x1406 + Arg.Tag.INT,
-			JUNKED = 0x1407 + Arg.Tag.INT,
-			VISIBLE = 0x1408 + Arg.Tag.INT,
-			UID_ARRAY = 0x1409 + Arg.Tag.PTR,
-			INFO_ARRAY = 0x140a + Arg.Tag.PTR, // GPtrArray
-			PROPERTIES = 0x140b + Arg.Tag.PTR, // GSList of properties
+			NAME = (int) (0x1400 + Arg.Tag.STR),
+			FULL_NAME = (int) (0x1401 + Arg.Tag.STR),
+			STORE = (int) (0x1402 + Arg.Tag.OBJ),
+			PERMANENTFLAGS = (int) (0x1403 + Arg.Tag.INT),
+			TOTAL = (int) (0x1404 + Arg.Tag.INT),
+			UNREAD = (int) (0x1405 + Arg.Tag.INT),
+			DELETED = (int) (0x1406 + Arg.Tag.INT),
+			JUNKED = (int) (0x1407 + Arg.Tag.INT),
+			VISIBLE = (int) (0x1408 + Arg.Tag.INT),
+			UID_ARRAY = (int) (0x1409 + Arg.Tag.PTR),
+			INFO_ARRAY = (int) (0x140a + Arg.Tag.PTR), // GPtrArray
+			PROPERTIES = (int) (0x140b + Arg.Tag.PTR), // GSList of properties
 		}
 
 		[DllImport("camel-provider-1.2")] static extern IntPtr camel_folder_get_message(IntPtr o, string uid, ref CamelException ex);

Modified: branches/mbarnes-composer/plugins/tnef-attachments/Makefile.am
==============================================================================
--- branches/mbarnes-composer/plugins/tnef-attachments/Makefile.am	(original)
+++ branches/mbarnes-composer/plugins/tnef-attachments/Makefile.am	Tue Apr  1 20:45:48 2008
@@ -1,7 +1,7 @@
 INCLUDES =						\
 	-I$(top_srcdir)					\
 	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""	\
-	-DLOCALEDIR="\"$(LOCALEDIR)\""			\
+	-DLOCALEDIR="\"$(localedir)\""			\
 	$(EVOLUTION_MAIL_CFLAGS)			\
 	$(TNEF_CFLAGS)
 

Modified: branches/mbarnes-composer/po/POTFILES.in
==============================================================================
--- branches/mbarnes-composer/po/POTFILES.in	(original)
+++ branches/mbarnes-composer/po/POTFILES.in	Tue Apr  1 20:45:48 2008
@@ -331,6 +331,7 @@
 plugins/groupwise-features/mail-retract.c
 plugins/groupwise-features/org-gnome-compose-send-options.xml
 plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
+plugins/groupwise-features/org-gnome-mail-retract-errors.xml
 plugins/groupwise-features/org-gnome-proxy-errors.xml
 plugins/groupwise-features/org-gnome-proxy-login-errors.xml
 plugins/groupwise-features/org-gnome-shared-folder.errors.xml

Modified: branches/mbarnes-composer/widgets/misc/e-send-options.glade
==============================================================================
--- branches/mbarnes-composer/widgets/misc/e-send-options.glade	(original)
+++ branches/mbarnes-composer/widgets/misc/e-send-options.glade	Tue Apr  1 20:45:48 2008
@@ -350,7 +350,7 @@
 			<widget class="GtkCheckButton" id="delay-delivery-button">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Delay message delivery</property>
+			  <property name="label" translatable="yes" comments="To translators: This means Delay the message delivery for some time">_Delay message delivery</property>
 			  <property name="use_underline">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>

Modified: branches/mbarnes-composer/widgets/table/e-tree-table-adapter.c
==============================================================================
--- branches/mbarnes-composer/widgets/table/e-tree-table-adapter.c	(original)
+++ branches/mbarnes-composer/widgets/table/e-tree-table-adapter.c	Tue Apr  1 20:45:48 2008
@@ -991,7 +991,7 @@
 	ETreeTableAdapter *etta = (ETreeTableAdapter *) data;
 
 	if (node->expanded != TRUE) {
-		e_tree_table_adapter_node_set_expanded(etta, path, TRUE);
+		e_tree_table_adapter_node_set_expanded_recurse (etta, path, TRUE);
 		node->expanded = TRUE;
 	}
 }
@@ -1004,7 +1004,7 @@
 	ETreeTableAdapter *etta = (ETreeTableAdapter *) data;
 
 	if (node->expanded != FALSE) {
-		e_tree_table_adapter_node_set_expanded(etta, path, FALSE);
+		e_tree_table_adapter_node_set_expanded_recurse (etta, path, FALSE);
 		node->expanded = FALSE;
 	}
 }
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]