diff options
| -rw-r--r-- | composer/ChangeLog | 10 | ||||
| -rw-r--r-- | composer/e-msg-composer-address-dialog.c | 4 | ||||
| -rw-r--r-- | composer/e-msg-composer-hdrs.c | 35 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 4 |
4 files changed, 35 insertions, 18 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 606adb0c5f..f5d2653b3f 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,13 @@ +2000-08-09 Christopher James Lahey <clahey@helixcode.com> + + * e-msg-composer-address-dialog.c: Fixed some warnings. + + * e-msg-composer-hdrs.c: Switched the composer to use an EEntry + for the subject field. + + * e-msg-composer.c: Changed the non scaling objects in this vbox + to be FALSE, FALSE instead of FALSE, TRUE. + 2000-08-09 Jeffrey Stedfast <fejj@helixcode.com> * e-msg-composer-hdrs.c (add_header): Modified to allow dropdown diff --git a/composer/e-msg-composer-address-dialog.c b/composer/e-msg-composer-address-dialog.c index 42a594756d..5eec51c435 100644 --- a/composer/e-msg-composer-address-dialog.c +++ b/composer/e-msg-composer-address-dialog.c @@ -166,7 +166,6 @@ paste_recipient_cb (GtkWidget *widget, { RecipientListInfo *info; GdkAtom atom; - gchar *text[2]; info = (RecipientListInfo *) data; @@ -439,8 +438,6 @@ static void destroy (GtkObject *object) { EMsgComposerAddressDialog *dialog; - GtkCList *address_clist; - GList *p; dialog = E_MSG_COMPOSER_ADDRESS_DIALOG (object); @@ -614,7 +611,6 @@ static GList * get_list (EMsgComposerAddressDialog *dialog, const gchar *clist_name) { - GtkCList *address_clist; GtkCList *clist; GList *list; guint i; diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c index 6f29ab94f6..bd861185af 100644 --- a/composer/e-msg-composer-hdrs.c +++ b/composer/e-msg-composer-hdrs.c @@ -36,6 +36,7 @@ #include "e-msg-composer-address-entry.h" #include "e-msg-composer-hdrs.h" +#include "widgets/e-text/e-entry.h" #include "mail/mail-config.h" @@ -263,15 +264,19 @@ add_header (EMsgComposerHdrs *hdrs, entry = create_dropdown_entry (hdrs, name); break; default: - entry = gtk_entry_new (); + entry = e_entry_new (); + gtk_object_set(GTK_OBJECT(entry), + "editable", TRUE, + "use_ellipsis", TRUE, + NULL); } - + if (entry != NULL) { gtk_widget_show (entry); gtk_table_attach (GTK_TABLE (hdrs), entry, 1, 2, priv->num_hdrs, priv->num_hdrs + 1, - GTK_FILL | GTK_EXPAND, GTK_FILL, + GTK_FILL | GTK_EXPAND, 0, 2, 2); gtk_tooltips_set_tip (hdrs->priv->tooltips, entry, tip, tip_private); @@ -521,10 +526,12 @@ e_msg_composer_hdrs_to_message (EMsgComposerHdrs *hdrs, g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs)); g_return_if_fail (msg != NULL); g_return_if_fail (CAMEL_IS_MIME_MESSAGE (msg)); - - s = gtk_entry_get_text (GTK_ENTRY (hdrs->priv->subject_entry)); + + gtk_object_get(GTK_OBJECT(hdrs->priv->subject_entry), + "text", &s, + NULL); camel_mime_message_set_subject (msg, g_strdup (s)); - + set_recipients (msg, hdrs->priv->to_entry, CAMEL_RECIPIENT_TYPE_TO); set_recipients (msg, hdrs->priv->cc_entry, CAMEL_RECIPIENT_TYPE_CC); set_recipients (msg, hdrs->priv->bcc_entry, CAMEL_RECIPIENT_TYPE_BCC); @@ -597,14 +604,13 @@ void e_msg_composer_hdrs_set_subject (EMsgComposerHdrs *hdrs, const char *subject) { - GtkEntry *entry; - g_return_if_fail (hdrs != NULL); g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs)); g_return_if_fail (subject != NULL); - entry = GTK_ENTRY (hdrs->priv->subject_entry); - gtk_entry_set_text (entry, subject); + gtk_object_set(GTK_OBJECT(hdrs->priv->subject_entry), + "text", subject, + NULL); } @@ -656,11 +662,16 @@ e_msg_composer_hdrs_get_bcc (EMsgComposerHdrs *hdrs) const char * e_msg_composer_hdrs_get_subject (EMsgComposerHdrs *hdrs) { + gchar *subject; + g_return_val_if_fail (hdrs != NULL, NULL); g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL); - return gtk_entry_get_text - (GTK_ENTRY (hdrs->priv->subject_entry)); + gtk_object_get(GTK_OBJECT(hdrs->priv->subject_entry), + "text", &subject, + NULL); + + return subject; } diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index bcb6aea723..0c195a8327 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -1196,7 +1196,7 @@ e_msg_composer_construct (EMsgComposer *composer) vbox = gtk_vbox_new (FALSE, 0); composer->hdrs = e_msg_composer_hdrs_new (); - gtk_box_pack_start (GTK_BOX (vbox), composer->hdrs, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), composer->hdrs, FALSE, FALSE, 0); gtk_widget_show (composer->hdrs); /* Editor component. */ @@ -1231,7 +1231,7 @@ e_msg_composer_construct (EMsgComposer *composer) composer->attachment_bar); gtk_box_pack_start (GTK_BOX (vbox), composer->attachment_scroll_frame, - FALSE, TRUE, GNOME_PAD_SMALL); + FALSE, FALSE, GNOME_PAD_SMALL); gtk_signal_connect (GTK_OBJECT (composer->attachment_bar), "changed", GTK_SIGNAL_FUNC (attachment_bar_changed_cb), composer); |