evolution r37270 - in branches/kill-bonobo: . addressbook addressbook/gui/component addressbook/util calendar calendar/gui calendar/gui/alarm-notify calendar/gui/dialogs composer doc/reference/shell e-util help help/C/figures help/cs help/es/figures help/no help/no/figures help/sv/figures mail mail/importers plugins/audio-inline plugins/backup-restore plugins/bbdb plugins/email-custom-header plugins/face plugins/itip-formatter plugins/mail-notification plugins/mono po shell ui widgets/misc

From: mbarnes svn gnome org
To: svn-commits-list gnome org
Subject: evolution r37270 - in branches/kill-bonobo: . addressbook addressbook/gui/component addressbook/util calendar calendar/gui calendar/gui/alarm-notify calendar/gui/dialogs composer doc/reference/shell e-util help help/C/figures help/cs help/es/figures help/no help/no/figures help/sv/figures mail mail/importers plugins/audio-inline plugins/backup-restore plugins/bbdb plugins/email-custom-header plugins/face plugins/itip-formatter plugins/mail-notification plugins/mono po shell ui widgets/misc
Date: Sun, 15 Feb 2009 03:27:32 +0000 (UTC)
Author: mbarnes
Date: Sun Feb 15 03:27:31 2009
New Revision: 37270
URL: http://svn.gnome.org/viewvc/evolution?rev=37270&view=rev

Log:
Merge revisions 37200:3266 from trunk.


Removed:
   branches/kill-bonobo/help/C/figures/Screenshot-Evolution-mailer-Preferences.png
   branches/kill-bonobo/help/C/figures/Screenshot-Free-Busy.png
   branches/kill-bonobo/help/C/figures/addrs_book_a.png
   branches/kill-bonobo/help/C/figures/calendar.png
   branches/kill-bonobo/help/C/figures/contact-editor.png
   branches/kill-bonobo/help/C/figures/contact.png
   branches/kill-bonobo/help/C/figures/evo_account_info_a.png
   branches/kill-bonobo/help/C/figures/evo_add_rule_a.png
   branches/kill-bonobo/help/C/figures/evo_email_a.png
   branches/kill-bonobo/help/C/figures/evo_mail_callout_a.eps
   branches/kill-bonobo/help/C/figures/evo_mail_callout_a.gif
   branches/kill-bonobo/help/C/figures/evo_receive_setup2_a.png
   branches/kill-bonobo/help/C/figures/exchange-delegation.png
   branches/kill-bonobo/help/C/figures/exchange-identity.png
   branches/kill-bonobo/help/C/figures/exchange-receive-options.png
   branches/kill-bonobo/help/C/figures/exchange-receive.png
   branches/kill-bonobo/help/C/figures/full-1.png
   branches/kill-bonobo/help/C/figures/full-2.png
   branches/kill-bonobo/help/C/figures/full-3.png
   branches/kill-bonobo/help/C/figures/full-4.png
   branches/kill-bonobo/help/C/figures/full-5.png
   branches/kill-bonobo/help/C/figures/full-6.png
   branches/kill-bonobo/help/C/figures/full-7.png
   branches/kill-bonobo/help/C/figures/mail-druid-pic.png
   branches/kill-bonobo/help/C/figures/mail-inbox.png
   branches/kill-bonobo/help/C/figures/mail_mainwindow_a.png
   branches/kill-bonobo/help/C/figures/mainwindow-pic.png
   branches/kill-bonobo/help/C/figures/newmsg.png
   branches/kill-bonobo/help/C/figures/replymsg.png
   branches/kill-bonobo/help/C/figures/schedule.png
   branches/kill-bonobo/help/C/figures/vfolder-createrule-fig.png
   branches/kill-bonobo/help/es/figures/addrs_book_a.png
   branches/kill-bonobo/help/es/figures/contact-editor.png
   branches/kill-bonobo/help/es/figures/evo_account_info_a.png
   branches/kill-bonobo/help/es/figures/evo_add_rule_a.png
   branches/kill-bonobo/help/no/figures/calendar.png
   branches/kill-bonobo/help/no/figures/contact-editor.png
   branches/kill-bonobo/help/no/figures/contact.png
   branches/kill-bonobo/help/no/figures/mail-druid-pic.png
   branches/kill-bonobo/help/no/figures/mail-inbox.png
   branches/kill-bonobo/help/no/figures/mainwindow-pic.png
   branches/kill-bonobo/help/no/figures/newmsg.png
   branches/kill-bonobo/help/no/figures/replymsg.png
   branches/kill-bonobo/help/no/figures/vfolder-createrule-fig.png
   branches/kill-bonobo/help/sv/figures/evo_add_rule_a.png
Modified:
   branches/kill-bonobo/   (props changed)
   branches/kill-bonobo/ChangeLog
   branches/kill-bonobo/NEWS
   branches/kill-bonobo/addressbook/ChangeLog
   branches/kill-bonobo/addressbook/gui/component/eab-composer-util.c   (props changed)
   branches/kill-bonobo/addressbook/gui/component/eab-composer-util.h   (props changed)
   branches/kill-bonobo/addressbook/util/addressbook.c   (props changed)
   branches/kill-bonobo/addressbook/util/addressbook.h   (props changed)
   branches/kill-bonobo/calendar/ChangeLog
   branches/kill-bonobo/calendar/gui/alarm-notify/alarm-notify.c
   branches/kill-bonobo/calendar/gui/alarm-notify/alarm-notify.glade
   branches/kill-bonobo/calendar/gui/alarm-notify/alarm-queue.c
   branches/kill-bonobo/calendar/gui/calendar-config.c
   branches/kill-bonobo/calendar/gui/calendar-config.h
   branches/kill-bonobo/calendar/gui/dialogs/alarm-dialog.c
   branches/kill-bonobo/calendar/gui/dialogs/event-page.c
   branches/kill-bonobo/calendar/gui/dialogs/task-details-page.c
   branches/kill-bonobo/calendar/gui/dialogs/task-page.c
   branches/kill-bonobo/calendar/gui/e-day-view.c
   branches/kill-bonobo/calendar/gui/e-itip-control.c
   branches/kill-bonobo/calendar/gui/e-week-view.c
   branches/kill-bonobo/calendar/gui/gnome-cal.c
   branches/kill-bonobo/calendar/gui/memos-component.c
   branches/kill-bonobo/composer/ChangeLog
   branches/kill-bonobo/composer/e-msg-composer.c
   branches/kill-bonobo/configure.in
   branches/kill-bonobo/doc/reference/shell/Makefile.am
   branches/kill-bonobo/e-util/ChangeLog
   branches/kill-bonobo/help/ChangeLog
   branches/kill-bonobo/help/Makefile.am
   branches/kill-bonobo/help/cs/cs.po
   branches/kill-bonobo/help/no/Makefile.am
   branches/kill-bonobo/mail/ChangeLog
   branches/kill-bonobo/mail/em-event.c
   branches/kill-bonobo/mail/em-event.h
   branches/kill-bonobo/mail/em-folder-browser.c
   branches/kill-bonobo/mail/em-format-html-display.c
   branches/kill-bonobo/mail/em-format-html-print.c
   branches/kill-bonobo/mail/em-format-html.c
   branches/kill-bonobo/mail/em-format.c
   branches/kill-bonobo/mail/em-format.h
   branches/kill-bonobo/mail/em-network-prefs.c
   branches/kill-bonobo/mail/em-network-prefs.h
   branches/kill-bonobo/mail/em-utils.c
   branches/kill-bonobo/mail/em-utils.h
   branches/kill-bonobo/mail/importers/elm-importer.c
   branches/kill-bonobo/mail/importers/pine-importer.c
   branches/kill-bonobo/plugins/audio-inline/ChangeLog
   branches/kill-bonobo/plugins/audio-inline/audio-inline.c
   branches/kill-bonobo/plugins/backup-restore/backup.c
   branches/kill-bonobo/plugins/bbdb/Makefile.am
   branches/kill-bonobo/plugins/email-custom-header/ChangeLog
   branches/kill-bonobo/plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in
   branches/kill-bonobo/plugins/email-custom-header/email-custom-header.c
   branches/kill-bonobo/plugins/face/face.c
   branches/kill-bonobo/plugins/itip-formatter/ChangeLog
   branches/kill-bonobo/plugins/itip-formatter/itip-view.c
   branches/kill-bonobo/plugins/mail-notification/Makefile.am
   branches/kill-bonobo/plugins/mono/ChangeLog
   branches/kill-bonobo/plugins/mono/mono-plugin.c
   branches/kill-bonobo/po/ChangeLog
   branches/kill-bonobo/po/ca.po
   branches/kill-bonobo/po/es.po
   branches/kill-bonobo/po/eu.po
   branches/kill-bonobo/po/fi.po
   branches/kill-bonobo/po/gu.po
   branches/kill-bonobo/po/hu.po
   branches/kill-bonobo/po/nb.po
   branches/kill-bonobo/po/pt_BR.po
   branches/kill-bonobo/po/vi.po
   branches/kill-bonobo/po/zh_HK.po
   branches/kill-bonobo/po/zh_TW.po
   branches/kill-bonobo/shell/ChangeLog
   branches/kill-bonobo/shell/Makefile.am
   branches/kill-bonobo/ui/evolution-mail-reader.ui   (props changed)
   branches/kill-bonobo/widgets/misc/ChangeLog
   branches/kill-bonobo/widgets/misc/e-filter-bar.c
   branches/kill-bonobo/widgets/misc/e-signature-editor.c   (props changed)
   branches/kill-bonobo/widgets/misc/e-signature-editor.h   (props changed)
   branches/kill-bonobo/widgets/misc/e-unicode.c

