[evolution/camel-gobject: 65/66] Merge branch 'master' into camel-gobject.

[Matthew Barnes <mbarnes src gnome org>]

commit 37ff0fd0bf60b09d1f734e3d0fa2e34220b72eb0
Merge: cf853a0... 46e5f2d...
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Nov 27 17:47:26 2009 -0500

    Merge branch 'master' into camel-gobject.

 calendar/calendar.error.xml                        |   16 +
 calendar/conduits/calendar/calendar-conduit.c      |   62 +-
 calendar/conduits/todo/todo-conduit.c              |    3 +-
 calendar/gui/alarm-notify/alarm-queue.c            |   14 +-
 calendar/gui/dialogs/delete-comp.c                 |   17 +-
 calendar/gui/dialogs/save-comp.c                   |    7 +-
 calendar/gui/e-cal-component-preview.c             |  109 +
 calendar/gui/e-cal-component-preview.h             |    1 +
 calendar/gui/e-calendar-table.c                    |    4 +
 configure.ac                                       |   31 +-
 doc/reference/shell/tmpl/e-shell-window.sgml       |    6 +
 doc/reference/shell/tmpl/e-shell.sgml              |    6 +
 e-util/e-util.c                                    |   34 +-
 filter/e-rule-context.c                            |    4 +-
 mail/e-mail-reader.c                               |   25 +-
 mail/em-utils.c                                    |   34 +-
 mail/importers/Makefile.am                         |    1 +
 modules/addressbook/e-book-shell-view.c            |    8 +
 modules/calendar/e-cal-shell-content.c             |    8 +
 modules/calendar/e-cal-shell-view-actions.c        |   57 +-
 modules/calendar/e-cal-shell-view-actions.h        |    2 +
 modules/calendar/e-cal-shell-view.c                |    4 +
 modules/calendar/e-memo-shell-content.c            |    4 +-
 modules/calendar/e-memo-shell-view-actions.c       |    2 +-
 modules/calendar/e-memo-shell-view.c               |    2 +-
 modules/calendar/e-task-shell-content.c            |    4 +-
 modules/calendar/e-task-shell-view-actions.c       |    6 +-
 modules/calendar/e-task-shell-view-private.c       |   58 +-
 modules/calendar/e-task-shell-view-private.h       |    2 +
 modules/calendar/e-task-shell-view.c               |    2 +-
 modules/mail/e-mail-shell-view-private.c           |   54 +
 modules/mail/e-mail-shell-view-private.h           |    3 +
 plugins/contacts-map/Makefile.am                   |   31 +
 plugins/contacts-map/contacts-map.c                |  216 +
 plugins/contacts-map/geo-utils.c                   |  102 +
 plugins/contacts-map/geo-utils.h                   |   28 +
 .../contacts-map/org-gnome-contacts-map.eplug.xml  |   19 +
 plugins/itip-formatter/itip-formatter.c            |   11 +-
 plugins/itip-formatter/itip-view.c                 |  109 +-
 plugins/itip-formatter/itip-view.h                 |    8 +-
 plugins/tnef-attachments/tnef-plugin.c             |  154 +-
 po/POTFILES.in                                     |    2 +
 po/de.po                                           |  707 +-
 po/es.po                                           | 1043 +-
 po/et.po                                           |    6 +-
 po/fr.po                                           |11276 ++++++++------------
 shell/Makefile.am                                  |   18 +-
 shell/apps_evolution_shell.schemas.in              |    1 +
 shell/e-shell-window-private.c                     |   27 +-
 shell/e-shell-window-private.h                     |    2 +
 shell/e-shell-window.c                             |   39 +-
 shell/e-shell-window.h                             |    3 +-
 shell/e-shell.c                                    |  164 +-
 shell/e-shell.h                                    |   20 +-
 shell/killev.c                                     |  158 +
 shell/main.c                                       |   45 +-
 ui/evolution-calendars.ui                          |    1 +
 ui/evolution-mail.ui                               |    2 +
 58 files changed, 6790 insertions(+), 7992 deletions(-)
---
diff --cc plugins/tnef-attachments/tnef-plugin.c
index cc03dfd,86a1c75..5e85566
--- a/plugins/tnef-attachments/tnef-plugin.c
+++ b/plugins/tnef-attachments/tnef-plugin.c
@@@ -101,20 -101,20 +97,20 @@@ org_gnome_format_tnef(gpointer ep, EMFo
  		goto fail;
  	if (camel_data_wrapper_decode_to_stream(content, out) == -1
  	    || camel_stream_close(out) == -1) {
 -		camel_object_unref(out);
 +		g_object_unref(out);
  		goto fail;
  	}
 -	camel_object_unref(out);
 +	g_object_unref(out);
  
  	/* Extracting the winmail.dat */
-         TNEFInitialize(tnef);
- 	tnef->Debug = verbose;
-         if (TNEFParseFile(name, tnef) == -1) {
+         TNEFInitialize(&tnef);
+ 	tnef.Debug = verbose;
+         if (TNEFParseFile(name, &tnef) == -1) {
              printf("ERROR processing file\n");
          }
- 	processTnef(tnef);
+ 	processTnef(&tnef, tmpdir);
  
-         TNEFFree(tnef);
+         TNEFFree(&tnef);
  	/* Extraction done */
  
  	dir = opendir(tmpdir);
@@@ -177,7 -178,8 +174,8 @@@
  
  	g_string_truncate(t->format->part_id, len);
  
 -	camel_object_unref(mp);
 -	camel_object_unref(mainpart);
++	g_object_unref(mp);
 +	g_object_unref(mainpart);
  
  	goto ok;
   fail: