diff options
Diffstat (limited to 'camel/providers/local')
| -rw-r--r-- | camel/providers/local/camel-local-folder.c | 42 | ||||
| -rw-r--r-- | camel/providers/local/camel-local-private.h | 52 |
2 files changed, 44 insertions, 50 deletions
diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c index 80a9a1f1e9..0945f92370 100644 --- a/camel/providers/local/camel-local-folder.c +++ b/camel/providers/local/camel-local-folder.c @@ -1,24 +1,26 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- - * - * Authors: Michael Zucchi <notzed@ximian.com> +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* + * Authors: Michael Zucchi <notzed@ximian.com> * - * Copyright (C) 1999, 2003 Ximian Inc. + * Copyright 1999-2003 Ximian, Inc. (www.ximian.com) * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA */ + #ifdef HAVE_CONFIG_H #include <config.h> #endif @@ -129,9 +131,7 @@ local_init(gpointer object, gpointer klass) local_folder->search = NULL; local_folder->priv = g_malloc0(sizeof(*local_folder->priv)); -#ifdef ENABLE_THREADS local_folder->priv->search_lock = g_mutex_new(); -#endif } static void @@ -162,14 +162,14 @@ local_finalize(CamelObject * object) g_free(local_folder->index_path); camel_folder_change_info_free(local_folder->changes); - -#ifdef ENABLE_THREADS + g_mutex_free(local_folder->priv->search_lock); -#endif + g_free(local_folder->priv); } -CamelType camel_local_folder_get_type(void) +CamelType +camel_local_folder_get_type(void) { static CamelType camel_local_folder_type = CAMEL_INVALID_TYPE; diff --git a/camel/providers/local/camel-local-private.h b/camel/providers/local/camel-local-private.h index 568cec201c..e8e5061fae 100644 --- a/camel/providers/local/camel-local-private.h +++ b/camel/providers/local/camel-local-private.h @@ -1,59 +1,53 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- - * camel-local-private.h: Private info for local provider. +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* + * Authors: Michael Zucchi <notzed@ximian.com> * - * Authors: Michael Zucchi <notzed@ximian.com> + * Copyright 1999-2003 Ximian, Inc. (www.ximian.com) * - * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com) + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA */ -#ifndef CAMEL_PRIVATE_H -#define CAMEL_PRIVATE_H 1 + +#ifndef CAMEL_LOCAL_PRIVATE_H +#define CAMEL_LOCAL_PRIVATE_H 1 #ifdef __cplusplus extern "C" { #pragma } -#endif /* __cplusplus }*/ +#endif /* __cplusplus */ /* need a way to configure and save this data, if this header is to be installed. For now, dont install it */ -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif -#ifdef ENABLE_THREADS #include <pthread.h> -#endif struct _CamelLocalFolderPrivate { -#ifdef ENABLE_THREADS GMutex *search_lock; /* for locking the search object */ -#endif }; -#ifdef ENABLE_THREADS #define CAMEL_LOCAL_FOLDER_LOCK(f, l) (g_mutex_lock(((CamelLocalFolder *)f)->priv->l)) #define CAMEL_LOCAL_FOLDER_UNLOCK(f, l) (g_mutex_unlock(((CamelLocalFolder *)f)->priv->l)) -#else -#define CAMEL_LOCAL_FOLDER_LOCK(f, l) -#define CAMEL_LOCAL_FOLDER_UNLOCK(f, l) -#endif #ifdef __cplusplus } #endif /* __cplusplus */ -#endif /* CAMEL_H */ +#endif /* CAMEL_LOCAL_PRIVATE_H */ |