Modified: branches/kill-bonobo/NEWS
==============================================================================
--- branches/kill-bonobo/NEWS	(original)
+++ branches/kill-bonobo/NEWS	Sun Feb 15 03:27:31 2009
@@ -1,3 +1,52 @@
+Evolution 2.25.90 2009-02-02
+----------------------------
+
+Updated Translations:
+	Andre Klapper (de)
+	Bharath Acharya (PO)
+	Changwoo Ryu (ko)
+	Daniel Nylander (sv)
+	Funda Wang (zh)
+	Gabor Kelemen (hu)
+	Hendrik Richter (de)
+	I. Felix (ta)
+	Ilkka Tuohela (fi)
+	Jonh Wendell (pt)
+	Jorge Gonzalez (es)
+	Jovan Naumovski (mk)
+	Kjartan Maraas (nb)
+	MiloÅ PopoviÄ) (sr)
+	Nguyán ThÃi Ngác Duy (vi)
+	Raivis Dejus (lv)
+	Wadim Dziedzic (pl)
+
+Bug Fixes:
+	#318003 : Support move of the event in day view when dropped over the source list. Use the same function for events/tasks/memos. Encode string data same as memos and tasks do, with a source UID. Removed inappropriate comments. (Milan Crha)
+	#342446 : Use localized digits in the calendar widget. (behnam esfahbod)
+	#362754 : Ensure to show default groups and sources with actual localized name, not the one it was stored last time. (Milan Crha)
+	#442869 : Delete attendee only if we have enough rights for it. (Milan Crha)
+	#450554 (BNC) : Remove all attendees from the list-view and name-selector before populating it on 'event_changed' callback. (Suman Manjunath)
+	#470474 (BNC) : fix unused strings. (Bharath Acharya)
+	#539467 :  Find group by its base uri, not by a localized name. (Milan Crha)
+	#546637 : Partial fix for unread vfolders  (Srinivasa Ragavan)
+	#559604 : Additional Information On Calendar Tooltip (Milan Crha)
+	#561628 : Initialize 'parent_class' with its parent, not with itself. (Milan Crha)
+	#562449 : regression in vfolder functionality with read/deleted messages  (Srinivasa Ragavan)
+	#567654 : Crash in vfolders  (Srinivasa Ragavan)
+	#567824 : Fix all header related bugs in calendar printing. (Bharath Acharya)
+	#347287 : MVC for calendar. (Chenthill Palanisamy)
+	#450535 (BNC): Monthly Calendar Highlighted Days Does Not Pass To Meeting/Appointment  (Chenthill Palanisamy)
+	#463602 (bnc) In Calendar View, Meeting/Recur/Alarm Icons Obscure Time Of Meeting. (Chenthill Palanisamy)
+
+	Other contributions:
+
+	Cross-compilation from Linux to Windows support by Fridrich Strba. on Windows. 
+	Added hooks for Seek plugin which is under development. (Johnny Jacob)
+	Show attachment bar at all times. Seems like the contents are missing at times. (Srinivasa Ragavan)
+	Fix compiler warnings. (Matthew Barnes)
+	function-declaration compiler warning. (Suman Manjunath)
+	Migrate the test programs off libgnomeui/libbonobo. (Matthew Barnes)
+
 Evolution 2.25.5 2009-01-19
 ---------------------------
 

Modified: branches/kill-bonobo/calendar/gui/alarm-notify/alarm-notify.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/alarm-notify/alarm-notify.c	(original)
+++ branches/kill-bonobo/calendar/gui/alarm-notify/alarm-notify.c	Sun Feb 15 03:27:31 2009
@@ -46,7 +46,7 @@
         GMutex *mutex;
 };
 
-#define d(x) x
+#define d(x)
 
 
 static void alarm_notify_class_init (AlarmNotifyClass *klass);

Modified: branches/kill-bonobo/calendar/gui/alarm-notify/alarm-notify.glade
==============================================================================
--- branches/kill-bonobo/calendar/gui/alarm-notify/alarm-notify.glade	(original)
+++ branches/kill-bonobo/calendar/gui/alarm-notify/alarm-notify.glade	Sun Feb 15 03:27:31 2009
@@ -79,7 +79,8 @@
 		      <child>
 			<widget class="GtkLabel" id="label19">
 			  <property name="visible">True</property>
-			  <property name="label">Dismiss _All</property>
+			  <property name="label" 
+translatable="yes">Dismiss _All</property>
 			  <property name="use_underline">True</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>

Modified: branches/kill-bonobo/calendar/gui/alarm-notify/alarm-queue.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/alarm-notify/alarm-queue.c	(original)
+++ branches/kill-bonobo/calendar/gui/alarm-notify/alarm-queue.c	Sun Feb 15 03:27:31 2009
@@ -57,7 +57,7 @@
 
 
 
-#define d(x) x
+#define d(x)
 
 /* The dialog with alarm nofications */
 static AlarmNotificationsDialog *alarm_notifications_dialog = NULL;
@@ -477,7 +477,7 @@
 		ECalComponentAlarmInstance *instance;
 		gpointer alarm_id;
 		QueuedAlarm *qa;
-		time_t tnow = time(NULL);
+		d(time_t tnow = time(NULL));
 
 		instance = l->data;
 

Modified: branches/kill-bonobo/calendar/gui/calendar-config.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/calendar-config.c	(original)
+++ branches/kill-bonobo/calendar/gui/calendar-config.c	Sun Feb 15 03:27:31 2009
@@ -244,7 +244,8 @@
 			icalproperty *tz_prop, *offset_to;
 			icaltimezone *st_zone = NULL;
 			int offset;
-			char *n_tzid, *tzid;
+			const char *tzid;
+			char *n_tzid;
 
 			tzid = icaltimezone_get_tzid (zone);
 			n_tzid = g_strconcat (tzid, "-(Standard)", NULL);
@@ -296,7 +297,7 @@
 /* Sets the timezone. If set to NULL it defaults to UTC.
    FIXME: Should check it is being set to a valid timezone. */
 void
-calendar_config_set_timezone (gchar *timezone)
+calendar_config_set_timezone (const gchar *timezone)
 {
 	calendar_config_init ();
 

Modified: branches/kill-bonobo/calendar/gui/calendar-config.h
==============================================================================
--- branches/kill-bonobo/calendar/gui/calendar-config.h	(original)
+++ branches/kill-bonobo/calendar/gui/calendar-config.h	Sun Feb 15 03:27:31 2009
@@ -76,7 +76,7 @@
 /* The current timezone, e.g. "Europe/London". */
 gchar*	  calendar_config_get_timezone		(void);
 icaltimezone *calendar_config_get_icaltimezone (void);
-void	  calendar_config_set_timezone		(gchar	     *timezone);
+void	  calendar_config_set_timezone		(const gchar	     *timezone);
 guint calendar_config_add_notification_timezone (GConfClientNotifyFunc func, gpointer data);
 
 /* The working days of the week, a bit-wise combination of flags. */

Modified: branches/kill-bonobo/calendar/gui/dialogs/alarm-dialog.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/alarm-dialog.c	(original)
+++ branches/kill-bonobo/calendar/gui/dialogs/alarm-dialog.c	Sun Feb 15 03:27:31 2009
@@ -863,7 +863,7 @@
 	dialog->malarm_addresses =
 		GTK_WIDGET (e_name_selector_peek_section_entry (dialog->name_selector, section_name));
 	gtk_widget_show (dialog->malarm_addresses);
-	gtk_box_pack_end_defaults (GTK_BOX (dialog->malarm_address_group), dialog->malarm_addresses);
+	gtk_box_pack_end (GTK_BOX (dialog->malarm_address_group), dialog->malarm_addresses, TRUE, TRUE, 0);
 
 	g_signal_connect (G_OBJECT (dialog->malarm_addressbook), "clicked",
 			  G_CALLBACK (addressbook_clicked_cb), dialog);

Modified: branches/kill-bonobo/calendar/gui/dialogs/event-page.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/event-page.c	(original)
+++ branches/kill-bonobo/calendar/gui/dialogs/event-page.c	Sun Feb 15 03:27:31 2009
@@ -1490,14 +1490,14 @@
 	zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
 	if (zone) {
 		if (!g_hash_table_lookup (timezones, icaltimezone_get_tzid (zone)))
-			g_hash_table_insert (timezones, icaltimezone_get_tzid (zone), zone);
+			g_hash_table_insert (timezones, (gpointer) icaltimezone_get_tzid (zone), zone);
 	}
 
 	/* add end date timezone */
 	zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->end_timezone));
 	if (zone) {
 		if (!g_hash_table_lookup (timezones, icaltimezone_get_tzid (zone)))
-			g_hash_table_insert (timezones, icaltimezone_get_tzid (zone), zone);
+			g_hash_table_insert (timezones, (gpointer) icaltimezone_get_tzid (zone), zone);
 	}
 
 	return TRUE;

Modified: branches/kill-bonobo/calendar/gui/dialogs/task-details-page.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/task-details-page.c	(original)
+++ branches/kill-bonobo/calendar/gui/dialogs/task-details-page.c	Sun Feb 15 03:27:31 2009
@@ -430,7 +430,7 @@
 	zone = icaltimezone_get_utc_timezone ();
 	if (zone) {
 		if (!g_hash_table_lookup (timezones, icaltimezone_get_tzid (zone)))
-			g_hash_table_insert (timezones, icaltimezone_get_tzid (zone), zone);
+			g_hash_table_insert (timezones, (gpointer) icaltimezone_get_tzid (zone), zone);
 	}
 
 	return TRUE;

Modified: branches/kill-bonobo/calendar/gui/dialogs/task-page.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/dialogs/task-page.c	(original)
+++ branches/kill-bonobo/calendar/gui/dialogs/task-page.c	Sun Feb 15 03:27:31 2009
@@ -1348,7 +1348,7 @@
 	zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->timezone));
 	if (zone) {
 		if (!g_hash_table_lookup (timezones, icaltimezone_get_tzid (zone)))
-			g_hash_table_insert (timezones, icaltimezone_get_tzid (zone), zone);
+			g_hash_table_insert (timezones, (gpointer) icaltimezone_get_tzid (zone), zone);
 	}
 
 	return TRUE;

