Rename GoaGenericProvider to GoaGenericMailProvider

Signed-off-by: David Zeuthen <davidz@redhat.com>

9 files changed, 45 insertions, 45 deletions

diff --git a/doc/goa-docs.xml b/doc/goa-docs.xml
index 428ffe4..61f5953 100644
--- a/doc/goa-docs.xml
+++ b/doc/goa-docs.xml
@@ -133,7 +133,7 @@
     <title>Backend Library API Reference</title>
       <xi:include href="xml/goalog.xml"/>
       <xi:include href="xml/goaprovider.xml"/>
-      <xi:include href="xml/goagenericprovider.xml"/>
+      <xi:include href="xml/goagenericmailprovider.xml"/>
       <xi:include href="xml/goaoauthprovider.xml"/>
       <xi:include href="xml/goaoauth2provider.xml"/>
       <xi:include href="xml/goagoogleprovider.xml"/>
diff --git a/doc/goa-sections.txt b/doc/goa-sections.txt
index b329bb1..614492c 100644
--- a/doc/goa-sections.txt
+++ b/doc/goa-sections.txt
@@ -563,13 +563,13 @@ goa_oauth_provider_get_type
 </SECTION>
 
 <SECTION>
-<FILE>goagenericprovider</FILE>
-GoaGenericProvider
+<FILE>goagenericmailprovider</FILE>
+GoaGenericMailProvider
 <SUBSECTION Standard>
-GOA_GENERIC_PROVIDER
-GOA_IS_GENERIC_PROVIDER
-GOA_TYPE_GENERIC_PROVIDER
-goa_generic_provider_get_type
+GOA_GENERIC_MAIL_PROVIDER
+GOA_IS_GENERIC_MAIL_PROVIDER
+GOA_TYPE_GENERIC_MAIL_PROVIDER
+goa_generic_mail_provider_get_type
 </SECTION>
 
 <SECTION>
diff --git a/doc/goa.types b/doc/goa.types
index 1eb1531..87163c8 100644
--- a/doc/goa.types
+++ b/doc/goa.types
@@ -31,7 +31,7 @@ goa_mail_monitor_proxy_get_type
 goa_mail_monitor_skeleton_get_type
 
 goa_provider_get_type
-goa_generic_provider_get_type
+goa_generic_mail_provider_get_type
 goa_oauth_provider_get_type
 goa_oauth2_provider_get_type
 goa_google_provider_get_type
diff --git a/src/goabackend/Makefile.am b/src/goabackend/Makefile.am
index fdf832e..3a9d22e 100644
--- a/src/goabackend/Makefile.am
+++ b/src/goabackend/Makefile.am
@@ -45,7 +45,7 @@ libgoa_backend_1_0_la_HEADERS =						\
 	goabackendenumtypes.h						\
 	goalogging.h							\
 	goaprovider.h							\
-	goagenericprovider.h						\
+	goagenericmailprovider.h					\
 	goaoauthprovider.h						\
 	goaoauth2provider.h						\
 	goagoogleprovider.h						\
@@ -66,7 +66,7 @@ libgoa_backend_1_0_la_SOURCES =						\
 	goabackendenumtypes.h		goabackendenumtypes.c		\
 	goaprovider.h			goaprovider.c			\
 	goalogging.h			goalogging.c			\
-	goagenericprovider.h		goagenericprovider.c		\
+	goagenericmailprovider.h	goagenericmailprovider.c	\
 	goaoauthprovider.h		goaoauthprovider.c		\
 	goaoauth2provider.h		goaoauth2provider.c		\
 	goagoogleprovider.h		goagoogleprovider.c		\
diff --git a/src/goabackend/goabackend.h b/src/goabackend/goabackend.h
index 909b6bf..46b5c77 100644
--- a/src/goabackend/goabackend.h
+++ b/src/goabackend/goabackend.h
@@ -31,7 +31,7 @@
 #include <goabackend/goabackendtypes.h>
 #include <goabackend/goalogging.h>
 #include <goabackend/goaprovider.h>
-#include <goabackend/goagenericprovider.h>
+#include <goabackend/goagenericmailprovider.h>
 #include <goabackend/goaoauthprovider.h>
 #include <goabackend/goaoauth2provider.h>
 #include <goabackend/goagoogleprovider.h>
