aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog9
-rw-r--r--mail/mail-config-gui.c22
-rw-r--r--mail/mail-threads.c5
-rw-r--r--mail/main.c2
-rw-r--r--mail/subscribe-dialog.c2
5 files changed, 28 insertions, 12 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index b9e3d031ec..63b69ca6e2 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,12 @@
+2000-11-03 Dan Winship <danw@helixcode.com>
+
+ * mail-config-gui.c (service_page_item_new): url_flags are now on
+ CamelProvider, not CamelService
+
+ * main.c:
+ * subscribe-dialog.c:
+ * mail-threads.c: Kill warnings
+
2000-11-03 Federico Mena Quintero <federico@helixcode.com>
* Makefile.am: Clean the idl-generated files properly.
diff --git a/mail/mail-config-gui.c b/mail/mail-config-gui.c
index 77bb4677b7..15099d8332 100644
--- a/mail/mail-config-gui.c
+++ b/mail/mail-config-gui.c
@@ -900,27 +900,27 @@ service_page_item_new (MailDialogServicePage *page, MailService *mcs)
item->type = mcs->type;
row = 0;
- service_flags = mcs->service->url_flags & ~CAMEL_SERVICE_URL_NEED_AUTH;
+ service_flags = mcs->service->provider->url_flags & ~CAMEL_URL_NEED_AUTH;
- if (service_flags & CAMEL_SERVICE_URL_ALLOW_HOST) {
+ if (service_flags & CAMEL_URL_ALLOW_HOST) {
item->host = service_page_add_elem (page, table, row++, _("Server:"));
- item->hostneed = ((service_flags & CAMEL_SERVICE_URL_NEED_HOST)
- == CAMEL_SERVICE_URL_NEED_HOST);
+ item->hostneed = ((service_flags & CAMEL_URL_NEED_HOST)
+ == CAMEL_URL_NEED_HOST);
}
- if (service_flags & CAMEL_SERVICE_URL_ALLOW_USER) {
+ if (service_flags & CAMEL_URL_ALLOW_USER) {
item->user = service_page_add_elem (page, table, row++, _("Username:"));
- item->userneed = ((service_flags & CAMEL_SERVICE_URL_NEED_USER)
- == CAMEL_SERVICE_URL_NEED_USER);
+ item->userneed = ((service_flags & CAMEL_URL_NEED_USER)
+ == CAMEL_URL_NEED_USER);
}
- if (service_flags & CAMEL_SERVICE_URL_ALLOW_PATH) {
+ if (service_flags & CAMEL_URL_ALLOW_PATH) {
item->path = service_page_add_elem (page, table, row++, _("Path:"));
- item->pathneed = ((service_flags & CAMEL_SERVICE_URL_NEED_PATH)
- == CAMEL_SERVICE_URL_NEED_PATH);
+ item->pathneed = ((service_flags & CAMEL_URL_NEED_PATH)
+ == CAMEL_URL_NEED_PATH);
}
- if (mcs->service->url_flags & CAMEL_SERVICE_URL_ALLOW_AUTH) {
+ if (mcs->service->provider->url_flags & CAMEL_URL_ALLOW_AUTH) {
GtkWidget *label;
gchar *url;
diff --git a/mail/mail-threads.c b/mail/mail-threads.c
index 10502557a6..cc66b60ce2 100644
--- a/mail/mail-threads.c
+++ b/mail/mail-threads.c
@@ -28,6 +28,8 @@
#include <errno.h>
#include <glib.h>
+#include <gal/widgets/e-gui-utils.h>
+
#include "folder-browser-factory.h"
#include "camel/camel-object.h"
@@ -889,7 +891,8 @@ get_password (com_msg_t * msg)
*(msg->reply) = g_strdup (_("Could not create dialog box."));
button = -1;
} else {
- e_container_foreach_leaf(dialog, focus_on_entry, NULL);
+ e_container_foreach_leaf (GTK_CONTAINER (dialog),
+ focus_on_entry, NULL);
*(msg->reply) = NULL;
button = gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
}
diff --git a/mail/main.c b/mail/main.c
index d75d9d3e70..a6bc2fd829 100644
--- a/mail/main.c
+++ b/mail/main.c
@@ -30,12 +30,14 @@
#include "composer/evolution-composer.h"
#include "mail.h"
+#if 0
static int blowup(int status)
{
printf("memory blew up, status %d\n", status);
/*abort();*/
return status;
}
+#endif
int
main (int argc, char *argv [])
diff --git a/mail/subscribe-dialog.c b/mail/subscribe-dialog.c
index aa494058e7..7f198181de 100644
--- a/mail/subscribe-dialog.c
+++ b/mail/subscribe-dialog.c
@@ -30,6 +30,8 @@
#include <gal/util/e-util.h>
#include <gal/widgets/e-unicode.h>
#include <gal/e-table/e-cell-toggle.h>
+#include <gal/e-table/e-cell-text.h>
+#include <gal/e-table/e-cell-tree.h>
#include <gal/e-table/e-table-scrolled.h>
#include <gal/e-table/e-tree-simple.h>
#include <gal/e-paned/e-hpaned.h>