Modified: branches/kill-bonobo/calendar/gui/e-day-view.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-day-view.c	(original)
+++ branches/kill-bonobo/calendar/gui/e-day-view.c	Sun Feb 15 03:27:31 2009
@@ -1238,7 +1238,7 @@
 static GdkColor
 e_day_view_get_text_color (EDayView *day_view, EDayViewEvent *event, GtkWidget *widget)
 {
-	GdkColor color, bg_color;
+	GdkColor bg_color;
 	guint16 red, green, blue;
 	gdouble	cc = 65535.0;
 
@@ -1258,11 +1258,9 @@
        	}
 
 	if ((red/cc > 0.7) || (green/cc > 0.7) || (blue/cc > 0.7 ))
-		color = widget->style->text[GTK_STATE_NORMAL];
+		return widget->style->black;
 	else
-		color = widget->style->text[GTK_STATE_ACTIVE];
-
-	return color;
+		return widget->style->white;
 }
 
 static void

Modified: branches/kill-bonobo/calendar/gui/e-itip-control.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-itip-control.c	(original)
+++ branches/kill-bonobo/calendar/gui/e-itip-control.c	Sun Feb 15 03:27:31 2009
@@ -661,7 +661,7 @@
 	struct tm tmp_tm;
 	char time_buf[64];
 	icaltimezone *zone = NULL;
-	char *display_name;
+	const char *display_name;
 
 	priv = itip->priv;
 

Modified: branches/kill-bonobo/calendar/gui/e-week-view.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/e-week-view.c	(original)
+++ branches/kill-bonobo/calendar/gui/e-week-view.c	Sun Feb 15 03:27:31 2009
@@ -817,7 +817,7 @@
 static GdkColor
 e_week_view_get_text_color (EWeekView *week_view, EWeekViewEvent *event, GtkWidget *widget)
 {
-	GdkColor color, bg_color;
+	GdkColor bg_color;
 	guint16 red, green, blue;
 	gdouble	cc = 65535.0;
 
@@ -837,11 +837,9 @@
        	}
 
 	if ((red/cc > 0.7) || (green/cc > 0.7) || (blue/cc > 0.7 ))
-		color = widget->style->text[GTK_STATE_NORMAL];
+		return widget->style->black;
 	else
-		color = widget->style->text[GTK_STATE_ACTIVE];
-
-	return color;
+		return widget->style->white;
 }
 
 static void

Modified: branches/kill-bonobo/calendar/gui/gnome-cal.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/gnome-cal.c	(original)
+++ branches/kill-bonobo/calendar/gui/gnome-cal.c	Sun Feb 15 03:27:31 2009
@@ -84,7 +84,7 @@
 #define G_MAXINT32	((gint32)  0x7fffffff)
 #endif
 
-#define d(x) x
+#define d(x)
 
 /* hash table define for non intrusive error dialog */
 static GHashTable *non_intrusive_error_table = NULL;

Modified: branches/kill-bonobo/calendar/gui/memos-component.c
==============================================================================
--- branches/kill-bonobo/calendar/gui/memos-component.c	(original)
+++ branches/kill-bonobo/calendar/gui/memos-component.c	Sun Feb 15 03:27:31 2009
@@ -91,7 +91,6 @@
 	GList *notifications;
 };
 
-/* #define d(x) x */
 #define d(x)
 
 /* Utility functions.  */

