[evolution] Fix composer header regression caused by Anjal merge.
- From: Matthew Barnes <mbarnes src gnome org>
- To: svn-commits-list gnome org
- Subject: [evolution] Fix composer header regression caused by Anjal merge.
- Date: Tue, 26 May 2009 22:56:06 -0400 (EDT)
commit 75a36a295adb64a012521c01724d6b2951986653
Author: Matthew Barnes <mbarnes redhat com>
Date: Tue May 26 22:55:38 2009 -0400
Fix composer header regression caused by Anjal merge.
---
composer/e-composer-header-table.c | 13 ++++++++-----
composer/e-composer-name-header.c | 16 +++++++---------
composer/e-composer-private.c | 6 +++---
composer/e-msg-composer.c | 8 ++++----
4 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c
index ef03fb4..3304130 100644
--- a/composer/e-composer-header-table.c
+++ b/composer/e-composer-header-table.c
@@ -70,7 +70,7 @@ struct _EComposerHeaderTablePrivate {
GtkWidget *signature_label;
GtkWidget *signature_combo_box;
ENameSelector *name_selector;
- GtkHBox *actions_container;
+ GtkHBox *actions_container;
};
static gpointer parent_class;
@@ -514,7 +514,7 @@ composer_header_table_constructor (GType type,
if (composer_lite)
gtk_widget_show_all ((GtkWidget *)priv->actions_container);
-
+
ii = E_COMPOSER_HEADER_FROM;
/* Leave room in the "From" row for signature stuff. */
@@ -937,17 +937,20 @@ composer_header_table_init (EComposerHeaderTable *table)
composer_header_table_bind_header ("reply-to", "changed", header);
table->priv->headers[E_COMPOSER_HEADER_REPLY_TO] = header;
- header = e_composer_name_header_new_with_label (_("_To:"), name_selector);
+ header = e_composer_name_header_new_with_label (
+ _("_To:"), name_selector);
e_composer_header_set_input_tooltip (header, HEADER_TOOLTIP_TO);
composer_header_table_bind_header ("destinations-to", "changed", header);
table->priv->headers[E_COMPOSER_HEADER_TO] = header;
- header = e_composer_name_header_new_with_action (_("_Cc:"), _("Show CC"), name_selector);
+ header = e_composer_name_header_new_with_action (
+ _("_Cc:"), _("Show CC"), name_selector);
e_composer_header_set_input_tooltip (header, HEADER_TOOLTIP_CC);
composer_header_table_bind_header ("destinations-cc", "changed", header);
table->priv->headers[E_COMPOSER_HEADER_CC] = header;
- header = e_composer_name_header_new_with_action (_("_Bcc:"), _("Show BCC"), name_selector);
+ header = e_composer_name_header_new_with_action (
+ _("_Bcc:"), _("Show BCC"), name_selector);
e_composer_header_set_input_tooltip (header, HEADER_TOOLTIP_BCC);
composer_header_table_bind_header ("destinations-bcc", "changed", header);
table->priv->headers[E_COMPOSER_HEADER_BCC] = header;
diff --git a/composer/e-composer-name-header.c b/composer/e-composer-name-header.c
index 472208e..ed4e60c 100644
--- a/composer/e-composer-name-header.c
+++ b/composer/e-composer-name-header.c
@@ -265,28 +265,26 @@ e_composer_name_header_new (const gchar *label,
EComposerHeader *
e_composer_name_header_new_with_label (const gchar *label,
- ENameSelector *name_selector)
+ ENameSelector *name_selector)
{
return g_object_new (
E_TYPE_COMPOSER_NAME_HEADER, "label", label,
- "button", FALSE, "name-selector", name_selector,
- "addaction", FALSE, "visible", TRUE,
- NULL);
+ "button", TRUE, "name-selector", name_selector,
+ "addaction", FALSE, "visible", TRUE, NULL);
}
EComposerHeader *
e_composer_name_header_new_with_action (const gchar *label,
- const gchar *action_label,
- ENameSelector *name_selector)
+ const gchar *action_label,
+ ENameSelector *name_selector)
{
g_return_val_if_fail (E_IS_NAME_SELECTOR (name_selector), NULL);
return g_object_new (
E_TYPE_COMPOSER_NAME_HEADER, "label", label,
- "button", FALSE, "name-selector", name_selector,
+ "button", TRUE, "name-selector", name_selector,
"addaction_text", action_label,
- "addaction", action_label != NULL,
- NULL);
+ "addaction", action_label != NULL, NULL);
}
ENameSelector *
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index a41a06f..0a1a91f 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -159,7 +159,7 @@ e_composer_private_init (EMsgComposer *composer)
gtk_container_remove((GtkContainer *)send_widget, gtk_bin_get_child ((GtkBin *)send_widget));
gtk_container_add((GtkContainer *)send_widget, tmp);
gtk_button_set_relief ((GtkButton *)send_widget, GTK_RELIEF_NORMAL);
-
+
path = "/main-toolbar/pre-main-toolbar/save-draft";
send_widget = gtk_ui_manager_get_widget (ui_manager, path);
tmp = gtk_hbox_new (FALSE, 0);
@@ -185,7 +185,7 @@ e_composer_private_init (EMsgComposer *composer)
gtk_box_pack_start ((GtkBox *)tmp, tmp1, FALSE, FALSE, 0);
tmp1 = gtk_label_new_with_mnemonic (_("Add attachment"));
gtk_box_pack_start ((GtkBox *)tmp, tmp1, FALSE, FALSE, 3);
- gtk_widget_show_all(tmp);
+ gtk_widget_show_all(tmp);
gtk_widget_reparent (send_widget, tmp_box);
gtk_box_set_child_packing ((GtkBox *)tmp_box, send_widget, FALSE, FALSE, 6, GTK_PACK_START);
gtk_tool_item_set_is_important (GTK_TOOL_ITEM (send_widget), TRUE);
@@ -210,7 +210,7 @@ e_composer_private_init (EMsgComposer *composer)
/* Construct the header table. */
container = editor->vbox;
-
+
widget = e_composer_header_table_new ();
gtk_container_set_border_width (GTK_CONTAINER (widget), 6);
gtk_box_pack_start (GTK_BOX (editor->vbox), widget, FALSE, FALSE, 0);
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 3bf82a2..a715774 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -1431,14 +1431,14 @@ msg_composer_update_preferences (GConfClient *client,
GError *error = NULL;
editor = GTKHTML_EDITOR (composer);
-
+
if (entry) {
if (strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_INLINE_SPELLING_KEY) != 0 &&
strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_MAGIC_LINKS_KEY) != 0 &&
strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_MAGIC_SMILEYS_KEY) != 0)
return;
}
-
+
enable = gconf_client_get_bool (
client, COMPOSER_GCONF_INLINE_SPELLING_KEY, &error);
if (error == NULL)
@@ -2294,7 +2294,7 @@ e_msg_composer_set_lite (void)
composer_lite = TRUE;
}
-gboolean
+gboolean
e_msg_composer_get_lite (void)
{
return composer_lite;
@@ -2308,7 +2308,7 @@ e_msg_composer_lite_new (void)
/* Init lite-composer for ever for the session */
composer_lite = TRUE;
- composer = e_msg_composer_new ();
+ composer = e_msg_composer_new ();
return composer;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]