aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/ChangeLog7
-rw-r--r--composer/e-msg-composer-hdrs.c27
2 files changed, 19 insertions, 15 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 0e617e735b..7ba1e67a3a 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,10 @@
+2003-12-04 Jeffrey Stedfast <fejj@ximian.com>
+
+ * e-msg-composer-hdrs.c (create_headers): Unifdef out the post-to
+ code and fix it to use the new folder selection button.
+ (e_msg_composer_hdrs_set_post_to): Same.
+ (e_msg_composer_hdrs_get_post_to): Same.
+
2003-12-03 Ettore Perazzoli <ettore@ximian.com>
* e-msg-composer-hdrs.c: Do not #include
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
index a0b0f55c81..4e222b0bfd 100644
--- a/composer/e-msg-composer-hdrs.c
+++ b/composer/e-msg-composer-hdrs.c
@@ -50,6 +50,7 @@
#include <camel/camel.h>
#include "e-msg-composer-hdrs.h"
#include "mail/mail-config.h"
+#include "mail/em-folder-selection-button.h"
@@ -498,7 +499,6 @@ static void
create_headers (EMsgComposerHdrs *hdrs)
{
EMsgComposerHdrsPrivate *priv = hdrs->priv;
- static const char *posting_types[] = { "mail/*", NULL };
/*
* Reply-To:
@@ -541,15 +541,11 @@ create_headers (EMsgComposerHdrs *hdrs)
"the message without appearing in the recipient list of "
"the message."));
-#if 0 /* FIXME */
/*
* Post-To
*/
priv->post_to.label = gtk_label_new (_("Post To:"));
- priv->post_to.entry = evolution_folder_selector_button_new (
- global_shell_client, _("Posting destination"), NULL,
- posting_types);
-#endif
+ priv->post_to.entry = em_folder_selection_button_new (_("Posting destination"), _("Choose a folder to post the message to."));
}
static void
@@ -1095,7 +1091,7 @@ e_msg_composer_hdrs_set_bcc (EMsgComposerHdrs *hdrs,
g_free (str);
}
-#if 0
+
void
e_msg_composer_hdrs_set_post_to (EMsgComposerHdrs *hdrs,
const char *post_to)
@@ -1103,9 +1099,9 @@ 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);
- evolution_folder_selector_button_set_uri (EVOLUTION_FOLDER_SELECTOR_BUTTON (hdrs->priv->post_to.entry), post_to);
+ em_folder_selection_button_set_selection ((EMFolderSelectionButton *) hdrs->priv->post_to.entry, post_to);
}
-#endif
+
void
e_msg_composer_hdrs_set_subject (EMsgComposerHdrs *hdrs,
@@ -1258,18 +1254,19 @@ e_msg_composer_hdrs_get_recipients (EMsgComposerHdrs *hdrs)
return recip_destv;
}
-#if 0
+
char *
e_msg_composer_hdrs_get_post_to (EMsgComposerHdrs *hdrs)
{
- GNOME_Evolution_Folder *folder;
-
+ const char *uri;
+
g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
- folder = evolution_folder_selector_button_get_folder (EVOLUTION_FOLDER_SELECTOR_BUTTON (hdrs->priv->post_to.entry));
- return folder ? g_strdup (folder->physicalUri) : NULL;
+ uri = em_folder_selection_button_get_selection ((EMFolderSelectionButton *) hdrs->priv->post_to.entry);
+
+ return g_strdup (uri);
}
-#endif
+
const char *
e_msg_composer_hdrs_get_subject (EMsgComposerHdrs *hdrs)