Modified: branches/kill-bonobo/composer/e-msg-composer.c
==============================================================================
--- branches/kill-bonobo/composer/e-msg-composer.c	(original)
+++ branches/kill-bonobo/composer/e-msg-composer.c	Sun Feb 15 03:27:31 2009
@@ -1186,12 +1186,17 @@
 			text = e_read_signature_file (
 				signature, TRUE, NULL);
 	} else {
+		EAccount *account;
 		EAccountIdentity *id;
 		gchar *organization;
 		gchar *address;
 		gchar *name;
 
-		id = e_composer_header_table_get_account (table)->id;
+		account = e_composer_header_table_get_account (table);
+		if (!account)
+			return NULL;
+
+		id = account->id;
 		address = id->address ? camel_text_to_html (id->address, CONVERT_SPACES, 0) : NULL;
 		name = id->name ? camel_text_to_html (id->name, CONVERT_SPACES, 0) : NULL;
 		organization = id->organization ? camel_text_to_html (id->organization, CONVERT_SPACES, 0) : NULL;

Modified: branches/kill-bonobo/configure.in
==============================================================================
--- branches/kill-bonobo/configure.in	(original)
+++ branches/kill-bonobo/configure.in	Sun Feb 15 03:27:31 2009
@@ -3,7 +3,7 @@
 
 m4_define([evo_major_version], [2])
 m4_define([evo_minor_version], [25])
-m4_define([evo_micro_version], [90])
+m4_define([evo_micro_version], [91])
 m4_define([evo_version],
           [evo_major_version.evo_minor_version.evo_micro_version])
 m4_define([evo_stable_version],

Modified: branches/kill-bonobo/doc/reference/shell/Makefile.am
==============================================================================
--- branches/kill-bonobo/doc/reference/shell/Makefile.am	(original)
+++ branches/kill-bonobo/doc/reference/shell/Makefile.am	Sun Feb 15 03:27:31 2009
@@ -97,7 +97,6 @@
 	$(top_builddir)/e-util/.libs/e-popup.o				\
 	$(top_builddir)/e-util/.libs/e-print.o				\
 	$(top_builddir)/e-util/.libs/e-util.o				\
-	$(top_builddir)/e-util/.libs/e-util-labels.o			\
 	$(top_builddir)/e-util/.libs/e-xml-utils.o			\
 	$(top_builddir)/e-util/.libs/gconf-bridge.o			\
 	$(top_builddir)/filter/.libs/filter-code.o			\

Modified: branches/kill-bonobo/help/Makefile.am
==============================================================================
--- branches/kill-bonobo/help/Makefile.am	(original)
+++ branches/kill-bonobo/help/Makefile.am	Sun Feb 15 03:27:31 2009
@@ -8,20 +8,14 @@
 DOC_INCLUDES =
 DOC_FIGURES =  \
 	figures/account_editor_a.png 		\
-	figures/addrs_book_a.png		\
 	figures/attach_reminder_a.png		\
-	figures/calendar.png 			\
 	figures/categories_a.png 		\
 	figures/collap_head_a.png 		\
 	figures/config-cal.png 			\
 	figures/config-mail.png 		\
-	figures/contact-editor.png 		\
-	figures/contact.png 			\
 	figures/contacts_mainwindow_a.png 	\
 	figures/delgt-add.png 			\
 	figures/evo_account_editor_a.png 	\
-	figures/evo_account_info_a.png 		\
-	figures/evo_add_rule_a.png 		\
 	figures/evo_adv_search_a.png 		\
 	figures/evo_allday_a.png 		\
 	figures/evo_attachreminder_plugin.png	\
@@ -44,7 +38,6 @@
 	figures/evo_dialog-warning.png		\
 	figures/evo_edit_rule_a.png 		\
 	figures/evo_edit_search.png 		\
-	figures/evo_email_a.png 		\
 	figures/evo_flag_follow_up_a.png 	\
 	figures/evo_gwreceive_a.png 		\
 	figures/evo_gwreceiveedit_a.png 	\
@@ -71,7 +64,6 @@
 	figures/evo_newmail.png			\
 	figures/evo_popreceive_a.png 		\
 	figures/evo_proxyadd_a.png 		\
-	figures/evo_receive_setup2_a.png 	\
 	figures/evo_receive_setup_a.png 	\
 	figures/evo_rmdrnotes_a.png 		\
 	figures/evo_rule_a.png 			\
@@ -85,10 +77,6 @@
 	figures/evo_usereceive_a.png 		\
 	figures/evo_junk_a.png			\
 	figures/evo_offline.png			\
-	figures/exchange-delegation.png 	\
-	figures/exchange-identity.png 		\
-	figures/exchange-receive-options.png 	\
-	figures/exchange-receive.png 		\
 	figures/exchg-identity.png 		\
 	figures/exchng-identity.png 		\
 	figures/exchng-rec-mail.png 		\
@@ -98,36 +86,19 @@
 	figures/exchng-settings.png 		\
 	figures/filter-new-fig.png 		\
 	figures/free_busy.png 			\
-	figures/full-1.png 			\
-	figures/full-2.png 			\
-	figures/full-3.png 			\
-	figures/full-4.png 			\
-	figures/full-5.png 			\
-	figures/full-6.png 			\
-	figures/full-7.png 			\
 	figures/google_cal_view.png		\
-	figures/mail-druid-pic.png 		\
 	figures/mailer_preferences.png 		\
-	figures/mail-inbox.png 			\
-	figures/mail_mainwindow_a.png 		\
 	figures/mail-threaded.png 		\
-	figures/mainwindow-pic.png 		\
 	figures/minus.png 			\
-	figures/newmsg.png 			\
 	figures/plus.png 			\
 	figures/proxy-cal.png 			\
 	figures/proxy-login.png 		\
 	figures/quick_add_a.png 		\
 	figures/quick_reference.png		\
-	figures/replymsg.png 			\
-	figures/schedule.png 			\
-	figures/Screenshot-Evolution-mailer-Preferences.png 	\
-	figures/Screenshot-Free-Busy.png 	\
 	figures/stock_search.png 		\
 	figures/sub-others-folder.png 		\
 	figures/sub-pub-fold.png 		\
-	figures/ver_view_a.png 			\
-	figures/vfolder-createrule-fig.png 	
+	figures/ver_view_a.png
 
 DOC_LINGUAS = cs de el en_GB es fr oc ru sv mk
 

Modified: branches/kill-bonobo/help/no/Makefile.am
==============================================================================
--- branches/kill-bonobo/help/no/Makefile.am	(original)
+++ branches/kill-bonobo/help/no/Makefile.am	Sun Feb 15 03:27:31 2009
@@ -2,26 +2,11 @@
 	figures/calendar.png			\
 	figures/config-cal.png			\
 	figures/config-mail.png			\
-	figures/contact-editor.png		\
-	figures/contact.png			\
 	figures/filter-assist-fig.png		\
 	figures/filter-new-fig.png		\
-	figures/full-1.png			\
-	figures/full-2.png			\
-	figures/full-3.png			\
-	figures/full-4.png			\
-	figures/full-5.png			\
-	figures/full-6.png			\
-	figures/full-7.png			\
 	figures/mail-composer.png		\
-	figures/mail-druid-pic.png		\
-	figures/mail-inbox.png			\
-	figures/mainwindow-pic.png		\
-	figures/newmsg.png			\
 	figures/print-dest.png			\
-	figures/print-preview.png		\
-	figures/replymsg.png			\
-	figures/vfolder-createrule-fig.png
+	figures/print-preview.png
 docname = evolution
 lang = no
 omffile = evolution-no.omf
@@ -48,4 +33,4 @@
 include $(top_srcdir)/help/sgmldocs.make
 dist-hook: app-dist-hook
 
-EXTRA_DIST = ChangeLog.pre-1-4
\ No newline at end of file
+EXTRA_DIST = ChangeLog.pre-1-4

Modified: branches/kill-bonobo/mail/em-event.c
==============================================================================
--- branches/kill-bonobo/mail/em-event.c	(original)
+++ branches/kill-bonobo/mail/em-event.c	Sun Feb 15 03:27:31 2009
@@ -147,6 +147,16 @@
 	return t;
 }
 
+EMEventTargetFolderBrowser *
+em_event_target_new_folder_browser (EMEvent *eme, EMFolderBrowser *emfb)
+{
+	EMEventTargetFolderBrowser *t = e_event_target_new(&eme->popup, EM_EVENT_TARGET_FOLDER_BROWSER, sizeof(*t));
+
+	t->emfb = emfb;
+
+	return t;
+}
+
 EMEventTargetComposer *
 em_event_target_new_composer (EMEvent *eme, const EMsgComposer *composer, guint32 flags)
 {
@@ -210,6 +220,10 @@
 	{ NULL }
 };
 
+static const EEventHookTargetMask emeh_folder_browser_masks[] = {
+	{ "folderbrowser", EM_EVENT_FOLDER_BROWSER },
+	{ NULL }
+};
 
 static const EEventHookTargetMask emeh_composer_masks[] = {
 	{ "sendoption", EM_EVENT_COMPOSER_SEND_OPTION },
@@ -230,8 +244,10 @@
 	{ "customicon", EM_EVENT_CUSTOM_ICON },
 	{ NULL }
 };
+
 static const EEventHookTargetMap emeh_targets[] = {
 	{ "folder", EM_EVENT_TARGET_FOLDER, emeh_folder_masks },
+	{ "folderbrowser", EM_EVENT_TARGET_FOLDER_BROWSER, emeh_folder_browser_masks },
 	{ "message", EM_EVENT_TARGET_MESSAGE, emeh_message_masks },
 	{ "composer", EM_EVENT_TARGET_COMPOSER, emeh_composer_masks},
 	{ "sendreceive", EM_EVENT_TARGET_SEND_RECEIVE, emeh_send_receive_masks},

Modified: branches/kill-bonobo/mail/em-event.h
==============================================================================
--- branches/kill-bonobo/mail/em-event.h	(original)
+++ branches/kill-bonobo/mail/em-event.h	Sun Feb 15 03:27:31 2009
@@ -27,6 +27,7 @@
 #include <glib-object.h>
 
 #include "e-util/e-event.h"
+#include "mail/em-folder-browser.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -44,12 +45,18 @@
 /* Current target description */
 enum _em_event_target_t {
 	EM_EVENT_TARGET_FOLDER,
+	EM_EVENT_TARGET_FOLDER_BROWSER,
 	EM_EVENT_TARGET_MESSAGE,
 	EM_EVENT_TARGET_COMPOSER,
 	EM_EVENT_TARGET_SEND_RECEIVE,
 	EM_EVENT_TARGET_CUSTOM_ICON,
 };
 
+/* Flags for FOLDER BROWSER Events*/
+enum {
+	EM_EVENT_FOLDER_BROWSER = 1<< 0,
+};
+
 /* Flags that describe TARGET_FOLDER */
 enum {
 	EM_EVENT_FOLDER_NEWMAIL = 1<< 0,
@@ -102,6 +109,15 @@
 	struct _EMsgComposer *composer;
 };
 
+typedef struct _EMEventTargetFolderBrowser EMEventTargetFolderBrowser;
+
+struct _EMEventTargetFolderBrowser {
+	EEventTarget target;
+
+	struct _EMFolderBrowser *emfb;
+};
+
+
 typedef struct _EMEventTargetSendReceive EMEventTargetSendReceive;
 
 struct _EMEventTargetSendReceive {
@@ -139,6 +155,7 @@
 EMEvent *em_event_peek(void);
 
 EMEventTargetFolder *em_event_target_new_folder(EMEvent *emp, const char *uri, guint32 flags);
+EMEventTargetFolderBrowser *em_event_target_new_folder_browser (EMEvent *eme, EMFolderBrowser *emfb);
 EMEventTargetComposer *em_event_target_new_composer(EMEvent *emp, const struct _EMsgComposer *composer, guint32 flags);
 EMEventTargetMessage *em_event_target_new_message(EMEvent *emp, struct _CamelFolder *folder, struct _CamelMimeMessage *message, const char *uid, guint32 flags);
 EMEventTargetSendReceive * em_event_target_new_send_receive(EMEvent *eme, struct _GtkWidget *table, gpointer data, int row, guint32 flags);

Modified: branches/kill-bonobo/mail/em-folder-browser.c
==============================================================================
--- branches/kill-bonobo/mail/em-folder-browser.c	(original)
+++ branches/kill-bonobo/mail/em-folder-browser.c	Sun Feb 15 03:27:31 2009
@@ -88,6 +88,7 @@
 #include "em-folder-utils.h"
 #include "em-subscribe-editor.h"
 #include "em-menu.h"
+#include "em-event.h"
 #include "message-list.h"
 
 #include "mail-component.h"
@@ -249,6 +250,9 @@
 	RuleContext *search_context = mail_component_peek_search_context (mail_component_peek ());
 	struct _EMFolderBrowserPrivate *p;
 
+	EMEvent *eme;
+	EMEventTargetFolderBrowser *target;
+
 	p = emfb->priv = g_malloc0(sizeof(struct _EMFolderBrowserPrivate));
 
 	emfb->view.preview_active = TRUE;
@@ -329,6 +333,17 @@
 //	gtk_paned_pack2 (GTK_PANED (emfb->vpane), p->preview, TRUE, FALSE);
 //	gtk_widget_show(p->preview);
 
+	/** @HookPoint-EMFolderBrower: Folder Browser
+	 * @Id: emfb.created
+	 * @Class: org.gnome.evolution.mail.events:1.0
+	 * @Target: EMFolderBrowser
+	 */
+
+	eme = em_event_peek();
+	target = em_event_target_new_folder_browser (eme, emfb);
+
+	e_event_emit((EEvent *)eme, "emfb.created", (EEventTarget *)target);
+
 	g_signal_connect (((EMFolderView *) emfb)->list->tree, "key_press", G_CALLBACK(emfb_list_key_press), emfb);
 	g_signal_connect (((EMFolderView *) emfb)->list, "message_selected", G_CALLBACK (emfb_list_message_selected), emfb);
 

Modified: branches/kill-bonobo/mail/em-format-html-display.c
==============================================================================
--- branches/kill-bonobo/mail/em-format-html-display.c	(original)
+++ branches/kill-bonobo/mail/em-format-html-display.c	Sun Feb 15 03:27:31 2009
@@ -1227,14 +1227,17 @@
 		pobj = (struct _smime_pobject *)em_format_html_add_pobject((EMFormatHTML *)emf, sizeof(*pobj), classid, part, efhd_xpkcs7mime_button);
 		pobj->valid = camel_cipher_validity_clone(valid);
 		pobj->object.free = efhd_xpkcs7mime_free;
-		camel_stream_printf(stream, "<td valign=top><object classid=\"%s\"></object></td><td width=100%% valign=top>", classid);
+		camel_stream_printf(stream, "<td valign=center><object classid=\"%s\"></object></td><td width=100%% valign=center>", classid);
 		g_free(classid);
 		if (valid->sign.status != CAMEL_CIPHER_VALIDITY_SIGN_NONE) {
-			camel_stream_printf(stream, "%s<br>", _(smime_sign_table[valid->sign.status].shortdesc));
+			camel_stream_printf (stream, "%s", _(smime_sign_table[valid->sign.status].shortdesc));
 		}
 
 		if (valid->encrypt.status != CAMEL_CIPHER_VALIDITY_ENCRYPT_NONE) {
-			camel_stream_printf(stream, "%s<br>", _(smime_encrypt_table[valid->encrypt.status].shortdesc));
+			if (valid->sign.status != CAMEL_CIPHER_VALIDITY_SIGN_NONE) {
+				camel_stream_printf (stream, "<br>");
+			}
+			camel_stream_printf (stream, "%s", _(smime_encrypt_table[valid->encrypt.status].shortdesc));
 		}
 
 		camel_stream_printf(stream, "</td></tr></table>");

Modified: branches/kill-bonobo/mail/em-format-html-print.c
==============================================================================
--- branches/kill-bonobo/mail/em-format-html-print.c	(original)
+++ branches/kill-bonobo/mail/em-format-html-print.c	Sun Feb 15 03:27:31 2009
@@ -71,6 +71,7 @@
 	gtk_container_add (GTK_CONTAINER (efhp->window), html);
 	gtk_widget_realize (html);
 	efhp->parent.show_icon = FALSE;
+	((EMFormat *)efhp)->print = TRUE;
 }
 
 GType

Modified: branches/kill-bonobo/mail/em-format-html.c
==============================================================================
--- branches/kill-bonobo/mail/em-format-html.c	(original)
+++ branches/kill-bonobo/mail/em-format-html.c	Sun Feb 15 03:27:31 2009
@@ -493,9 +493,11 @@
 
 		instream = camel_http_stream_new(CAMEL_HTTP_METHOD_GET, ((EMFormat *)job->format)->session, url);
 		camel_http_stream_set_user_agent((CamelHttpStream *)instream, "CamelHttpStream/1.0 Evolution/" VERSION);
-		proxy = em_utils_get_proxy_uri();
-		camel_http_stream_set_proxy((CamelHttpStream *)instream, proxy);
-		g_free(proxy);
+		proxy = em_utils_get_proxy_uri (job->u.uri);
+		if (proxy) {
+			camel_http_stream_set_proxy ((CamelHttpStream *)instream, proxy);
+			g_free (proxy);
+		}
 		camel_operation_start(NULL, _("Retrieving `%s'"), job->u.uri);
 		tmp_stream = (CamelHttpStream *)instream;
 		content_type = camel_http_stream_get_content_type(tmp_stream);
@@ -516,6 +518,10 @@
 		costream = camel_data_cache_add(emfh_http_cache, EMFH_HTTP_CACHE_PATH, job->u.uri, NULL);
 
 	do {
+		if (camel_operation_cancel_check (NULL)) {
+			n = -1;
+			break;
+		}
 		/* FIXME: progress reporting in percentage, can we get the length always?  do we care? */
 		n = camel_stream_read(instream, buffer, sizeof (buffer));
 		if (n > 0) {
@@ -526,17 +532,12 @@
 				camel_operation_progress(NULL, pc_complete);
 			}
 			d(printf("  read %d bytes\n", n));
-			if (costream && camel_stream_write(costream, buffer, n) == -1) {
-				camel_data_cache_remove(emfh_http_cache, EMFH_HTTP_CACHE_PATH, job->u.uri, NULL);
-				camel_object_unref(costream);
-				costream = NULL;
+			if (costream && camel_stream_write (costream, buffer, n) == -1) {
+				n = -1;
+				break;
 			}
 
 			camel_stream_write(job->stream, buffer, n);
-		} else if (n < 0 && costream) {
-			camel_data_cache_remove(emfh_http_cache, EMFH_HTTP_CACHE_PATH, job->u.uri, NULL);
-			camel_object_unref(costream);
-			costream = NULL;
 		}
 	} while (n>0);
 
@@ -544,8 +545,12 @@
 	if (n == 0)
 		camel_stream_close(job->stream);
 
-	if (costream)
+	if (costream) {
+		/* do not store broken files in a cache */
+		if (n != 0)
+			camel_data_cache_remove(emfh_http_cache, EMFH_HTTP_CACHE_PATH, job->u.uri, NULL);
 		camel_object_unref(costream);
+	}
 
 	camel_object_unref(instream);
 done:
@@ -1263,7 +1268,7 @@
 		if (handle)
 			handle->handler((EMFormat *)m->format, (CamelStream *)m->estream, (CamelMimePart *)m->message, handle);
 		handle = em_format_find_handler((EMFormat *)m->format, "x-evolution/message/post-header-closure");
-		if (handle)
+		if (handle && !((EMFormat *)m->format)->print)
 			handle->handler((EMFormat *)m->format, (CamelStream *)m->estream, (CamelMimePart *)m->message, handle);
 
 	}

Modified: branches/kill-bonobo/mail/em-format.c
==============================================================================
--- branches/kill-bonobo/mail/em-format.c	(original)
+++ branches/kill-bonobo/mail/em-format.c	Sun Feb 15 03:27:31 2009
@@ -121,6 +121,7 @@
 		(GDestroyNotify) NULL,
 		(GDestroyNotify) emf_free_cache);
 	emf->composer = FALSE;
