diff options
Diffstat (limited to 'camel')
| -rw-r--r-- | camel/ChangeLog | 7 | ||||
| -rw-r--r-- | camel/camel-multipart-signed.c | 8 | ||||
| -rw-r--r-- | camel/providers/local/camel-spool-store.c | 10 |
3 files changed, 20 insertions, 5 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 24a9e30db1..d9ca59abe6 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,10 @@ +2003-02-27 Not Zed <NotZed@Ximian.com> + + * camel-multipart-signed.c: Undo jeff's changes. + + * providers/local/camel-spool-store.c (scan_dir): Fix a paste-o in + the object_bag_get key. + 2003-02-26 Jeffrey Stedfast <fejj@ximian.com> * camel-multipart-signed.c: Updated to use g_alloca instead of diff --git a/camel/camel-multipart-signed.c b/camel/camel-multipart-signed.c index 234f58ef1e..79252c85d0 100644 --- a/camel/camel-multipart-signed.c +++ b/camel/camel-multipart-signed.c @@ -24,6 +24,10 @@ #include <config.h> #endif +#ifdef HAVE_ALLOCA_H +#include <alloca.h> +#endif + #include <stdio.h> #include <string.h> @@ -206,7 +210,7 @@ parse_content(CamelMultipartSigned *mps) g_byte_array_set_size(mem->buffer, mem->buffer->len-1); last = mem->buffer->data + mem->buffer->len; - bound = g_alloca(strlen(boundary)+5); + bound = alloca(strlen(boundary)+5); sprintf(bound, "--%s", boundary); start = strstr(mem->buffer->data, bound); @@ -613,7 +617,7 @@ camel_multipart_signed_sign(CamelMultipartSigned *mps, CamelCipherContext *conte /* create the signature wrapper object */ signature = camel_mime_part_new(); dw = camel_data_wrapper_new(); - type = g_alloca(strlen(context->sign_protocol) + 32); + type = alloca(strlen(context->sign_protocol) + 32); sprintf(type, "%s; name=signature.asc", context->sign_protocol); camel_data_wrapper_set_mime_type(dw, type); camel_stream_reset(sigstream); diff --git a/camel/providers/local/camel-spool-store.c b/camel/providers/local/camel-spool-store.c index c8d76f8a63..f1f264f94a 100644 --- a/camel/providers/local/camel-spool-store.c +++ b/camel/providers/local/camel-spool-store.c @@ -23,6 +23,10 @@ #include <config.h> #endif +#ifdef HAVE_ALLOCA_H +#include <alloca.h> +#endif + #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> @@ -273,8 +277,8 @@ static int scan_dir(CamelStore *store, GHashTable *visited, char *root, const ch /* look for folders matching the right structure, recursively */ if (path) { - name = g_alloca (strlen (root) + strlen (path) + 2); - sprintf (name, "%s/%s", root, path); + name = alloca(strlen(root) + strlen(path) + 2); + sprintf(name, "%s/%s", root, path); } else name = root; @@ -346,7 +350,7 @@ static int scan_dir(CamelStore *store, GHashTable *visited, char *root, const ch if (S_ISREG(st.st_mode)) { /* first, see if we already have it open */ - folder = camel_object_bag_get(store->folders, path); + folder = camel_object_bag_get(store->folders, fname); if (folder) { /* should this refresh if ! FAST? */ unread = camel_folder_get_unread_message_count(folder); |