aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--addressbook/ChangeLog5
-rw-r--r--addressbook/backend/pas/pas-backend-file.c4
-rw-r--r--configure.in2
-rw-r--r--mail/ChangeLog4
-rw-r--r--mail/mail-ops.c2
-rw-r--r--mail/mail-threads.h3
7 files changed, 25 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 62a3e2a6a1..65b96f06f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-14 Peter Williams <peterw@helixcode.com>
+
+ * configure.in: Check for db1/db.h too, which is what
+ RH 7.0 uses for the old db headers. Patch from Kenny Graunke
+ <kwg@teleport.com>
+
2000-08-13 Chris Toshok <toshok@helixcode.com>
* configure.in: offer --enable-pilot-conduits to add pilot
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 515ab337b2..746f2933b3 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-14 Peter Williams <peterw@helixcode.com>
+
+ * backend/pas/pas-backend-file.c: Include the proper db1/db.h
+ as in RedHat 7.0 -- patch from Kenny Graunke <kwg@teleport.com>
+
2000-08-13 Chris Toshok <toshok@helixcode.com>
* conduit/Makefile.am (libaddress_conduit_la_SOURCES): add
diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c
index 3d7e443f21..3cf0586afe 100644
--- a/addressbook/backend/pas/pas-backend-file.c
+++ b/addressbook/backend/pas/pas-backend-file.c
@@ -14,8 +14,12 @@
#ifdef HAVE_DB_185_H
#include <db_185.h>
#else
+#ifdef HAVE_DB1_DB_H
+#include <db1/db.h>
+#else
#include <db.h>
#endif
+#endif
#include "pas-backend-file.h"
#include "pas-book.h"
diff --git a/configure.in b/configure.in
index ebeb4942d2..89a3148581 100644
--- a/configure.in
+++ b/configure.in
@@ -137,8 +137,10 @@ dnl **************************************************
dnl * pas-backend-file stuff.
dnl * check for db_185.h. if it's there, we use it.
dnl * otherwise, we use db.h (since it'll be 185).
+dnl * Except on RH7.0, which puts db in yet another place
dnl **************************************************
AC_CHECK_HEADERS(db_185.h)
+AC_CHECK_HEADERS(db1/db.h)
dnl **************************************************
dnl * ldap related stuff.
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 62abf833ca..06a4521008 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-14 Peter Williams <peterw@helixcode.com>
+
+ * mail-ops.c (do_scan_subfolders): Silence a compile warning.
+
2000-08-13 Jeffrey Stedfast <fejj@helixcode.com>
* mail-crypto.c (mail_crypto_openpgp_encrypt): Added support for
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 59c2f66ecc..3262237e13 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -796,7 +796,7 @@ do_scan_subfolders (gpointer in_data, gpointer op_data, CamelException *ex)
info = g_new (scan_subfolders_folderinfo_t, 1);
info->path = g_strdup_printf ("/%s", (char *) lsub->pdata[i]);
info->uri = g_strdup_printf ("%s%s%s", input->source_uri, splice,
- lsub->pdata[i]);
+ (char *)lsub->pdata[i]);
g_ptr_array_add (data->new_folders, info);
}
diff --git a/mail/mail-threads.h b/mail/mail-threads.h
index b84b71d836..e27f07d789 100644
--- a/mail/mail-threads.h
+++ b/mail/mail-threads.h
@@ -52,9 +52,12 @@ gboolean mail_operation_queue (const mail_operation_spec * spec,
/* User interface hooks for the other thread */
+#if 0
void mail_op_set_percentage (gfloat percentage);
void mail_op_hide_progressbar (void);
void mail_op_show_progressbar (void);
+#endif
+
void mail_op_set_message (gchar * fmt, ...) G_GNUC_PRINTF (1, 2);
void mail_op_error (gchar * fmt, ...) G_GNUC_PRINTF (1, 2);
gboolean mail_op_get_password (gchar * prompt, gboolean secret,