+	emf->print = FALSE;
 	emf->show_photo = TRUE;
 	emf->photo_local = TRUE;
 	e_dlist_init(&emf->header_list);
@@ -1135,11 +1136,12 @@
 {
 	GString *stext;
 	const char *filename, *description;
-	char *out, *desc;
+	char *content_type, *desc;
 
 	stext = g_string_new("");
-	/* TODO: mime_type isn't content_type on some systems (Win32), thus this will not work there. */
-	desc = g_content_type_get_description (mime_type);
+	content_type = g_content_type_from_mime_type (mime_type);
+	desc = g_content_type_get_description (content_type ? content_type : mime_type);
+	g_free (content_type);
 	g_string_append_printf (stext, _("%s attachment"), desc ? desc : mime_type);
 	g_free (desc);
 	if ((filename = camel_mime_part_get_filename (part)))
@@ -1149,10 +1151,7 @@
 		!(filename && (strcmp(filename, description) == 0)))
 		g_string_append_printf(stext, ", \"%s\"", description);
 
-	out = stext->str;
-	g_string_free(stext, FALSE);
-
-	return out;
+	return g_string_free (stext, FALSE);
 }
 
 /* ********************************************************************** */

Modified: branches/kill-bonobo/mail/em-format.h
==============================================================================
--- branches/kill-bonobo/mail/em-format.h	(original)
+++ branches/kill-bonobo/mail/em-format.h	Sun Feb 15 03:27:31 2009
@@ -228,6 +228,7 @@
 	char *charset;		/* charset override */
 	char *default_charset;	/* charset fallback */
 	gboolean composer; /* Formatting from composer ?*/
+	gboolean print;
 	gboolean show_photo; /* Want to show the photo of the sender ?*/
 	gboolean photo_local; /* Photos only from local addressbooks */
 };

Modified: branches/kill-bonobo/mail/em-network-prefs.c
==============================================================================
--- branches/kill-bonobo/mail/em-network-prefs.c	(original)
+++ branches/kill-bonobo/mail/em-network-prefs.c	Sun Feb 15 03:27:31 2009
@@ -61,21 +61,6 @@
 #define GCONF_E_USE_PROXY_KEY GCONF_E_SHELL_NETWORK_CONFIG_PATH "use_http_proxy"
 #define GCONF_E_AUTOCONFIG_URL_KEY GCONF_E_SHELL_NETWORK_CONFIG_PATH "autoconfig_url"
 
-#define GCONF_SYS_PROXY_PATH "/system/proxy/"
-#define GCONF_SYS_HTTP_PROXY_PATH "/system/http_proxy"
-#define GCONF_SYS_HTTP_HOST_KEY GCONF_SYS_HTTP_PROXY_PATH "host"
-#define GCONF_SYS_HTTP_PORT_KEY GCONF_SYS_HTTP_PROXY_PATH "port"
-#define GCONF_SYS_HTTPS_HOST_KEY GCONF_SYS_PROXY_PATH "secure_host"
-#define GCONF_SYS_HTTPS_PORT_KEY GCONF_SYS_PROXY_PATH "secure_port"
-#define GCONF_SYS_SOCKS_HOST_KEY GCONF_SYS_PROXY_PATH "socks_host"
-#define GCONF_SYS_SOCKS_PORT_KEY GCONF_SYS_PROXY_PATH "socks_port"
-#define GCONF_SYS_AUTOCONFIG_URL_KEY GCONF_SYS_PROXY_PATH "autoconfig_url"
-#define GCONF_SYS_IGNORE_HOSTS_KEY GCONF_SYS_HTTP_PROXY_PATH "ignore_hosts"
-#define GCONF_SYS_USE_PROXY_KEY GCONF_SYS_HTTP_PROXY_PATH "use_http_proxy"
-#define GCONF_SYS_USE_AUTH_KEY GCONF_SYS_HTTP_PROXY_PATH "use_authentication"
-#define GCONF_SYS_AUTH_USER_KEY GCONF_SYS_HTTP_PROXY_PATH "authentication_user"
-#define GCONF_SYS_AUTH_PWD_KEY GCONF_SYS_HTTP_PROXY_PATH "authentication_password"
-
 static void em_network_prefs_class_init (EMNetworkPrefsClass *class);
 static void em_network_prefs_init       (EMNetworkPrefs *dialog);
 static void em_network_prefs_destroy    (GtkObject *obj);
@@ -184,28 +169,32 @@
 static void
 emnp_set_sensitiveness (EMNetworkPrefs *prefs, NetworkConfigProxyType type, gboolean sensitivity)
 {
+#if 0
 	if (type == NETWORK_PROXY_AUTOCONFIG) {
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->auto_proxy_url, sensitivity);
 		d(g_print ("Setting sensitivity of autoconfig to: %d\n", sensitivity));
-	} else if (type == NETWORK_PROXY_MANUAL) {
+	} else
+#endif	
+	if (type == NETWORK_PROXY_MANUAL) {
 		gboolean state; 
 
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->http_host, sensitivity);
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->https_host, sensitivity);
-		gtk_widget_set_sensitive ((GtkWidget *) prefs->socks_host, sensitivity);
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->ignore_hosts, sensitivity);
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->use_auth, sensitivity);
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->http_port, sensitivity);
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->https_port, sensitivity);
-		gtk_widget_set_sensitive ((GtkWidget *) prefs->socks_port, sensitivity);
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->lbl_ignore_hosts, sensitivity);
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->lbl_http_host, sensitivity);
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->lbl_http_port, sensitivity);
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->lbl_https_host, sensitivity);
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->lbl_https_port, sensitivity);
+#if 0
+		gtk_widget_set_sensitive ((GtkWidget *) prefs->socks_host, sensitivity);
+		gtk_widget_set_sensitive ((GtkWidget *) prefs->socks_port, sensitivity);
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->lbl_socks_host, sensitivity);
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->lbl_socks_port, sensitivity);
-
+#endif
 		state = sensitivity && gtk_toggle_button_get_active (prefs->use_auth);
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->lbl_auth_user, state);
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->lbl_auth_pwd, state);
@@ -217,89 +206,6 @@
 }
 
 static void
