diff options
| -rw-r--r-- | composer/ChangeLog | 10 | ||||
| -rw-r--r-- | composer/e-msg-composer-hdrs.c | 19 |
2 files changed, 22 insertions, 7 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 059eed96db..1dbe0b511b 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,13 @@ +2002-08-16 Dan Winship <danw@ximian.com> + + * e-msg-composer-hdrs.c (create_headers): Use an + EvolutionFolderSelectorButton instead of a label to indicate the + posting destination. #27920. + (e_msg_composer_hdrs_set_post_to): Use + evolution_folder_button_set_uri. + (e_msg_composer_hdrs_get_post_to): Use + evolution_folder_button_get_folder. + 2002-08-14 Dan Winship <danw@ximian.com> * e-msg-composer.c (from_changed_cb): Don't turn on pgp signing if diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c index c7bfe78160..f7d4493e76 100644 --- a/composer/e-msg-composer-hdrs.c +++ b/composer/e-msg-composer-hdrs.c @@ -45,10 +45,13 @@ #include <gal/widgets/e-unicode.h> #include <camel/camel.h> +#include "evolution-folder-selector-button.h" #include "e-msg-composer-hdrs.h" #include "mail/mail-config.h" #include "addressbook/backend/ebook/e-book-util.h" +extern EvolutionShellClient *global_shell_client; + /* Indexes in the GtkTable assigned to various items */ @@ -367,6 +370,7 @@ static void create_headers (EMsgComposerHdrs *hdrs) { EMsgComposerHdrsPrivate *priv = hdrs->priv; + static const char *posting_types[] = { "mail", NULL }; /* * Reply-To: @@ -423,7 +427,9 @@ create_headers (EMsgComposerHdrs *hdrs) * Post-To */ priv->post_to.label = gtk_label_new (_("Post To:")); - priv->post_to.entry = gtk_label_new (""); + priv->post_to.entry = evolution_folder_selector_button_new ( + global_shell_client, _("Posting destination"), NULL, + posting_types); } static void @@ -948,7 +954,7 @@ e_msg_composer_hdrs_set_post_to (EMsgComposerHdrs *hdrs, g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs)); g_return_if_fail (post_to != NULL); - gtk_label_set_text (GTK_LABEL (hdrs->priv->post_to.entry), post_to); + evolution_folder_selector_button_set_uri (EVOLUTION_FOLDER_SELECTOR_BUTTON (hdrs->priv->post_to.entry), post_to); } void @@ -1108,13 +1114,12 @@ e_msg_composer_hdrs_get_recipients (EMsgComposerHdrs *hdrs) char * e_msg_composer_hdrs_get_post_to (EMsgComposerHdrs *hdrs) { - char *post_to = NULL; - + GNOME_Evolution_Folder *folder; + g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL); - gtk_label_get (GTK_LABEL (hdrs->priv->post_to.entry), &post_to); - - return g_strdup (post_to); + folder = evolution_folder_selector_button_get_folder (EVOLUTION_FOLDER_SELECTOR_BUTTON (hdrs->priv->post_to.entry)); + return folder ? g_strdup (folder->physicalUri) : NULL; } char * |