[evolution/camel-gobject: 37/66] Merge branch 'master' into camel-gobject.
- From: Matthew Barnes <mbarnes src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evolution/camel-gobject: 37/66] Merge branch 'master' into camel-gobject.
- Date: Sat, 28 Nov 2009 19:58:58 +0000 (UTC)
commit cf853a0107c18d817637e6c61de5e6da83a9381e
Merge: 1193d1f... b14acf5...
Author: Matthew Barnes <mbarnes redhat com>
Date: Tue Nov 24 15:42:58 2009 -0500
Merge branch 'master' into camel-gobject.
addressbook/gui/widgets/eab-contact-display.c | 410 +-
art/Makefile.am | 2 -
art/broken-image-16.xpm | 61 -
art/broken-image-24.xpm | 169 -
calendar/gui/alarm-notify/notify-main.c | 3 -
calendar/gui/dialogs/comp-editor.c | 15 +-
calendar/gui/dialogs/event-page.c | 1 -
calendar/gui/e-cal-component-preview.c | 109 +-
calendar/gui/e-cal-model.c | 27 +
calendar/gui/e-cal-model.h | 7 +
calendar/gui/e-calendar-table.c | 6 +-
calendar/gui/e-calendar-view.h | 209 +-
calendar/gui/e-itip-control.c | 258 +-
calendar/gui/e-memo-table.c | 6 +-
calendar/gui/gnome-cal.c | 48 +-
calendar/gui/print.c | 2 -
composer/e-composer-autosave.c | 13 +-
configure.ac | 36 +-
doc/reference/shell/tmpl/e-icon-factory.sgml | 14 -
doc/reference/shell/tmpl/e-shell-content.sgml | 5 +
doc/reference/shell/tmpl/e-util.sgml | 13 -
doc/reference/shell/tmpl/eshell-unused.sgml | 24 +
e-util/e-icon-factory.c | 234 +-
e-util/e-icon-factory.h | 2 -
e-util/e-util.c | 81 -
e-util/e-util.h | 5 -
filter/e-rule-editor.c | 5 +-
filter/filter.ui | 6 +-
mail/e-mail-reader-utils.c | 19 +-
mail/e-mail-reader.c | 26 +-
mail/em-utils.c | 23 +
mail/em-utils.h | 1 +
mail/em-vfolder-rule.c | 4 +-
mail/mail-config.ui | 2 +-
mail/mail-dialogs.ui | 2 +-
modules/addressbook/e-book-shell-view-actions.c | 40 +-
modules/addressbook/e-book-shell-view-actions.h | 2 +
modules/addressbook/e-book-shell-view-private.h | 1 +
modules/addressbook/e-book-shell-view.c | 69 +-
modules/calendar/e-cal-shell-content.c | 4 +-
modules/calendar/e-cal-shell-view-actions.c | 40 +-
modules/calendar/e-cal-shell-view-actions.h | 2 +
modules/calendar/e-cal-shell-view-private.c | 7 +-
modules/calendar/e-cal-shell-view-private.h | 1 +
modules/calendar/e-cal-shell-view.c | 67 +-
modules/calendar/e-memo-shell-view-actions.c | 40 +-
modules/calendar/e-memo-shell-view-actions.h | 2 +
modules/calendar/e-memo-shell-view-private.h | 1 +
modules/calendar/e-memo-shell-view.c | 69 +-
modules/calendar/e-task-shell-view-actions.c | 40 +-
modules/calendar/e-task-shell-view-actions.h | 2 +
modules/calendar/e-task-shell-view-private.c | 13 +-
modules/calendar/e-task-shell-view-private.h | 1 +
modules/calendar/e-task-shell-view.c | 69 +-
modules/mail/e-mail-shell-view-actions.c | 68 +-
modules/mail/e-mail-shell-view-actions.h | 2 +
modules/mail/e-mail-shell-view-private.h | 1 +
modules/mail/e-mail-shell-view.c | 30 +-
plugins/attachment-reminder/attachment-reminder.c | 1 -
.../exchange-operations/e-foreign-folder-dialog.ui | 243 -
.../exchange-change-password.ui | 227 -
plugins/exchange-operations/exchange-delegates.ui | 601 --
.../exchange-operations/exchange-folder-tree.ui | 85 -
plugins/exchange-operations/exchange-oof.ui | 499 --
.../exchange-operations/exchange-passwd-expiry.ui | 89 -
.../exchange-permissions-dialog.ui | 543 --
.../exchange-operations/exchange-send-options.ui | 426 --
.../org-gnome-groupwise-features.eplug.xml | 2 +-
plugins/imap-features/imap-headers.ui | 6 +-
plugins/mail-to-task/mail-to-task.c | 41 +-
po/POTFILES.in | 82 +-
po/es.po | 6133 ++++++++-------
po/sl.po | 8030 +++++++++-----------
shell/Makefile.am | 1 +
shell/e-shell-content.c | 170 +-
shell/e-shell-content.h | 7 +
shell/e-shell-window-actions.c | 15 +
shell/main.c | 7 +-
ui/evolution-calendars.ui | 1 +
ui/evolution-contacts.ui | 1 +
ui/evolution-mail.ui | 1 +
ui/evolution-memos.ui | 1 +
ui/evolution-tasks.ui | 1 +
widgets/misc/e-attachment-store.c | 243 +-
widgets/misc/e-attachment-store.h | 12 +-
widgets/misc/e-attachment.c | 35 +-
widgets/misc/e-hinted-entry.c | 1 +
widgets/misc/e-image-chooser.c | 47 +-
widgets/misc/e-paned.c | 18 +-
widgets/table/e-cell-text.c | 23 +-
widgets/table/e-table.c | 9 +
91 files changed, 8108 insertions(+), 11912 deletions(-)
---
diff --cc calendar/gui/e-cal-component-preview.c
index b4f0619,014ce2c..f5b3b68
--- a/calendar/gui/e-cal-component-preview.c
+++ b/calendar/gui/e-cal-component-preview.c
@@@ -27,10 -27,8 +27,9 @@@
#include <string.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
+#include <camel/camel.h>
#include <libecal/e-cal-time-util.h>
#include <libedataserver/e-categories.h>
- #include <gtkhtml/gtkhtml-stream.h>
#include <libedataserver/e-time-utils.h>
#include <e-util/e-util.h>
#include <e-util/e-categories-config.h>
diff --cc doc/reference/shell/tmpl/e-util.sgml
index 7f1a282,7f1a282..b94e7e8
--- a/doc/reference/shell/tmpl/e-util.sgml
+++ b/doc/reference/shell/tmpl/e-util.sgml
@@@ -317,19 -317,19 +317,6 @@@ Miscellaneous Utility Function
@Returns:
--<!-- ##### FUNCTION e_util_read_file ##### -->
--<para>
--
--</para>
--
-- filename:
-- filename_is_uri:
-- buffer:
-- read:
-- error:
-- Returns:
--
--
<!-- ##### FUNCTION e_util_get_category_filter_options ##### -->
<para>
diff --cc doc/reference/shell/tmpl/eshell-unused.sgml
index dd0c06f,0928b8d..f8c2fbc
--- a/doc/reference/shell/tmpl/eshell-unused.sgml
+++ b/doc/reference/shell/tmpl/eshell-unused.sgml
@@@ -2254,6 -2266,6 +2266,18 @@@ intelligen
@filename:
@Returns:
++<!-- ##### FUNCTION e_util_read_file ##### -->
++<para>
++
++</para>
++
++ filename:
++ filename_is_uri:
++ buffer:
++ read:
++ error:
++ Returns:
++
<!-- ##### FUNCTION e_util_uri_to_filename ##### -->
<para>
diff --cc plugins/attachment-reminder/attachment-reminder.c
index 2f7b046,ab13ca9..336c588
--- a/plugins/attachment-reminder/attachment-reminder.c
+++ b/plugins/attachment-reminder/attachment-reminder.c
@@@ -24,8 -24,6 +24,7 @@@
#include <glib/gi18n.h>
#include <string.h>
+#include <camel/camel.h>
- #include <glade/glade-xml.h>
#include <gconf/gconf-client.h>
#include <e-util/e-util.h>
diff --cc widgets/misc/e-attachment.c
index 6dbf94e,68e8bd5..a60bff2
--- a/widgets/misc/e-attachment.c
+++ b/widgets/misc/e-attachment.c
@@@ -1782,14 -1784,13 +1777,11 @@@ attachment_load_from_mime_part (LoadCon
attachment_set_file_info (attachment, file_info);
- /* Steal the result. */
- camel_object_ref (mime_part);
-
simple = load_context->simple;
- load_context->simple = NULL;
-
g_simple_async_result_set_op_res_gpointer (
- simple, mime_part,
- (GDestroyNotify) camel_object_unref);
+ simple, g_object_ref (mime_part),
+ (GDestroyNotify) g_object_unref);
- g_simple_async_result_complete_in_idle (simple);
+ g_simple_async_result_complete (simple);
attachment_load_context_free (load_context);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