-emnp_parse_ignore_hosts (gpointer data, gpointer user_data)
-{
-	GString *str = (GString *)user_data;
-
-	if (!str)
-		return;
-
-	/* FIXME: Remove trailing , */
-	if (data) {
-		str = g_string_append (str, data);
-		str = g_string_append_c (str, ',');
-	}
-}
-
-static void 
-emnp_load_sys_settings (GConfClient *gconf)
-{
-	char *buf;
-	int port;
-	GSList *ignore_hosts;
-	gboolean toggle;
-	GString *str = NULL;
-
-	if (!gconf)
-		return;
-	
-	toggle = gconf_client_get_bool (gconf, GCONF_SYS_USE_PROXY_KEY, NULL);
-	if (!toggle) {
-		gconf_client_set_bool (gconf, GCONF_E_USE_PROXY_KEY, toggle, NULL);
-		return;
-	}
-
-	toggle = gconf_client_get_bool (gconf, GCONF_SYS_USE_AUTH_KEY, NULL);
-	gconf_client_set_bool (gconf, GCONF_E_USE_AUTH_KEY, toggle, NULL);
-
-	buf = gconf_client_get_string (gconf, GCONF_SYS_HTTP_HOST_KEY, NULL);
-	gconf_client_set_string (gconf, GCONF_E_HTTP_HOST_KEY, buf, NULL);
-	g_free (buf);
-
-	buf = gconf_client_get_string (gconf, GCONF_SYS_HTTPS_HOST_KEY, NULL);
-	gconf_client_set_string (gconf, GCONF_E_HTTPS_HOST_KEY, buf, NULL);
-	g_free (buf);
-
-	buf = gconf_client_get_string (gconf, GCONF_SYS_SOCKS_HOST_KEY, NULL);
-	gconf_client_set_string (gconf, GCONF_E_SOCKS_HOST_KEY, buf, NULL);
-	g_free (buf);
-
-	buf = gconf_client_get_string (gconf, GCONF_SYS_AUTOCONFIG_URL_KEY, NULL);
-	gconf_client_set_string (gconf, GCONF_E_AUTOCONFIG_URL_KEY, buf, NULL);
-	g_free (buf);
-
-	buf = gconf_client_get_string (gconf, GCONF_SYS_AUTH_USER_KEY, NULL);
-	gconf_client_set_string (gconf, GCONF_E_AUTH_USER_KEY, buf, NULL);
-	g_free (buf);
-
-	buf = gconf_client_get_string (gconf, GCONF_SYS_AUTH_PWD_KEY, NULL);
-	gconf_client_set_string (gconf, GCONF_E_AUTH_PWD_KEY, buf, NULL);
-	g_free (buf);
-
-	port = gconf_client_get_int (gconf, GCONF_SYS_HTTP_PORT_KEY, NULL);
-	gconf_client_set_int (gconf, GCONF_E_HTTP_PORT_KEY, port, NULL);
-
-	port = gconf_client_get_int (gconf, GCONF_SYS_HTTPS_PORT_KEY, NULL);
-	gconf_client_set_int (gconf, GCONF_E_HTTPS_PORT_KEY, port, NULL);
-
-	port = gconf_client_get_int (gconf, GCONF_SYS_SOCKS_PORT_KEY, NULL);
-	gconf_client_set_int (gconf, GCONF_E_SOCKS_PORT_KEY, port, NULL);
-
-	ignore_hosts = gconf_client_get_list (gconf, GCONF_SYS_IGNORE_HOSTS_KEY, 
-						GCONF_VALUE_STRING, NULL);
-	if (ignore_hosts) {
-		str = g_string_sized_new (32);
-		g_slist_foreach (ignore_hosts, (GFunc) emnp_parse_ignore_hosts, str);
-		g_slist_foreach (ignore_hosts, (GFunc) g_free, NULL);	
-		g_slist_free (ignore_hosts);
-
-		gconf_client_set_string (gconf, GCONF_E_IGNORE_HOSTS_KEY, 
-					 str->str, NULL);
-		g_string_free (str, TRUE);
-	}
-}
-
-static void
 notify_proxy_type_changed (GtkWidget *widget, EMNetworkPrefs *prefs)
 {
 	int type;
@@ -311,7 +217,11 @@
 	else if (gtk_toggle_button_get_active (prefs->manual_proxy))
 		type = NETWORK_PROXY_MANUAL;
 	else
+#if 0
 		type = NETWORK_PROXY_AUTOCONFIG;
+#else
+		type = NETWORK_PROXY_SYS_SETTINGS;
+#endif
 
 	gconf_client_set_int (prefs->gconf, "/apps/evolution/shell/network_config/proxy_type", type, NULL);
 
@@ -319,11 +229,6 @@
 	    type == NETWORK_PROXY_SYS_SETTINGS) {
 		emnp_set_sensitiveness (prefs, NETWORK_PROXY_MANUAL, FALSE);
 		emnp_set_sensitiveness (prefs, NETWORK_PROXY_AUTOCONFIG, FALSE);
-		if (type == NETWORK_PROXY_SYS_SETTINGS) {
-			d(g_print ("%s:%s: Loading sys settings... \n", G_STRLOC, G_STRFUNC));
-			emnp_load_sys_settings (prefs->gconf);
-		}
-
 	} else if (type == NETWORK_PROXY_AUTOCONFIG) {
 		emnp_set_sensitiveness (prefs, NETWORK_PROXY_MANUAL, FALSE);
 		emnp_set_sensitiveness (prefs, NETWORK_PROXY_AUTOCONFIG, TRUE);
@@ -383,7 +288,9 @@
 	gtk_label_set_use_markup (GTK_LABEL (GTK_BIN(prefs->sys_proxy)->child), TRUE);
 	gtk_label_set_use_markup (GTK_LABEL (GTK_BIN(prefs->no_proxy)->child), TRUE);
 	gtk_label_set_use_markup (GTK_LABEL (GTK_BIN(prefs->manual_proxy)->child), TRUE);
+#if 0
 	gtk_label_set_use_markup (GTK_LABEL (GTK_BIN(prefs->auto_proxy)->child), TRUE);
+#endif
 }
 
 static void
@@ -428,9 +335,13 @@
 	locked = !gconf_client_key_is_writable (prefs->gconf, GCONF_E_PROXY_TYPE_KEY, NULL);
 
 	val = gconf_client_get_int (prefs->gconf, GCONF_E_PROXY_TYPE_KEY, NULL);
+
+	/* no auto-proxy at the moment */
+	if (val == NETWORK_PROXY_AUTOCONFIG)
+		val = NETWORK_PROXY_SYS_SETTINGS;
+
 	prefs->sys_proxy = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "rdoSysSettings"));
 	gtk_toggle_button_set_active (prefs->sys_proxy, val == NETWORK_PROXY_SYS_SETTINGS);
-	g_signal_connect (prefs->sys_proxy, "toggled", G_CALLBACK (notify_proxy_type_changed), prefs);
 	if (locked)
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->sys_proxy, FALSE);
 
@@ -438,38 +349,35 @@
 
 	prefs->no_proxy = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "rdoNoProxy"));
 	gtk_toggle_button_set_active (prefs->no_proxy, val == NETWORK_PROXY_DIRECT_CONNECTION);
-	g_signal_connect (prefs->no_proxy, "toggled", G_CALLBACK (notify_proxy_type_changed), prefs);
 	if (locked)
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->no_proxy, FALSE);
 
 	d(g_print ("No proxy settings ----!!! \n"));
 
+	/* no auto-proxy at the moment */
+#if 0
 	prefs->auto_proxy = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "rdoAutoConfig"));
 	prefs->auto_proxy_url = GTK_ENTRY (glade_xml_get_widget (gui, "txtAutoConfigUrl"));
+
 	gtk_toggle_button_set_active (prefs->auto_proxy, val == NETWORK_PROXY_AUTOCONFIG);
 
-	g_signal_connect (prefs->auto_proxy, "toggled", G_CALLBACK (notify_proxy_type_changed), prefs);
 	g_signal_connect(prefs->auto_proxy_url, "changed", G_CALLBACK(widget_entry_changed_cb), GCONF_E_AUTOCONFIG_URL_KEY);
-
 	if (locked)
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->auto_proxy, FALSE);
+#endif
 
 	d(g_print ("Auto config settings ----!!! \n"));
 
 	prefs->manual_proxy = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "rdoManualProxy"));
 	prefs->http_host = GTK_ENTRY (glade_xml_get_widget (gui, "txtHttpHost"));
 	prefs->https_host = GTK_ENTRY (glade_xml_get_widget (gui, "txtHttpsHost"));
-	prefs->socks_host = GTK_ENTRY (glade_xml_get_widget (gui, "txtSocksHost"));
 	prefs->ignore_hosts = GTK_ENTRY (glade_xml_get_widget (gui, "txtIgnoreHosts"));
 	prefs->http_port = GTK_SPIN_BUTTON (glade_xml_get_widget (gui, "spnHttpPort"));
 	prefs->https_port = GTK_SPIN_BUTTON (glade_xml_get_widget (gui, "spnHttpsPort"));
-	prefs->socks_port = GTK_SPIN_BUTTON (glade_xml_get_widget (gui, "spnSocksPort"));
 	prefs->lbl_http_host = GTK_LABEL (glade_xml_get_widget (gui, "lblHttpHost"));
 	prefs->lbl_http_port = GTK_LABEL (glade_xml_get_widget (gui, "lblHttpPort"));
 	prefs->lbl_https_host = GTK_LABEL (glade_xml_get_widget (gui, "lblHttpsHost"));
 	prefs->lbl_https_port = GTK_LABEL (glade_xml_get_widget (gui, "lblHttpsPort"));
