[evolution/kill-bonobo: 20/43] Merge branch 'master' into kill-bonobo

[Matthew Barnes <mbarnes src gnome org>]

commit 16d914886110d57eaf8946000c365de2007728b3
Merge: c3e0648... a30e073...
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue May 5 13:21:42 2009 -0400

    Merge branch 'master' into kill-bonobo
    
    Conflicts:
    	calendar/gui/dialogs/comp-editor.c

 NEWS                                               |   97 +
 calendar/gui/dialogs/comp-editor.c                 |   29 +-
 calendar/gui/dialogs/event-page.c                  |   81 +-
 configure.in                                       |    2 +-
 mail/evolution-mail.schemas.in                     |    2 +-
 plugins/backup-restore/Makefile.am                 |    3 -
 plugins/backup-restore/backup.c                    |  284 +-
 plugins/bbdb/bbdb.c                                |   86 +-
 plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml    |   11 +-
 plugins/exchange-operations/exchange-contacts.c    |   11 +-
 plugins/external-editor/Makefile.am                |    1 +
 .../org-gnome-external-editor.eplug.xml            |    4 +-
 plugins/mailing-list-actions/Makefile.am           |    1 +
 plugins/publish-calendar/publish-calendar.glade    |  102 +-
 plugins/publish-calendar/publish-format-fb.c       |   18 +-
 plugins/publish-calendar/publish-location.c        |   34 +-
 plugins/publish-calendar/publish-location.h        |    8 +
 plugins/publish-calendar/url-editor-dialog.c       |   21 +-
 plugins/publish-calendar/url-editor-dialog.h       |    5 +-
 plugins/templates/Makefile.am                      |    1 +
 po/or.po                                           | 6713 ++++++++------------
 widgets/misc/e-attachment-button.h                 |    4 +-
 widgets/misc/e-attachment-dialog.h                 |    2 +-
 widgets/misc/e-attachment-handler-image.h          |    2 +-
 widgets/misc/e-attachment-handler.h                |    2 +-
 widgets/misc/e-attachment-store.c                  |   19 +
 widgets/misc/e-attachment-store.h                  |    2 +-
 widgets/misc/e-attachment-view.h                   |    2 +-
 28 files changed, 3277 insertions(+), 4270 deletions(-)

diff --cc calendar/gui/dialogs/comp-editor.c
index cf8d776,4af998e..440cf35
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@@ -187,16 -180,16 +187,24 @@@ enum 
  	LAST_SIGNAL
  };
  
 -static guint comp_editor_signals[LAST_SIGNAL] = { 0 };
 +static guint signals[LAST_SIGNAL];
 +static GList *active_editors;
 +
 +static void
 +comp_editor_weak_notify_cb (gpointer unused,
 +                            GObject *where_the_object_was)
 +{
 +	active_editors = g_list_remove (active_editors, where_the_object_was);
 +}
  
+ static void
+ attachment_store_changed_cb (CompEditor *editor)
+ {
+ 	/* Mark the editor as changed so it prompts about unsaved
+            changes on close */
+ 	comp_editor_set_changed (editor, TRUE);
+ }
+ 
  static GSList *
  get_attachment_list (CompEditor *editor)
  {
@@@ -1710,9 -1656,17 +1719,21 @@@ comp_editor_init (CompEditor *editor
  	gtk_window_set_type_hint (
  		GTK_WINDOW (editor), GDK_WINDOW_TYPE_HINT_NORMAL);
  
+ 	/* Listen for attachment store changes. */
+ 
+ 	store = e_attachment_view_get_store (view);
+ 
+ 	g_signal_connect_swapped (
+ 		store, "row-deleted",
+ 		G_CALLBACK (attachment_store_changed_cb), editor);
+ 
+ 	g_signal_connect_swapped (
+ 		store, "row-inserted",
+ 		G_CALLBACK (attachment_store_changed_cb), editor);
++
 +	/* FIXME Shell should be passed in. */
 +	shell = e_shell_get_default ();
 +	e_shell_watch_window (shell, GTK_WINDOW (editor));
  }
  
  static gboolean
diff --cc calendar/gui/dialogs/event-page.c
index 7c54879,dfc33fb..c7b6050
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@@ -2646,12 -2666,15 +2660,12 @@@ set_subscriber_info_string (EventPage *
  }
  
  static void
 -alarm_changed_cb (GtkWidget *widget, gpointer data)
 +alarm_changed_cb (GtkWidget *widget,
 +                  EventPage *epage)
  {
 -	EventPage *epage;
 -	EventPagePrivate *priv;
 -
 -	epage = EVENT_PAGE (data);
 -	priv = epage->priv;
 +	EventPagePrivate *priv = epage->priv;
  
- 	if (e_dialog_combo_box_get (priv->alarm_time_combo, alarm_map) != ALARM_NONE) {
+ 	if (e_dialog_combo_box_get (priv->alarm_time_combo, priv->alarm_map) != ALARM_NONE) {
  		ECalComponentAlarm *ca;
  		ECalComponentAlarmTrigger trigger;
  		icalcomponent *icalcomp;