aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer/ChangeLog12
-rw-r--r--composer/e-msg-composer.c47
-rw-r--r--composer/e-msg-composer.h11
-rw-r--r--composer/evolution-composer.c10
-rw-r--r--composer/evolution-composer.h2
5 files changed, 24 insertions, 58 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index cb7d5d1c1b..9c0e73c008 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,15 @@
+2002-07-05 Jeffrey Stedfast <fejj@ximian.com>
+
+ * evolution-composer.c (init): Don't connect to the postpone
+ signal, but do connect to the save-draft signal.
+ (evolution_composer_factory_init): No longer takes a postpone_cb
+ argument, but does now take a save_draft_cb argument.
+
+ * e-msg-composer.c (menu_file_send_later_cb): Removed.
+ (class_init): Removed the POSTPONE signal.
+ (setup_ui): Don't need to swap the Send/SendLater tooltips and
+ accels anymore, since SendLater no longer exists.
+
2002-06-26 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer.c (build_message): Use the new
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index f716759c2b..bb93d5e60a 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -118,7 +118,6 @@
enum {
SEND,
- POSTPONE,
SAVE_DRAFT,
LAST_SIGNAL
};
@@ -1170,8 +1169,6 @@ autosave_load_draft (const char *filename)
gtk_signal_connect (GTK_OBJECT (composer), "send",
GTK_SIGNAL_FUNC (composer_send_cb), NULL);
- gtk_signal_connect (GTK_OBJECT (composer), "postpone",
- GTK_SIGNAL_FUNC (composer_postpone_cb), NULL);
gtk_widget_show (GTK_WIDGET (composer));
}
@@ -1467,18 +1464,7 @@ menu_file_send_cb (BonoboUIComponent *uic,
void *data,
const char *path)
{
- if (session && camel_session_is_online (session))
- gtk_signal_emit (GTK_OBJECT (data), signals[SEND]);
- else
- gtk_signal_emit (GTK_OBJECT (data), signals[POSTPONE]);
-}
-
-static void
-menu_file_send_later_cb (BonoboUIComponent *uic,
- void *data,
- const char *path)
-{
- gtk_signal_emit (GTK_OBJECT (data), signals[POSTPONE]);
+ gtk_signal_emit (GTK_OBJECT (data), signals[SEND]);
}
static void
@@ -1742,7 +1728,6 @@ static BonoboUIVerb verbs [] = {
BONOBO_UI_VERB ("FileAttach", menu_file_add_attachment_cb),
BONOBO_UI_VERB ("FileSend", menu_file_send_cb),
- BONOBO_UI_VERB ("FileSendLater", menu_file_send_later_cb),
BONOBO_UI_VERB ("DeleteAll", menu_edit_delete_all_cb),
@@ -1755,7 +1740,6 @@ static EPixmap pixcache [] = {
/* E_PIXMAP ("/menu/Insert/FileAttach", "buttons/add-attachment.png"), */
E_PIXMAP ("/commands/FileSend", "send-16.png"),
- E_PIXMAP ("/commands/FileSendLater", "send-later-16.png"),
E_PIXMAP ("/commands/FileSave", "save-16.png"),
E_PIXMAP ("/commands/FileSaveAs", "save-as-16.png"),
@@ -1972,27 +1956,6 @@ setup_ui (EMsgComposer *composer)
composer);
g_free (default_charset);
- if (!session || !camel_session_is_online (session)) {
- char *tooltip;
-
- /* Move the accelerator from Send to Send Later */
- bonobo_ui_component_set_prop (
- composer->uic, "/commands/FileSend",
- "accel", NULL, NULL);
- bonobo_ui_component_set_prop (
- composer->uic, "/commands/FileSendLater",
- "accel", "*Ctrl*Return", NULL);
-
- /* Update the FileSend tooltip to be the same as the FileSendLater tooltip... */
- tooltip = bonobo_ui_component_get_prop (
- composer->uic, "/commands/FileSendLater",
- "tip", NULL);
- bonobo_ui_component_set_prop (
- composer->uic, "/commands/FileSend",
- "tip", tooltip, NULL);
- g_free (tooltip);
- }
-
/* Format -> HTML */
bonobo_ui_component_set_prop (
composer->uic, "/commands/FormatHtml",
@@ -2515,14 +2478,6 @@ class_init (EMsgComposerClass *klass)
gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
- signals[POSTPONE] =
- gtk_signal_new ("postpone",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (EMsgComposerClass, postpone),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
-
signals[SAVE_DRAFT] =
gtk_signal_new ("save-draft",
GTK_RUN_LAST,
diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
index 6cb0977cb2..9b005f8307 100644
--- a/composer/e-msg-composer.h
+++ b/composer/e-msg-composer.h
@@ -109,7 +109,6 @@ struct _EMsgComposerClass {
BonoboWindowClass parent_class;
void (* send) (EMsgComposer *composer);
- void (* postpone) (EMsgComposer *composer);
void (* save_draft) (EMsgComposer *composer, int quit);
};
@@ -161,11 +160,11 @@ gboolean e_msg_composer_get_view_cc (EMsgCo
void e_msg_composer_set_view_cc (EMsgComposer *composer,
gboolean view_cc);
-EDestination **e_msg_composer_get_recipients (EMsgComposer *composer);
-EDestination **e_msg_composer_get_to(EMsgComposer *composer);
-EDestination **e_msg_composer_get_cc(EMsgComposer *composer);
-EDestination **e_msg_composer_get_bcc(EMsgComposer *composer);
-char *e_msg_composer_get_subject(EMsgComposer *composer);
+EDestination **e_msg_composer_get_recipients (EMsgComposer *composer);
+EDestination **e_msg_composer_get_to (EMsgComposer *composer);
+EDestination **e_msg_composer_get_cc (EMsgComposer *composer);
+EDestination **e_msg_composer_get_bcc (EMsgComposer *composer);
+char *e_msg_composer_get_subject (EMsgComposer *composer);
const MailConfigAccount *e_msg_composer_get_preferred_account (EMsgComposer *composer);
void e_msg_composer_clear_inlined_table (EMsgComposer *composer);
diff --git a/composer/evolution-composer.c b/composer/evolution-composer.c
index b6aec0af29..df301a5517 100644
--- a/composer/evolution-composer.c
+++ b/composer/evolution-composer.c
@@ -39,7 +39,7 @@
static BonoboObjectClass *parent_class = NULL;
static void (*send_cb) (EMsgComposer *, gpointer);
-static void (*postpone_cb) (EMsgComposer *, gpointer);
+static void (*save_draft_cb) (EMsgComposer *, int, gpointer);
/* CORBA interface implementation. */
@@ -280,8 +280,8 @@ init (EvolutionComposer *composer)
gtk_signal_connect (GTK_OBJECT (composer->composer), "send",
GTK_SIGNAL_FUNC (send_cb), NULL);
- gtk_signal_connect (GTK_OBJECT (composer->composer), "postpone",
- GTK_SIGNAL_FUNC (postpone_cb), NULL);
+ gtk_signal_connect (GTK_OBJECT (composer->composer), "save-draft",
+ GTK_SIGNAL_FUNC (save_draft_cb), NULL);
}
#if 0
@@ -383,7 +383,7 @@ factory_fn (BonoboGenericFactory *factory, void *closure)
void
evolution_composer_factory_init (void (*send) (EMsgComposer *, gpointer),
- void (*postpone) (EMsgComposer *, gpointer))
+ void (*save_draft) (EMsgComposer *, int, gpointer))
{
if (bonobo_generic_factory_new (GNOME_EVOLUTION_MAIL_COMPOSER_FACTORY_ID,
factory_fn, NULL) == NULL) {
@@ -393,5 +393,5 @@ evolution_composer_factory_init (void (*send) (EMsgComposer *, gpointer),
}
send_cb = send;
- postpone_cb = postpone;
+ save_draft_cb = save_draft;
}
diff --git a/composer/evolution-composer.h b/composer/evolution-composer.h
index e8b9a284cd..e3fc21a4b3 100644
--- a/composer/evolution-composer.h
+++ b/composer/evolution-composer.h
@@ -61,7 +61,7 @@ void evolution_composer_construct (EvolutionComposer *,
EvolutionComposer *evolution_composer_new (void);
void evolution_composer_factory_init (void (*send) (EMsgComposer *, gpointer),
- void (*postpone) (EMsgComposer *, gpointer));
+ void (*save_draft) (EMsgComposer *, int, gpointer));
#ifdef __cplusplus
}
generated by cgit (git 2.34.1) at 2024-11-12 05:02:18 +0800