-	prefs->lbl_socks_host = GTK_LABEL (glade_xml_get_widget (gui, "lblSocksHost"));
-	prefs->lbl_socks_port = GTK_LABEL (glade_xml_get_widget (gui, "lblSocksPort"));
 	prefs->lbl_ignore_hosts = GTK_LABEL (glade_xml_get_widget (gui, "lblIgnoreHosts"));
 	prefs->use_auth = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkUseAuth"));
 	toggle_button_init (prefs, prefs->use_auth, GCONF_E_USE_AUTH_KEY);
@@ -477,28 +385,40 @@
 	prefs->lbl_auth_pwd = GTK_LABEL (glade_xml_get_widget (gui, "lblAuthPwd"));
 	prefs->auth_user = GTK_ENTRY (glade_xml_get_widget (gui, "txtAuthUser"));
 	prefs->auth_pwd = GTK_ENTRY (glade_xml_get_widget (gui, "txtAuthPwd"));
+
+#if 0
+	prefs->socks_host = GTK_ENTRY (glade_xml_get_widget (gui, "txtSocksHost"));
+	prefs->socks_port = GTK_SPIN_BUTTON (glade_xml_get_widget (gui, "spnSocksPort"));
+	prefs->lbl_socks_host = GTK_LABEL (glade_xml_get_widget (gui, "lblSocksHost"));
+	prefs->lbl_socks_port = GTK_LABEL (glade_xml_get_widget (gui, "lblSocksPort"));
+	g_signal_connect (prefs->socks_host, "changed", 
+			  G_CALLBACK(widget_entry_changed_cb), GCONF_E_SOCKS_HOST_KEY);
+	g_signal_connect (prefs->socks_port, "value_changed", 
+			  G_CALLBACK(widget_entry_changed_cb), GCONF_E_SOCKS_PORT_KEY);
+#endif
 	
 	/* Manual proxy options */
 	g_signal_connect (prefs->http_host, "changed", 
 			  G_CALLBACK(widget_entry_changed_cb), GCONF_E_HTTP_HOST_KEY);
 	g_signal_connect (prefs->https_host, "changed", 
 			  G_CALLBACK(widget_entry_changed_cb), GCONF_E_HTTPS_HOST_KEY);
-	g_signal_connect (prefs->socks_host, "changed", 
-			  G_CALLBACK(widget_entry_changed_cb), GCONF_E_SOCKS_HOST_KEY);
 	g_signal_connect (prefs->ignore_hosts, "changed", 
 			  G_CALLBACK(widget_entry_changed_cb), GCONF_E_IGNORE_HOSTS_KEY);
 	g_signal_connect (prefs->http_port, "value_changed", 
 			  G_CALLBACK(widget_entry_changed_cb), GCONF_E_HTTP_PORT_KEY);
 	g_signal_connect (prefs->https_port, "value_changed", 
 			  G_CALLBACK(widget_entry_changed_cb), GCONF_E_HTTPS_PORT_KEY);
-	g_signal_connect (prefs->socks_port, "value_changed", 
-			  G_CALLBACK(widget_entry_changed_cb), GCONF_E_SOCKS_PORT_KEY);
 	g_signal_connect (prefs->auth_user, "changed", 
 			  G_CALLBACK(widget_entry_changed_cb), GCONF_E_AUTH_USER_KEY);
 	g_signal_connect (prefs->auth_pwd, "changed", 
 			  G_CALLBACK(widget_entry_changed_cb), GCONF_E_AUTH_PWD_KEY);
 
 	gtk_toggle_button_set_active (prefs->manual_proxy, val == NETWORK_PROXY_MANUAL);
+	g_signal_connect (prefs->sys_proxy, "toggled", G_CALLBACK (notify_proxy_type_changed), prefs);
+	g_signal_connect (prefs->no_proxy, "toggled", G_CALLBACK (notify_proxy_type_changed), prefs);
+#if 0
+	g_signal_connect (prefs->auto_proxy, "toggled", G_CALLBACK (notify_proxy_type_changed), prefs);
+#endif
 	g_signal_connect (prefs->manual_proxy, "toggled", G_CALLBACK (notify_proxy_type_changed), prefs);
 
 	if (locked)
@@ -513,10 +433,6 @@
 	gtk_entry_set_text (prefs->https_host, buf ? buf : "");
 	g_free (buf);
 
-	buf = gconf_client_get_string (prefs->gconf, GCONF_E_SOCKS_HOST_KEY, NULL);
-	gtk_entry_set_text (prefs->socks_host, buf ? buf : "");
-	g_free (buf);
-
 	buf = gconf_client_get_string (prefs->gconf, GCONF_E_IGNORE_HOSTS_KEY, NULL);
 	gtk_entry_set_text (prefs->ignore_hosts, buf ? buf : "");
 	g_free (buf);
@@ -535,17 +451,20 @@
 	port = gconf_client_get_int (prefs->gconf, GCONF_E_HTTPS_PORT_KEY, NULL);
 	gtk_spin_button_set_value (prefs->https_port, (gdouble)port);
 
+#if 0
+	buf = gconf_client_get_string (prefs->gconf, GCONF_E_SOCKS_HOST_KEY, NULL);
+	gtk_entry_set_text (prefs->socks_host, buf ? buf : "");
+	g_free (buf);
+
 	port = gconf_client_get_int (prefs->gconf, GCONF_E_SOCKS_PORT_KEY, NULL);
 	gtk_spin_button_set_value (prefs->socks_port, (gdouble)port);
-
+#endif
 	emnp_set_markups (prefs);
 
 	if (val == NETWORK_PROXY_DIRECT_CONNECTION ||
 	    val == NETWORK_PROXY_SYS_SETTINGS) {
 		emnp_set_sensitiveness (prefs, NETWORK_PROXY_MANUAL, FALSE);
 		emnp_set_sensitiveness (prefs, NETWORK_PROXY_AUTOCONFIG, FALSE);
-		if (val == NETWORK_PROXY_SYS_SETTINGS)
-			emnp_load_sys_settings (prefs->gconf);
 	} else if (val == NETWORK_PROXY_AUTOCONFIG) {
 		emnp_set_sensitiveness (prefs, NETWORK_PROXY_MANUAL, FALSE);
 		emnp_set_sensitiveness (prefs, NETWORK_PROXY_AUTOCONFIG, TRUE);

Modified: branches/kill-bonobo/mail/em-network-prefs.h
==============================================================================
--- branches/kill-bonobo/mail/em-network-prefs.h	(original)
+++ branches/kill-bonobo/mail/em-network-prefs.h	Sun Feb 15 03:27:31 2009
@@ -69,14 +69,12 @@
 	GtkToggleButton *sys_proxy;
 	GtkToggleButton *no_proxy;
 	GtkToggleButton *manual_proxy;
-	GtkToggleButton *auto_proxy;
 	GtkToggleButton *use_auth;
 
 	GtkEntry *http_host;
 	GtkEntry *https_host;
 	GtkEntry *socks_host;
 	GtkEntry *ignore_hosts;
-	GtkEntry *auto_proxy_url;
 	GtkEntry *auth_user;
 	GtkEntry *auth_pwd;
 
@@ -85,14 +83,13 @@
 	GtkLabel *lbl_https_host;
 	GtkLabel *lbl_https_port;
 	GtkLabel *lbl_socks_host;
-	GtkLabel *lbl_socks_port;	
+	GtkLabel *lbl_socks_port;
 	GtkLabel *lbl_ignore_hosts;
 	GtkLabel *lbl_auth_user;
 	GtkLabel *lbl_auth_pwd;
 
 	GtkSpinButton *http_port;
 	GtkSpinButton *https_port;
-	GtkSpinButton *socks_port;	
 };
 
 struct _EMNetworkPrefsClass {

Modified: branches/kill-bonobo/mail/em-utils.c
==============================================================================
--- branches/kill-bonobo/mail/em-utils.c	(original)
+++ branches/kill-bonobo/mail/em-utils.c	Sun Feb 15 03:27:31 2009
@@ -64,6 +64,7 @@
 
 #include <libedataserver/e-data-server-util.h>
 #include <libedataserver/e-flag.h>
+#include <libedataserver/e-proxy.h>
 #include "e-util/e-util.h"
 #include "e-util/e-util-private.h"
 #include "e-util/e-mktemp.h"
@@ -1580,62 +1581,17 @@
 }
 
 /* ********************************************************************** */
-static char *emu_proxy_uri;
-static int emu_proxy_init = 0;
-static pthread_mutex_t emu_proxy_lock = PTHREAD_MUTEX_INITIALIZER;
-
-static void
-emu_set_proxy(GConfClient *client, int needlock)
-{
-	char *server, *uri = NULL;
-	int port;
-
-	if (gconf_client_get_bool(client, "/system/http_proxy/use_http_proxy", NULL)) {
-		server = gconf_client_get_string(client, "/system/http_proxy/host", NULL);
-		port = gconf_client_get_int(client, "/system/http_proxy/port", NULL);
-
-		if (server && server[0]) {
-			if (gconf_client_get_bool(client, "/system/http_proxy/use_authentication", NULL)) {
-				char *user = gconf_client_get_string(client, "/system/http_proxy/authentication_user", NULL);
-				char *pass = gconf_client_get_string(client, "/system/http_proxy/authentication_password", NULL);
-
-				uri = g_strdup_printf("http://%s:%s %s:%d", user, pass, server, port);
-				g_free(user);
-				g_free(pass);
-			} else {
-				uri = g_strdup_printf("http://%s:%d";, server, port);
-			}
-		}
-
-		g_free(server);
-	}
-
-	if (needlock)
-		pthread_mutex_lock(&emu_proxy_lock);
-
-	g_free(emu_proxy_uri);
-	emu_proxy_uri = uri;
-
-	if (needlock)
-		pthread_mutex_unlock(&emu_proxy_lock);
-
-}
-
-static void
-emu_proxy_changed(GConfClient *client, guint32 cnxn_id, GConfEntry *entry, gpointer user_data)
-{
-	emu_set_proxy(client, TRUE);
-}
+static EProxy *emu_proxy = NULL;
+static GStaticMutex emu_proxy_lock = G_STATIC_MUTEX_INIT;
 
 static void *
