[evolution/wip/webkit-composer: 469/966] Fix bugs introduced by rebase.
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip/webkit-composer: 469/966] Fix bugs introduced by rebase.
- Date: Wed, 23 Apr 2014 10:32:51 +0000 (UTC)
commit fe5b4e41995b9c4dac42385e2257cfb0fd2d9f30
Author: Tomas Popela <tpopela redhat com>
Date: Thu Jan 16 15:26:38 2014 +0100
Fix bugs introduced by rebase.
composer/e-composer-private.c | 14 --------------
composer/e-composer-private.h | 2 --
composer/e-msg-composer.c | 2 +-
e-util/Makefile.am | 2 ++
mail/em-composer-utils.c | 1 +
modules/composer-autosave/Makefile.am | 17 +++++++----------
modules/composer-autosave/e-composer-autosave.c | 2 +-
7 files changed, 12 insertions(+), 28 deletions(-)
---
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index d85afd4..a0ddf45 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -417,7 +417,6 @@ e_composer_private_finalize (EMsgComposer *composer)
g_free (composer->priv->charset);
g_free (composer->priv->mime_type);
g_free (composer->priv->mime_body);
- g_free (composer->priv->selected_signature_uid);
g_hash_table_destroy (composer->priv->inline_images);
g_hash_table_destroy (composer->priv->inline_images_by_url);
@@ -1183,19 +1182,6 @@ e_composer_update_signature (EMsgComposer *composer)
return;
table = e_msg_composer_get_header_table (composer);
- signature_uid = e_composer_header_table_get_signature_uid (table);
-
- /* this is a case when the signature combo cleared itself for a reload */
- if (!signature_uid)
- return;
-
- if (g_strcmp0 (signature_uid, composer->priv->selected_signature_uid) == 0 ||
- (is_null_or_none (signature_uid) && is_null_or_none (composer->priv->selected_signature_uid)))
- return;
-
- g_free (composer->priv->selected_signature_uid);
- composer->priv->selected_signature_uid = g_strdup (signature_uid);
-
combo_box = e_composer_header_table_get_signature_combo_box (table);
editor = e_msg_composer_get_editor (composer);
editor_widget = e_editor_get_editor_widget (editor);
diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h
index 402de4e..aa6cc6c 100644
--- a/composer/e-composer-private.h
+++ b/composer/e-composer-private.h
@@ -97,8 +97,6 @@ struct _EMsgComposerPrivate {
CamelMimeMessage *redirect;
gboolean is_from_message;
-
- gchar *selected_signature_uid;
};
void e_composer_private_constructed (EMsgComposer *composer);
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index b69b1c6..3a147d6 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -4813,7 +4813,7 @@ e_msg_composer_get_message_draft (EMsgComposer *composer,
EEditor *editor;
EEditorWidget *editor_widget;
GSimpleAsyncResult *simple;
- ComposerFlags flags = COMPOSER_FLAG_DRAFT;
+ ComposerFlags flags = COMPOSER_FLAG_SAVE_DRAFT;
GtkAction *action;
g_return_if_fail (E_IS_MSG_COMPOSER (composer));
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index f6b6018..3d94b0f 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -104,6 +104,7 @@ libevolution_util_la_CPPFLAGS = \
$(GTKSPELL_CFLAGS) \
$(CODE_COVERAGE_CFLAGS) \
$(ENCHANT_CFLAGS) \
+ $(GTKSPELL_CFLAGS) \
$(NULL)
evolution_util_include_HEADERS = \
@@ -646,6 +647,7 @@ libevolution_util_la_LIBADD = \
$(GNOME_PLATFORM_LIBS) \
$(GEO_LIBS) \
$(ENCHANT_LIBS) \
+ $(GTKSPELL_LIBS) \
$(INTLLIBS) \
$(MATH_LIB) \
$(NULL)
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index da9a8d4..67494d7 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -2866,6 +2866,7 @@ em_utils_construct_composer_text (CamelSession *session,
EMailPartList *parts_list)
{
gchar *text, *credits;
+ gboolean start_bottom = FALSE;
g_return_val_if_fail (CAMEL_IS_SESSION (session), NULL);
diff --git a/modules/composer-autosave/Makefile.am b/modules/composer-autosave/Makefile.am
index 7864678..10cae2d 100644
--- a/modules/composer-autosave/Makefile.am
+++ b/modules/composer-autosave/Makefile.am
@@ -1,5 +1,3 @@
-NULL =
-
module_LTLIBRARIES = module-composer-autosave.la
module_composer_autosave_la_CPPFLAGS = \
@@ -12,14 +10,13 @@ module_composer_autosave_la_CPPFLAGS = \
$(NULL)
module_composer_autosave_la_SOURCES = \
- evolution-composer-autosave.c \
- e-autosave-utils.c \
- e-autosave-utils.h \
- e-composer-autosave.c \
- e-composer-autosave.h \
- e-composer-registry.c \
- e-composer-registry.h \
- $(NULL)
+ evolution-composer-autosave.c \
+ e-autosave-utils.c \
+ e-autosave-utils.h \
+ e-composer-autosave.c \
+ e-composer-autosave.h \
+ e-composer-registry.c \
+ e-composer-registry.h
module_composer_autosave_la_LIBADD = \
$(top_builddir)/shell/libevolution-shell.la \
diff --git a/modules/composer-autosave/e-composer-autosave.c b/modules/composer-autosave/e-composer-autosave.c
index 5f24205..6f85550 100644
--- a/modules/composer-autosave/e-composer-autosave.c
+++ b/modules/composer-autosave/e-composer-autosave.c
@@ -133,7 +133,7 @@ composer_autosave_changed_cb (EComposerAutosave *autosave)
editor = e_msg_composer_get_editor (E_MSG_COMPOSER (extensible));
editor_widget = e_editor_get_editor_widget (editor);
- autosave->changed = e_editor_widget_get_changed (editor_widget);
+ autosave->priv->changed = e_editor_widget_get_changed (editor_widget);
if (autosave->priv->changed && autosave->priv->timeout_id == 0) {
autosave->priv->timeout_id = e_named_timeout_add_seconds (
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]