Fix FSF address (Tobias Mueller, #470445)

[platform/upstream/evolution-data-server.git] / camel / camel-digest-store.c

diff --git a/camel/camel-digest-store.c b/camel/camel-digest-store.c
index e3870e3..ebd83cd 100644 (file)
--- a/camel/camel-digest-store.c
+++ b/camel/camel-digest-store.c
@@ -5,18 +5,18 @@
  *  Copyright 2002 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
+ *  it under the terms of the GNU Lesser 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.
+ *  GNU Lesser General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
+ *  You should have received a copy of the GNU Lesser 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.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
 
@@ -27,10 +27,9 @@
 
 #include <string.h>
 
-#include "camel-exception.h"
-#include "camel-digest-store.h"
 #include "camel-digest-folder.h"
-
+#include "camel-digest-store.h"
+#include "camel-exception.h"
 #include "camel-private.h"
 
 #define d(x)
@@ -38,8 +37,8 @@
 static CamelFolder *digest_get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex);
 static void digest_delete_folder (CamelStore *store, const char *folder_name, CamelException *ex);
 static void digest_rename_folder (CamelStore *store, const char *old, const char *new, CamelException *ex);
-static void digest_init_trash (CamelStore *store);
 static CamelFolder *digest_get_trash  (CamelStore *store, CamelException *ex);
+static CamelFolder *digest_get_junk  (CamelStore *store, CamelException *ex);
 
 static CamelFolderInfo *digest_get_folder_info (CamelStore *store, const char *top, guint32 flags, CamelException *ex);
 
@@ -90,8 +89,8 @@ camel_digest_store_class_init (CamelDigestStoreClass *klass)
        store_class->get_folder_info = digest_get_folder_info;
        store_class->free_folder_info = camel_store_free_folder_info_full;
        
-       store_class->init_trash = digest_init_trash;
        store_class->get_trash = digest_get_trash;
+       store_class->get_junk = digest_get_junk;
 }
 
 static void
@@ -99,8 +98,8 @@ camel_digest_store_init (CamelDigestStore *obj)
 {
        CamelStore *store = (CamelStore *) obj;
        
-       /* we dont want a vtrash on this one */
-       store->flags &= ~(CAMEL_STORE_VTRASH);  
+       /* we dont want a vtrash and vjunk on this one */
+       store->flags &= ~(CAMEL_STORE_VTRASH | CAMEL_STORE_VJUNK);      
 }
 
 static void
@@ -154,15 +153,14 @@ digest_get_folder (CamelStore *store, const char *folder_name, guint32 flags, Ca
        return NULL;
 }
 
-static void
-digest_init_trash (CamelStore *store)
+static CamelFolder *
+digest_get_trash (CamelStore *store, CamelException *ex)
 {
-       /* no-op */
-       ;
+       return NULL;
 }
 
 static CamelFolder *
-digest_get_trash (CamelStore *store, CamelException *ex)
+digest_get_junk (CamelStore *store, CamelException *ex)
 {
        return NULL;
 }