diff --git a/src/goabackend/goabackendtypes.h b/src/goabackend/goabackendtypes.h
index 65b20da..7087e80 100644
--- a/src/goabackend/goabackendtypes.h
+++ b/src/goabackend/goabackendtypes.h
@@ -36,8 +36,8 @@ G_BEGIN_DECLS
 struct _GoaProvider;
 typedef struct _GoaProvider GoaProvider;
 
-struct _GoaGenericProvider;
-typedef struct _GoaGenericProvider GoaGenericProvider;
+struct _GoaGenericMailProvider;
+typedef struct _GoaGenericMailProvider GoaGenericMailProvider;
 
 struct _GoaOAuthProvider;
 typedef struct _GoaOAuthProvider GoaOAuthProvider;
diff --git a/src/goabackend/goagenericprovider.c b/src/goabackend/goagenericmailprovider.c
index f35256f..e30a9a0 100644
--- a/src/goabackend/goagenericprovider.c
+++ b/src/goabackend/goagenericmailprovider.c
@@ -24,43 +24,43 @@
 #include <glib/gi18n-lib.h>
 
 #include "goaprovider.h"
-#include "goagenericprovider.h"
+#include "goagenericmailprovider.h"
 #include "goaimapauthlogin.h"
 
 #include "goaimapmail.h"
 
 /**
- * GoaGenericProvider:
+ * GoaGenericMailProvider:
  *
- * The #GoaGenericProvider structure contains only private data and should
+ * The #GoaGenericMailProvider structure contains only private data and should
  * only be accessed using the provided API.
  */
-struct _GoaGenericProvider
+struct _GoaGenericMailProvider
 {
   /*< private >*/
   GoaProvider parent_instance;
 };
 
-typedef struct _GoaGenericProviderClass GoaGenericProviderClass;
+typedef struct _GoaGenericMailProviderClass GoaGenericMailProviderClass;
 
-struct _GoaGenericProviderClass
+struct _GoaGenericMailProviderClass
 {
   GoaProviderClass parent_class;
 };
 
 /**
- * SECTION:goagenericprovider
- * @title: GoaGenericProvider
- * @short_description: A provider for standards-based Internet services
+ * SECTION:goagenericmailprovider
+ * @title: GoaGenericMailProvider
+ * @short_description: A provider for standards-based mail servers
  *
- * #GoaGenericProvider is used to access generic standards-based
- * Internet services.
+ * #GoaGenericMailProvider is used to access standards-based Internet
+ * mail servers.
  */
 
