aboutsummaryrefslogtreecommitdiffstats
path: root/composer
diff options
context:
space:
mode:
Diffstat (limited to 'composer')
-rw-r--r--composer/Makefile.am1
-rw-r--r--composer/e-composer-actions.c2
-rw-r--r--composer/e-composer-actions.h2
-rw-r--r--composer/e-composer-autosave.c2
-rw-r--r--composer/e-composer-autosave.h2
-rw-r--r--composer/e-composer-common.h2
-rw-r--r--composer/e-composer-from-header.c2
-rw-r--r--composer/e-composer-from-header.h2
-rw-r--r--composer/e-composer-header-table.c17
-rw-r--r--composer/e-composer-header-table.h2
-rw-r--r--composer/e-composer-header.c8
-rw-r--r--composer/e-composer-header.h4
-rw-r--r--composer/e-composer-name-header.c18
-rw-r--r--composer/e-composer-name-header.h2
-rw-r--r--composer/e-composer-post-header.c2
-rw-r--r--composer/e-composer-post-header.h2
-rw-r--r--composer/e-composer-private.c9
-rw-r--r--composer/e-composer-private.h2
-rw-r--r--composer/e-composer-text-header.c4
-rw-r--r--composer/e-composer-text-header.h2
-rw-r--r--composer/e-msg-composer.c10
-rw-r--r--composer/e-msg-composer.h2
22 files changed, 45 insertions, 54 deletions
diff --git a/composer/Makefile.am b/composer/Makefile.am
index 3ba27e871e..12ad680bcf 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -50,7 +50,6 @@ libcomposer_la_SOURCES = \
e-composer-text-header.c \
e-msg-composer.c
-
libcomposer_la_LIBADD = \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
$(top_builddir)/em-format/libemformat.la
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index 6638cf7aef..1ef7e610ad 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
diff --git a/composer/e-composer-actions.h b/composer/e-composer-actions.h
index da3e470d81..5d49cde158 100644
--- a/composer/e-composer-actions.h
+++ b/composer/e-composer-actions.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
diff --git a/composer/e-composer-autosave.c b/composer/e-composer-autosave.c
index 842deae9c9..5da5842d8c 100644
--- a/composer/e-composer-autosave.c
+++ b/composer/e-composer-autosave.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
diff --git a/composer/e-composer-autosave.h b/composer/e-composer-autosave.h
index 7c97338019..fe03b7b0bc 100644
--- a/composer/e-composer-autosave.h
+++ b/composer/e-composer-autosave.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
diff --git a/composer/e-composer-common.h b/composer/e-composer-common.h
index 832b38001f..28affba2ad 100644
--- a/composer/e-composer-common.h
+++ b/composer/e-composer-common.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/composer/e-composer-from-header.c b/composer/e-composer-from-header.c
index 68b6c0c14a..4dadfa7ac7 100644
--- a/composer/e-composer-from-header.c
+++ b/composer/e-composer-from-header.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/composer/e-composer-from-header.h b/composer/e-composer-from-header.h
index f8c6dc6f18..d2603bd664 100644
--- a/composer/e-composer-from-header.h
+++ b/composer/e-composer-from-header.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c
index df96d763ba..d883d8ecb2 100644
--- a/composer/e-composer-header-table.c
+++ b/composer/e-composer-header-table.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
@@ -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,6 @@ 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. */
@@ -548,7 +547,7 @@ composer_header_table_constructor (GType type,
priv->headers[ii]->input_widget,
"right-attach", 2, NULL);
- gtk_table_attach (GTK_TABLE (object), (GtkWidget *)priv->actions_container, 2, 4, E_COMPOSER_HEADER_TO,
+ gtk_table_attach (GTK_TABLE (object), (GtkWidget *)priv->actions_container, 2, 4, E_COMPOSER_HEADER_TO,
E_COMPOSER_HEADER_TO + 1, GTK_FILL, 0, 0, 3);
}
@@ -937,17 +936,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;
@@ -1025,7 +1027,6 @@ e_composer_header_table_get_header (EComposerHeaderTable *table,
{
g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL);
g_return_val_if_fail (type < E_COMPOSER_NUM_HEADERS, NULL);
- g_return_val_if_fail (type >= 0, NULL);
return table->priv->headers[type];
}
diff --git a/composer/e-composer-header-table.h b/composer/e-composer-header-table.h
index 817863031c..91ad56da46 100644
--- a/composer/e-composer-header-table.h
+++ b/composer/e-composer-header-table.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c
index 8bd75f8a3c..63894f43c1 100644
--- a/composer/e-composer-header.c
+++ b/composer/e-composer-header.c
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
@@ -71,12 +71,6 @@ composer_header_addaction_clicked_cb (GtkButton *button,
e_composer_header_set_visible (header, TRUE);
}
-static void
-link_clicked_cb (GtkLinkButton *button, const gchar *link_, gpointer user_data)
-{
- return;
-}
-
static GObject *
composer_header_constructor (GType type,
guint n_construct_properties,
diff --git a/composer/e-composer-header.h b/composer/e-composer-header.h
index 439b6c097f..c136e996a9 100644
--- a/composer/e-composer-header.h
+++ b/composer/e-composer-header.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
@@ -69,7 +69,7 @@ void e_composer_header_set_sensitive (EComposerHeader *header,
gboolean e_composer_header_get_visible (EComposerHeader *header);
void e_composer_header_set_visible (EComposerHeader *header,
gboolean visible);
-void e_composer_header_set_property (GObject *object, guint property_id,
+void e_composer_header_set_property (GObject *object, guint property_id,
const GValue *value, GParamSpec *pspec);
void e_composer_header_set_title_tooltip
(EComposerHeader *header,
diff --git a/composer/e-composer-name-header.c b/composer/e-composer-name-header.c
index 1f9fc9fe8d..7184bbec89 100644
--- a/composer/e-composer-name-header.c
+++ b/composer/e-composer-name-header.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
@@ -268,28 +268,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-name-header.h b/composer/e-composer-name-header.h
index af38666d59..100d6c8980 100644
--- a/composer/e-composer-name-header.h
+++ b/composer/e-composer-name-header.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
diff --git a/composer/e-composer-post-header.c b/composer/e-composer-post-header.c
index 88d20d5f58..cb297fe375 100644
--- a/composer/e-composer-post-header.c
+++ b/composer/e-composer-post-header.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/composer/e-composer-post-header.h b/composer/e-composer-post-header.h
index 92b582600b..c38bfe2d17 100644
--- a/composer/e-composer-post-header.h
+++ b/composer/e-composer-post-header.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index fffd18ac70..d4ec9ddc69 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
@@ -103,7 +103,7 @@ e_composer_private_init (EMsgComposer *composer)
widget = gtkhtml_editor_get_managed_widget (editor, "/main-menu");
gtk_widget_hide (widget);
widget = gtkhtml_editor_get_managed_widget (editor, "/main-toolbar");
- gtk_toolbar_set_style ((GtkToolbar *)widget, GTK_TOOLBAR_BOTH_HORIZ);
+ gtk_toolbar_set_style (GTK_TOOLBAR (widget), GTK_TOOLBAR_BOTH_HORIZ);
gtk_widget_hide (widget);
}
@@ -161,7 +161,6 @@ 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);
@@ -187,7 +186,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);
@@ -212,7 +211,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-composer-private.h b/composer/e-composer-private.h
index aec4e915c1..82019b44ad 100644
--- a/composer/e-composer-private.h
+++ b/composer/e-composer-private.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
diff --git a/composer/e-composer-text-header.c b/composer/e-composer-text-header.c
index e676ef941c..e765237a2d 100644
--- a/composer/e-composer-text-header.c
+++ b/composer/e-composer-text-header.c
@@ -14,7 +14,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
@@ -122,7 +122,7 @@ e_composer_text_header_new_button (const gchar *label, const gchar *action_label
{
return g_object_new (
E_TYPE_COMPOSER_TEXT_HEADER, "label", label,
- "button", TRUE, "addaction", action_label != NULL,
+ "button", TRUE, "addaction", action_label != NULL,
"addaction_text", action_label,
"visible", action_label == NULL, NULL);
}
diff --git a/composer/e-composer-text-header.h b/composer/e-composer-text-header.h
index 79e972d3c6..74fb86f9b0 100644
--- a/composer/e-composer-text-header.h
+++ b/composer/e-composer-text-header.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 2589786f48..98f2c31f86 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -2856,13 +2856,13 @@ e_msg_composer_new_with_message (CamelMimeMessage *message)
/* Remove any other X-Evolution-* headers that may have been set */
xev = emcu_remove_xevolution_headers (message);
camel_header_raw_clear (&xev);
-
+
/* Check for receipt request */
if (camel_medium_get_header (CAMEL_MEDIUM (message), "Disposition-Notification-To")) {
action = GTK_TOGGLE_ACTION (ACTION (REQUEST_READ_RECEIPT));
gtk_toggle_action_set_active (action, TRUE);
}
-
+
/* Check for mail priority */
if (camel_medium_get_header (CAMEL_MEDIUM (message), "X-Priority")) {
action = GTK_TOGGLE_ACTION (ACTION (PRIORITIZE_MESSAGE));
@@ -3873,7 +3873,7 @@ e_msg_composer_request_close_all (void)
/* Try to autosave before closing. If it fails for
* some reason, the CLOSE action will still detect
- * unsaved changes and prompt the user.
+ * unsaved changes and prompt the user.
*
* FIXME If it /does/ prompt the user, the Cancel
* button will act the same as Discard Changes,
@@ -4051,7 +4051,7 @@ e_load_spell_languages (void)
const GtkhtmlSpellLanguage *language;
language = gtkhtml_spell_language_lookup (NULL);
-
+
if (language) {
spell_languages = g_list_prepend (
spell_languages, (gpointer) language);
diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
index 7e5e8f6cf4..1a8f4676e7 100644
--- a/composer/e-msg-composer.h
+++ b/composer/e-msg-composer.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
generated by cgit (git 2.34.1) at 2024-11-19 16:09:12 +0800