[evolution/kill-bonobo: 23/23] Merge branch 'master' into kill-bonobo
- From: Matthew Barnes <mbarnes src gnome org>
- To: svn-commits-list gnome org
- Subject: [evolution/kill-bonobo: 23/23] Merge branch 'master' into kill-bonobo
- Date: Tue, 28 Apr 2009 21:37:07 -0400 (EDT)
commit 9192f0dc883acfaff0fbe3f6a7f8e49672546a02
Merge: 0b04c6c... c868ace...
Author: Matthew Barnes <mbarnes redhat com>
Date: Tue Apr 28 21:38:15 2009 -0400
Merge branch 'master' into kill-bonobo
Conflicts:
a11y/widgets/Makefile.am
a11y/widgets/ea-widgets.c
a11y/widgets/ea-widgets.h
addressbook/gui/component/addressbook-component.c
calendar/gui/Makefile.am
calendar/gui/calendar-component.c
calendar/gui/dialogs/comp-editor.c
calendar/gui/dialogs/event-editor.c
calendar/gui/dialogs/memo-editor.c
calendar/gui/dialogs/task-editor.c
calendar/gui/memos-component.c
calendar/gui/tasks-component.c
composer/e-composer-private.c
composer/e-msg-composer.c
configure.in
e-util/e-plugin-ui.c
e-util/e-plugin-ui.h
mail/ChangeLog
mail/Makefile.am
mail/e-mail-attachment-bar.c
mail/em-format-html-display.c
mail/em-format-html-display.h
mail/em-format-html.h
mail/em-format.h
mail/em-popup.c
mail/mail-component.c
plugins/external-editor/external-editor.c
widgets/misc/Makefile.am
widgets/misc/e-attachment-paned.c
widgets/misc/e-attachment-view.c
widgets/misc/e-attachment.c
calendar/gui/dialogs/comp-editor.c | 3 +++
composer/e-msg-composer.c | 12 ++++++++++--
e-util/e-util.c | 30 ++++++++++++++++++++++++++++++
e-util/e-util.h | 5 +++++
filter/ChangeLog | 7 +++++++
filter/filter-option.c | 5 ++++-
mail/ChangeLog | 16 ++++++++++++++++
mail/em-filter-rule.c | 2 +-
mail/em-filter-source-element.c | 2 +-
mail/em-format-html.h | 5 +++++
mail/em-format.h | 4 +++-
mail/mail-session.c | 2 +-
12 files changed, 86 insertions(+), 7 deletions(-)
diff --cc calendar/gui/dialogs/comp-editor.c
index 466973d,68b240c..9d7e2f3
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@@ -2347,15 -2263,12 +2347,18 @@@ fill_widgets (CompEditor *editor
EAttachmentStore *store;
EAttachmentView *view;
CompEditorPrivate *priv;
- GList *l;
GtkAction *action;
+ GList *iter;
+
+ view = E_ATTACHMENT_VIEW (editor->priv->attachment_view);
+ store = e_attachment_view_get_store (view);
+
+ view = E_ATTACHMENT_VIEW (editor->priv->attachment_view);
+ store = e_attachment_view_get_store (view);
+ view = E_ATTACHMENT_VIEW (editor->priv->attachment_view);
+ store = e_attachment_view_get_store (view);
+
priv = editor->priv;
/*Check if attachments are available here and set them*/
diff --cc composer/e-msg-composer.c
index d1a6abb,3195255..c1379d2
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@@ -1109,12 -1239,13 +1109,13 @@@ get_signature_html (EMsgComposer *compo
"<!--+GtkHTML:<DATA class=\"ClueFlow\" key=\"signature_name\" value=\"uid:%s\">-->"
"<TABLE WIDTH=\"100%%\" CELLSPACING=\"0\" CELLPADDING=\"0\"><TR><TD><BR>"
"%s%s%s%s"
- "</TD></TR></TABLE>",
+ "%s</TD></TR></TABLE>",
encoded_uid ? encoded_uid : "",
format_html ? "" : "<PRE>\n",
- format_html || !add_delim || (!strncmp ("-- \n", text, 4) || strstr (text, "\n-- \n")) ? "" : "-- \n",
+ format_html || (!strncmp ("-- \n", text, 4) || strstr (text, "\n-- \n")) ? "" : "-- \n",
text,
- format_html ? "" : "</PRE>\n");
+ format_html ? "" : "</PRE>\n",
+ is_top_signature () ? "<BR>" : "");
g_free (text);
g_free (encoded_uid);
text = html;
diff --cc e-util/e-util.c
index 071f5e5,c012b26..04be119
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@@ -1502,32 -1478,53 +1502,62 @@@ e_util_read_file (const char *filename
return res;
}
-GSList *
-e_util_get_category_filter_options (void)
+static gpointer
+e_camel_object_copy (gpointer camel_object)
{
- GSList *res = NULL;
- GList *clist, *l;
+ if (CAMEL_IS_OBJECT (camel_object))
+ camel_object_ref (camel_object);
- clist = e_categories_get_list ();
- for (l = clist; l; l = l->next) {
- const char *cname = l->data;
- struct _filter_option *fo = g_new0 (struct _filter_option, 1);
+ return camel_object;
+}
- fo->title = g_strdup (cname);
- fo->value = g_strdup (cname);
- res = g_slist_prepend (res, fo);
- }
+static void
+e_camel_object_free (gpointer camel_object)
+{
+ if (CAMEL_IS_OBJECT (camel_object))
+ camel_object_unref (camel_object);
+}
- g_list_free (clist);
+GType
+e_camel_object_get_type (void)
+{
+ static GType type = 0;
+
+ if (G_UNLIKELY (type == 0))
+ type = g_boxed_type_register_static (
+ "ECamelObject",
+ (GBoxedCopyFunc) e_camel_object_copy,
+ (GBoxedFreeFunc) e_camel_object_free);
- return g_slist_reverse (res);
+ return type;
}
+
+ static gpointer
+ e_camel_object_copy (gpointer camel_object)
+ {
+ if (CAMEL_IS_OBJECT (camel_object))
+ camel_object_ref (camel_object);
+
+ return camel_object;
+ }
+
+ static void
+ e_camel_object_free (gpointer camel_object)
+ {
+ if (CAMEL_IS_OBJECT (camel_object))
+ camel_object_unref (camel_object);
+ }
+
+ GType
+ e_camel_object_get_type (void)
+ {
+ static GType type = 0;
+
+ if (G_UNLIKELY (type == 0))
+ type = g_boxed_type_register_static (
+ "ECamelObject",
+ (GBoxedCopyFunc) e_camel_object_copy,
+ (GBoxedFreeFunc) e_camel_object_free);
+
+ return type;
+ }
diff --cc e-util/e-util.h
index 34ef346,480da24..c748aae
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@@ -141,16 -139,13 +141,21 @@@ gboolean e_util_read_file (const gcha
gsize *read,
GError **error);
-GSList *e_util_get_category_filter_options (void);
+/* Camel uses its own object system, so we have to box
+ * CamelObjects to safely use them as GObject properties. */
+#define E_TYPE_CAMEL_OBJECT (e_camel_object_get_type ())
+GType e_camel_object_get_type (void);
+
+/* Camel uses its own object system, so we have to box
+ * CamelObjects to safely use them as GObject properties. */
+#define E_TYPE_CAMEL_OBJECT (e_camel_object_get_type ())
+GType e_camel_object_get_type (void);
+ /* Camel uses its own object system, so we have to box
+ * CamelObjects to safely use them as GObject properties. */
+ #define E_TYPE_CAMEL_OBJECT (e_camel_object_get_type ())
+ GType e_camel_object_get_type (void);
+
G_END_DECLS
#endif /* _E_UTIL_H_ */
diff --cc mail/em-format-html.h
index d355563,a34f7b6..23e0057
--- a/mail/em-format-html.h
+++ b/mail/em-format-html.h
@@@ -206,9 -196,10 +206,14 @@@ struct _EMFormatHTMLPObject
* multipart/related objects and inline images.
**/
struct _EMFormatHTML {
- EMFormat format;
+ EMFormat parent;
+ EMFormatHTMLPrivate *priv;
++<<<<<<< HEAD:mail/em-format-html.h
++=======
+ EMFormatHTMLPrivate *priv;
+
++>>>>>>> master:mail/em-format-html.h
GtkHTML *html;
EDList pending_object_list;
diff --cc mail/em-format.h
index fc29eea,004d9c2..f262d49
--- a/mail/em-format.h
+++ b/mail/em-format.h
@@@ -302,100 -300,54 +302,102 @@@ void em_format_add_header (EMFormat *
/* FIXME: Need a 'clone' api to copy details about the current view (inlines etc)
Or maybe it should live with sub-classes? */
-int em_format_is_attachment(EMFormat *emf, CamelMimePart *part);
+int em_format_is_attachment (EMFormat *emf,
+ CamelMimePart *part);
-int em_format_is_inline(EMFormat *emf, const char *partid, CamelMimePart *part, const EMFormatHandler *handle);
-void em_format_set_inline(EMFormat *emf, const char *partid, int state);
+int em_format_is_inline (EMFormat *emf,
+ const char *partid,
+ CamelMimePart *part,
+ const EMFormatHandler *handle);
+void em_format_set_inline (EMFormat *emf,
+ const char *partid,
+ int state);
-char *em_format_describe_part(CamelMimePart *part, const char *mimetype);
+char * em_format_describe_part (CamelMimePart *part,
+ const char *mime_type);
/* for implementers */
-GType em_format_get_type(void);
-
-void em_format_class_add_handler(EMFormatClass *emfc, EMFormatHandler *info);
-void em_format_class_remove_handler(EMFormatClass *emfc, EMFormatHandler *info);
-#define em_format_find_handler(emf, type) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->find_handler((emf), (type))
-const EMFormatHandler *em_format_fallback_handler(EMFormat *emf, const char *mime_type);
+GType em_format_get_type (void);
+
+void em_format_class_add_handler (EMFormatClass *emfc,
+ EMFormatHandler *info);
+void em_format_class_remove_handler (EMFormatClass *emfc,
+ EMFormatHandler *info);
+const EMFormatHandler *
+ em_format_find_handler (EMFormat *emf,
+ const gchar *mime_type);
+const EMFormatHandler *
+ em_format_fallback_handler (EMFormat *emf,
+ const gchar *mime_type);
/* puri is short for pending uri ... really */
-EMFormatPURI *em_format_add_puri(EMFormat *emf, size_t size, const char *uri, CamelMimePart *part, EMFormatPURIFunc func);
-EMFormatPURI *em_format_find_visible_puri(EMFormat *emf, const char *uri);
-EMFormatPURI *em_format_find_puri(EMFormat *emf, const char *uri);
-void em_format_clear_puri_tree(EMFormat *emf);
-void em_format_push_level(EMFormat *emf);
-void em_format_pull_level(EMFormat *emf);
+EMFormatPURI * em_format_add_puri (EMFormat *emf,
+ size_t size,
+ const char *uri,
+ CamelMimePart *part,
+ EMFormatPURIFunc func);
+EMFormatPURI * em_format_find_visible_puri (EMFormat *emf,
+ const char *uri);
+EMFormatPURI * em_format_find_puri (EMFormat *emf,
+ const char *uri);
+void em_format_clear_puri_tree (EMFormat *emf);
+void em_format_push_level (EMFormat *emf);
+void em_format_pull_level (EMFormat *emf);
/* clones inline state/view and format, or use to redraw */
-#define em_format_format_clone(emf, folder, uid, msg, src) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_clone((emf), (folder), (uid), (msg), (src))
+void em_format_format_clone (EMFormat *emf,
+ CamelFolder *folder,
+ const gchar *uid,
+ CamelMimeMessage *message,
+ EMFormat *source);
+
/* formats a new message */
-#define em_format_format(emf, folder, uid, msg) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_clone((emf), (folder), (uid), (msg), NULL)
-#define em_format_redraw(emf) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_clone((EMFormat *)(emf), \
- ((EMFormat *)(emf))->folder, \
- ((EMFormat *)(emf))->uid, \
- ((EMFormat *)(emf))->message, \
- (EMFormat *)(emf))
-void em_format_format_error(EMFormat *emf, CamelStream *stream, const char *fmt, ...);
-#define em_format_format_attachment(emf, stream, msg, type, info) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_attachment((emf), (stream), (msg), (type), (info))
-#define em_format_format_source(emf, stream, msg) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_source((emf), (stream), (msg))
-void em_format_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart *part, CamelCipherValidity *valid);
-
-#define em_format_busy(emf) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->busy((emf))
+void em_format_format (EMFormat *emf,
+ CamelFolder *folder,
+ const gchar *uid,
+ CamelMimeMessage *message);
+void em_format_redraw (EMFormat *emf);
+void em_format_format_attachment (EMFormat *emf,
+ CamelStream *stream,
+ CamelMimePart *mime_part,
+ const gchar *mime_type,
+ const struct _EMFormatHandler *info);
+void em_format_format_error (EMFormat *emf,
+ CamelStream *stream,
+ const gchar *format,
+ ...) G_GNUC_PRINTF (3, 4);
+void em_format_format_secure (EMFormat *emf,
+ CamelStream *stream,
+ CamelMimePart *mime_part,
+ CamelCipherValidity *valid);
+void em_format_format_source (EMFormat *emf,
+ CamelStream *stream,
+ CamelMimePart *mime_part);
+
+gboolean em_format_busy (EMFormat *emf);
/* raw content only */
-void em_format_format_content(EMFormat *emf, CamelStream *stream, CamelMimePart *part);
+void em_format_format_content (EMFormat *emf,
+ CamelStream *stream,
+ CamelMimePart *part);
+
/* raw content text parts - should this just be checked/done by above? */
-void em_format_format_text(EMFormat *emf, CamelStream *stream, CamelDataWrapper *part);
+void em_format_format_text (EMFormat *emf,
+ CamelStream *stream,
+ CamelDataWrapper *part);
+
+void em_format_part_as (EMFormat *emf,
+ CamelStream *stream,
+ CamelMimePart *part,
+ const gchar *mime_type);
+void em_format_part (EMFormat *emf,
+ CamelStream *stream,
+ CamelMimePart *part);
+void em_format_merge_handler (EMFormat *new,
+ EMFormat *old);
-void em_format_part_as(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const char *mime_type);
-void em_format_part(EMFormat *emf, CamelStream *stream, CamelMimePart *part);
-void em_format_merge_handler(EMFormat *new, EMFormat *old);
+G_END_DECLS
- #endif /* ! _EM_FORMAT_H */
+ G_END_DECLS
+
+ #endif /* EM_FORMAT_H */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