-G_DEFINE_TYPE_WITH_CODE (GoaGenericProvider, goa_generic_provider, GOA_TYPE_PROVIDER,
+G_DEFINE_TYPE_WITH_CODE (GoaGenericMailProvider, goa_generic_mail_provider, GOA_TYPE_PROVIDER,
                          g_io_extension_point_implement (GOA_PROVIDER_EXTENSION_POINT_NAME,
 							 g_define_type_id,
-							 "generic",
+							 "generic_mail",
 							 0));
 
 /* ---------------------------------------------------------------------------------------------------- */
@@ -68,13 +68,13 @@ G_DEFINE_TYPE_WITH_CODE (GoaGenericProvider, goa_generic_provider, GOA_TYPE_PROV
 static const gchar *
 get_provider_type (GoaProvider *_provider)
 {
-  return "generic";
+  return "generic_mail";
 }
 
 static const gchar *
 get_name (GoaProvider *_provider)
 {
-  return _("Generic Account");
+  return _("Mail Server");
 }
 
 /* ---------------------------------------------------------------------------------------------------- */
@@ -103,11 +103,11 @@ build_object (GoaProvider         *provider,
   ret = FALSE;
 
   /* Chain up */
-  if (!GOA_PROVIDER_CLASS (goa_generic_provider_parent_class)->build_object (provider,
-                                                                             object,
-                                                                             key_file,
-                                                                             group,
-                                                                             error))
+  if (!GOA_PROVIDER_CLASS (goa_generic_mail_provider_parent_class)->build_object (provider,
+                                                                                  object,
+                                                                                  key_file,
+                                                                                  group,
+                                                                                  error))
     goto out;
 
   account = goa_object_get_account (GOA_OBJECT (object));
@@ -118,7 +118,7 @@ build_object (GoaProvider         *provider,
   imap_ignore_bad_tls = g_key_file_get_boolean (key_file, group, "ImapIgnoreBadTls", NULL);
   imap_user_name = g_key_file_get_string (key_file, group, "ImapUserName", NULL);
   imap_password = g_key_file_get_string (key_file, group, "ImapPassword", NULL);
-  /* TODO: want this from the keyring */
+
   mail = goa_object_get_mail (GOA_OBJECT (object));
   if (imap_host_and_port != NULL)
     {
@@ -170,12 +170,12 @@ ensure_credentials_sync (GoaProvider         *provider,
 /* ---------------------------------------------------------------------------------------------------- */
 
 static void
-goa_generic_provider_init (GoaGenericProvider *client)
+goa_generic_mail_provider_init (GoaGenericMailProvider *client)
 {
 }
 
 static void
-goa_generic_provider_class_init (GoaGenericProviderClass *klass)
+goa_generic_mail_provider_class_init (GoaGenericMailProviderClass *klass)
 {
   GoaProviderClass *provider_class;
 
diff --git a/src/goabackend/goagenericprovider.h b/src/goabackend/goagenericmailprovider.h
index 77003a2..b8a74bf 100644
--- a/src/goabackend/goagenericprovider.h
+++ b/src/goabackend/goagenericmailprovider.h
@@ -24,19 +24,19 @@
 #error "Only <goabackend/goabackend.h> can be included directly."
 #endif
 
-#ifndef __GOA_GENERIC_PROVIDER_H__
-#define __GOA_GENERIC_PROVIDER_H__
+#ifndef __GOA_GENERIC_MAIL_PROVIDER_H__
+#define __GOA_GENERIC_MAIL_PROVIDER_H__
 
 #include <goabackend/goabackendtypes.h>
 
 G_BEGIN_DECLS
 
-#define GOA_TYPE_GENERIC_PROVIDER   (goa_generic_provider_get_type ())
-#define GOA_GENERIC_PROVIDER(o)     (G_TYPE_CHECK_INSTANCE_CAST ((o), GOA_TYPE_GENERIC_PROVIDER, GoaGenericProvider))
-#define GOA_IS_GENERIC_PROVIDER(o)  (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOA_TYPE_GENERIC_PROVIDER))
+#define GOA_TYPE_GENERIC_MAIL_PROVIDER   (goa_generic_mail_provider_get_type ())
+#define GOA_GENERIC_MAIL_PROVIDER(o)     (G_TYPE_CHECK_INSTANCE_CAST ((o), GOA_TYPE_GENERIC_MAIL_PROVIDER, GoaGenericMailProvider))
+#define GOA_IS_GENERIC_MAIL_PROVIDER(o)  (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOA_TYPE_GENERIC_MAIL_PROVIDER))
 
-GType goa_generic_provider_get_type (void) G_GNUC_CONST;
+GType goa_generic_mail_provider_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif /* __GOA_GENERIC_PROVIDER_H__ */
+#endif /* __GOA_GENERIC_MAIL_PROVIDER_H__ */
diff --git a/src/goabackend/goaprovider.c b/src/goabackend/goaprovider.c
index e901829..7e6cc7a 100644
--- a/src/goabackend/goaprovider.c
+++ b/src/goabackend/goaprovider.c
@@ -29,7 +29,7 @@
 #include "goafacebookprovider.h"
 #include "goayahooprovider.h"
 #include "goatwitterprovider.h"
-#include "goagenericprovider.h"
+#include "goagenericmailprovider.h"
 
 /**
  * SECTION:goaprovider
@@ -451,7 +451,7 @@ ensure_ep_and_builtins (void)
       type = GOA_TYPE_FACEBOOK_PROVIDER;
       type = GOA_TYPE_YAHOO_PROVIDER;
       type = GOA_TYPE_TWITTER_PROVIDER;
-      type = GOA_TYPE_GENERIC_PROVIDER;
+      type = GOA_TYPE_GENERIC_MAIL_PROVIDER;
       type = type; /* for -Wunused-but-set-variable */
 
       g_once_init_leave (&once_init_value, 1);