-emu_proxy_setup(void *data)
+emu_proxy_setup (void *data)
 {
-	GConfClient *client = gconf_client_get_default();
-
-	gconf_client_add_dir(client, "/system/http_proxy", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
-	gconf_client_notify_add(client, "/system/http_proxy", emu_proxy_changed, NULL, NULL, NULL);
-	emu_set_proxy(client, FALSE);
-	g_object_unref(client);
+	if (!emu_proxy) {
+		emu_proxy = e_proxy_new ();
+		e_proxy_setup_proxy (emu_proxy);
+		/* not necessary to listen for changes here */
+	}
 
 	return NULL;
 }
@@ -1643,25 +1599,25 @@
 /**
  * em_utils_get_proxy_uri:
  *
- * Get the system proxy uri.
+ * Get the system proxy uri for 'pUri'.
  *
  * Return value: Must be freed when finished with.
  **/
 char *
-em_utils_get_proxy_uri(void)
+em_utils_get_proxy_uri (const char *pUri)
 {
-	char *uri;
+	char *uri = NULL;
 
-	pthread_mutex_lock(&emu_proxy_lock);
+	g_static_mutex_lock (&emu_proxy_lock);
 
-	if (!emu_proxy_init) {
-		mail_call_main(MAIL_CALL_p_p, (MailMainFunc)emu_proxy_setup, NULL);
-		emu_proxy_init = TRUE;
+	if (!emu_proxy) {
+		mail_call_main (MAIL_CALL_p_p, (MailMainFunc)emu_proxy_setup, NULL);
 	}
 
-	uri = g_strdup(emu_proxy_uri);
+	if (e_proxy_require_proxy_for_uri (emu_proxy, pUri))
+		uri = soup_uri_to_string (e_proxy_peek_uri_for (emu_proxy, pUri), FALSE);
 
-	pthread_mutex_unlock(&emu_proxy_lock);
+	g_static_mutex_unlock (&emu_proxy_lock);
 
 	return uri;
 }

Modified: branches/kill-bonobo/mail/em-utils.h
==============================================================================
--- branches/kill-bonobo/mail/em-utils.h	(original)
+++ branches/kill-bonobo/mail/em-utils.h	Sun Feb 15 03:27:31 2009
@@ -80,7 +80,7 @@
 
 void em_utils_adjustment_page(GtkAdjustment *adj, gboolean down);
 
-char *em_utils_get_proxy_uri(void);
+char *em_utils_get_proxy_uri (const char *uri);
 
 /* FIXME: should this have an override charset? */
 char *em_utils_part_to_html(CamelMimePart *part, ssize_t *len, struct _EMFormat *source);

Modified: branches/kill-bonobo/mail/importers/elm-importer.c
==============================================================================
--- branches/kill-bonobo/mail/importers/elm-importer.c	(original)
+++ branches/kill-bonobo/mail/importers/elm-importer.c	Sun Feb 15 03:27:31 2009
@@ -46,7 +46,7 @@
 #include "e-util/e-import.h"
 #include "e-util/e-error.h"
 
-#define d(x) x
+#define d(x)
 
 struct _elm_import_msg {
 	MailMsg base;

Modified: branches/kill-bonobo/mail/importers/pine-importer.c
==============================================================================
--- branches/kill-bonobo/mail/importers/pine-importer.c	(original)
+++ branches/kill-bonobo/mail/importers/pine-importer.c	Sun Feb 15 03:27:31 2009
@@ -49,7 +49,7 @@
 #include "e-util/e-import.h"
 #include "e-util/e-error.h"
 
-#define d(x) x
+#define d(x)
 
 struct _pine_import_msg {
 	MailMsg base;

Modified: branches/kill-bonobo/plugins/audio-inline/audio-inline.c
==============================================================================
--- branches/kill-bonobo/plugins/audio-inline/audio-inline.c	(original)
+++ branches/kill-bonobo/plugins/audio-inline/audio-inline.c	Sun Feb 15 03:27:31 2009
@@ -263,7 +263,7 @@
 	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;
 }

Modified: branches/kill-bonobo/plugins/backup-restore/backup.c
==============================================================================
--- branches/kill-bonobo/plugins/backup-restore/backup.c	(original)
+++ branches/kill-bonobo/plugins/backup-restore/backup.c	Sun Feb 15 03:27:31 2009
@@ -76,7 +76,7 @@
 	{ NULL }
 };
 
-#define d(x) x
+#define d(x)
 
 #define rc(x) G_STMT_START { g_message (x); system (x); } G_STMT_END
 

Modified: branches/kill-bonobo/plugins/bbdb/Makefile.am
==============================================================================
--- branches/kill-bonobo/plugins/bbdb/Makefile.am	(original)
+++ branches/kill-bonobo/plugins/bbdb/Makefile.am	Sun Feb 15 03:27:31 2009
@@ -1,6 +1,7 @@
 INCLUDES =						\
 	-I$(top_builddir)/composer			\
 	-I$(top_srcdir)					\
+	-I$(top_srcdir)/widgets				\
 	$(EVOLUTION_MAIL_CFLAGS)			\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 

Modified: branches/kill-bonobo/plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in
==============================================================================
--- branches/kill-bonobo/plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in	(original)
+++ branches/kill-bonobo/plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in	Sun Feb 15 03:27:31 2009
@@ -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>

Modified: branches/kill-bonobo/plugins/email-custom-header/email-custom-header.c
==============================================================================
--- branches/kill-bonobo/plugins/email-custom-header/email-custom-header.c	(original)
+++ branches/kill-bonobo/plugins/email-custom-header/email-custom-header.c	Sun Feb 15 03:27:31 2009
@@ -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 @@
 	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 @@
 		// 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 @@
 
 		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 @@
 	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);

Modified: branches/kill-bonobo/plugins/face/face.c
==============================================================================
--- branches/kill-bonobo/plugins/face/face.c	(original)
+++ branches/kill-bonobo/plugins/face/face.c	Sun Feb 15 03:27:31 2009
@@ -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);

Modified: branches/kill-bonobo/plugins/itip-formatter/itip-view.c
==============================================================================
--- branches/kill-bonobo/plugins/itip-formatter/itip-view.c	(original)
+++ branches/kill-bonobo/plugins/itip-formatter/itip-view.c	Sun Feb 15 03:27:31 2009
@@ -737,6 +737,7 @@
 		}
 
 		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 @@
 	/* 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 @@
 
 	/* 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 @@
 	/* 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 @@
 	/* 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 @@
 	/* 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 @@
 	/* 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 @@
 	/* 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 @@
 
 	/* 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 @@
 	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 @@
 		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);
 	}

Modified: branches/kill-bonobo/plugins/mail-notification/Makefile.am
==============================================================================
--- branches/kill-bonobo/plugins/mail-notification/Makefile.am	(original)
+++ branches/kill-bonobo/plugins/mail-notification/Makefile.am	Sun Feb 15 03:27:31 2009
@@ -7,6 +7,7 @@
 
 INCLUDES =					\
 	-I$(top_srcdir)				\
+	-I$(top_srcdir)/widgets			\
 	$(EVOLUTION_MAIL_CFLAGS)		\
 	$(LIBNOTIFY_CFLAGS)			
 

Modified: branches/kill-bonobo/plugins/mono/mono-plugin.c
==============================================================================
--- branches/kill-bonobo/plugins/mono/mono-plugin.c	(original)
+++ branches/kill-bonobo/plugins/mono/mono-plugin.c	Sun Feb 15 03:27:31 2009
@@ -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)

Modified: branches/kill-bonobo/shell/Makefile.am
==============================================================================
--- branches/kill-bonobo/shell/Makefile.am	(original)
+++ branches/kill-bonobo/shell/Makefile.am	Sun Feb 15 03:27:31 2009
@@ -119,6 +119,10 @@
 	$(TZDIALOG_LIBS)						\
 	$(SHELL_LIBS)
 
+if OS_WIN32
+evolution_LDFLAGS = -mwindows
+endif
+
 # Misc stuff
 
 error_DATA = shell.error

Modified: branches/kill-bonobo/widgets/misc/e-filter-bar.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-filter-bar.c	(original)
+++ branches/kill-bonobo/widgets/misc/e-filter-bar.c	Sun Feb 15 03:27:31 2009
@@ -73,7 +73,6 @@
 
 			filter_bar->current_query = rule;
 			g_object_ref (rule);
-			g_signal_emit_by_name (filter_bar, "search_activated");
 
 			gtk_widget_modify_base (search_bar->entry, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED]));
 			gtk_widget_modify_text (search_bar->entry, GTK_STATE_NORMAL, &(style->text[GTK_STATE_SELECTED]));
@@ -82,6 +81,8 @@
 			e_search_bar_set_text (search_bar,_("Advanced Search"));
 			gtk_widget_set_sensitive (search_bar->clear_button, TRUE);
 
+			g_signal_emit_by_name (efb, "search_activated");
+
 			if (response == GTK_RESPONSE_APPLY) {
 				if (!rule_context_find_rule (filter_bar->context, rule->name, rule->source))
 					rule_context_add_rule (filter_bar->context, rule);

Modified: branches/kill-bonobo/widgets/misc/e-unicode.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-unicode.c	(original)
+++ branches/kill-bonobo/widgets/misc/e-unicode.c	Sun Feb 15 03:27:31 2009
@@ -46,7 +46,7 @@
 #include <glib/gi18n.h>
 #include "e-unicode.h"
 
-#define d(x) x
+#define d(x)
 
 #define FONT_TESTING
 #define MAX_DECOMP 8
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]