summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Zeuthen <davidz@redhat.com>2011-05-26 13:15:09 -0400
committerDavid Zeuthen <davidz@redhat.com>2011-05-26 13:15:09 -0400
commit5bcbe2a3eac4821892680e0655b27ab8c128ab15 (patch)
tree648ae06a9ac23139b4d2cc4424fbc0dc7e191bd9
parentb1db07ef8be9405a572afebd87e06f6bdd0b1e06 (diff)
Nuke service-specific interfaces
They're not needed as the UI front-ends will access the Key/Value files directly Signed-off-by: David Zeuthen <davidz@redhat.com>
-rw-r--r--data/dbus-interfaces.xml98
-rw-r--r--doc/goa-docs.xml11
-rw-r--r--doc/goa-sections.txt184
-rw-r--r--doc/goa.types12
-rw-r--r--src/goabackend/goafacebookprovider.c12
-rw-r--r--src/goabackend/goagoogleprovider.c12
-rw-r--r--src/goabackend/goatwitterprovider.c12
-rw-r--r--src/goabackend/goayahooprovider.c12
8 files changed, 0 insertions, 353 deletions
diff --git a/data/dbus-interfaces.xml b/data/dbus-interfaces.xml
index a5f1463..76edf37 100644
--- a/data/dbus-interfaces.xml
+++ b/data/dbus-interfaces.xml
@@ -101,104 +101,6 @@
</interface>
<!--
- org.gnome.OnlineAccounts.GoogleAccount:
-
- A Google Account, either a <emphasis>hosted</emphasis> account
- (for example <email>user&#64;mycollege.edu</email>) or a regular
- account (for example <email>user&#64;gmail.com</email>).
-
- Objects implementing this interface also implement the
- #org.gnome.OnlineAccounts.Account and
- #org.gnome.OnlineAccounts.OAuthBased interfaces.
-
- The object may implement #org.gnome.OnlineAccounts.Mail,
- #org.gnome.OnlineAccounts.Calendar and
- #org.gnome.OnlineAccounts.Contacts depending on the account and
- the user's preferences.
-
- When creating this kind of account via the
- org.gnome.OnlineAccounts.Manager.AddAccount() method, you need
- to include an <literal>Identity</literal>,
- <literal>MailEnabled</literal>,
- <literal>CalendarEnabled</literal>
- and <literal>ContactsEnabled</literal> elements in the @details
- parameter.
- -->
- <interface name="org.gnome.OnlineAccounts.GoogleAccount">
- <!-- EmailAddress: The email address identifying the account.
-
- This value cannot be changed once set.
- -->
- <property name="EmailAddress" type="s" access="read"/>
- </interface>
-
- <!--
- org.gnome.OnlineAccounts.FacebookAccount:
-
- A Facebook Account.
-
- Objects implementing this interface also implement the
- #org.gnome.OnlineAccounts.Account and
- #org.gnome.OnlineAccounts.OAuth2Based interfaces.
-
- When creating this kind of account via the
- org.gnome.OnlineAccounts.Manager.AddAccount() method, you need
- to include an <literal>Identity</literal> element in the
- @details parameter.
- -->
- <interface name="org.gnome.OnlineAccounts.FacebookAccount">
- <!-- UserName: The user name identifying the account.
-
- This value cannot be changed once set.
- -->
- <property name="UserName" type="s" access="read"/>
- </interface>
-
- <!--
- org.gnome.OnlineAccounts.YahooAccount:
-
- A Yahoo Account.
-
- Objects implementing this interface also implement the
- #org.gnome.OnlineAccounts.Account and
- #org.gnome.OnlineAccounts.OAuthBased interfaces.
-
- When creating this kind of account via the
- org.gnome.OnlineAccounts.Manager.AddAccount() method, you need
- to include an <literal>Identity</literal> element in the
- @details parameter.
- -->
- <interface name="org.gnome.OnlineAccounts.YahooAccount">
- <!-- GUID: The guid identifying the account.
-
- This value cannot be changed once set.
- -->
- <property name="GUID" type="s" access="read"/>
- </interface>
-
- <!--
- org.gnome.OnlineAccounts.TwitterAccount:
-
- A Twitter Account.
-
- Objects implementing this interface also implement the
- #org.gnome.OnlineAccounts.Account and
- #org.gnome.OnlineAccounts.OAuthBased interfaces.
-
- When creating this kind of account via the
- org.gnome.OnlineAccounts.Manager.AddAccount() method, you need
- to include an <literal>Identity</literal> element in the
- @details parameter.
- -->
- <interface name="org.gnome.OnlineAccounts.TwitterAccount">
- <!-- Id: The user id identifying the account.
-
- This value cannot be changed once set.
- -->
- <property name="Id" type="s" access="read"/>
- </interface>
-
- <!--
org.gnome.OnlineAccounts.OAuth2Based:
An account object implements this interface if <ulink
diff --git a/doc/goa-docs.xml b/doc/goa-docs.xml
index 994c716..ca3d742 100644
--- a/doc/goa-docs.xml
+++ b/doc/goa-docs.xml
@@ -114,13 +114,6 @@
<xi:include href="../src/goa/goa-generated-doc-org.gnome.OnlineAccounts.Calendar.xml"/>
<xi:include href="../src/goa/goa-generated-doc-org.gnome.OnlineAccounts.Contacts.xml"/>
</chapter>
- <chapter>
- <title>Provider-specific Interfaces</title>
- <xi:include href="../src/goa/goa-generated-doc-org.gnome.OnlineAccounts.GoogleAccount.xml"/>
- <xi:include href="../src/goa/goa-generated-doc-org.gnome.OnlineAccounts.FacebookAccount.xml"/>
- <xi:include href="../src/goa/goa-generated-doc-org.gnome.OnlineAccounts.YahooAccount.xml"/>
- <xi:include href="../src/goa/goa-generated-doc-org.gnome.OnlineAccounts.TwitterAccount.xml"/>
- </chapter>
</part>
<part id="ref-library">
@@ -140,10 +133,6 @@
<xi:include href="xml/GoaMailMonitor.xml"/>
<xi:include href="xml/GoaCalendar.xml"/>
<xi:include href="xml/GoaContacts.xml"/>
- <xi:include href="xml/GoaGoogleAccount.xml"/>
- <xi:include href="xml/GoaFacebookAccount.xml"/>
- <xi:include href="xml/GoaYahooAccount.xml"/>
- <xi:include href="xml/GoaTwitterAccount.xml"/>
</chapter>
</part>
diff --git a/doc/goa-sections.txt b/doc/goa-sections.txt
index 26153b3..66f6f50 100644
--- a/doc/goa-sections.txt
+++ b/doc/goa-sections.txt
@@ -49,10 +49,6 @@ GoaObject
GoaObjectIface
goa_object_get_manager
goa_object_get_account
-goa_object_get_google_account
-goa_object_get_facebook_account
-goa_object_get_yahoo_account
-goa_object_get_twitter_account
goa_object_get_password_based
goa_object_get_oauth_based
goa_object_get_oauth2_based
@@ -62,10 +58,6 @@ goa_object_get_calendar
goa_object_get_contacts
goa_object_peek_manager
goa_object_peek_account
-goa_object_peek_google_account
-goa_object_peek_facebook_account
-goa_object_peek_yahoo_account
-goa_object_peek_twitter_account
goa_object_peek_password_based
goa_object_peek_oauth_based
goa_object_peek_oauth2_based
@@ -81,10 +73,6 @@ GoaObjectSkeletonClass
goa_object_skeleton_new
goa_object_skeleton_set_manager
goa_object_skeleton_set_account
-goa_object_skeleton_set_google_account
-goa_object_skeleton_set_facebook_account
-goa_object_skeleton_set_yahoo_account
-goa_object_skeleton_set_twitter_account
goa_object_skeleton_set_password_based
goa_object_skeleton_set_oauth_based
goa_object_skeleton_set_oauth2_based
@@ -178,178 +166,6 @@ goa_account_skeleton_get_type
</SECTION>
<SECTION>
-<FILE>GoaGoogleAccount</FILE>
-GoaGoogleAccount
-GoaGoogleAccountIface
-goa_google_account_interface_info
-goa_google_account_override_properties
-goa_google_account_get_email_address
-goa_google_account_set_email_address
-GoaGoogleAccountProxy
-GoaGoogleAccountProxyClass
-goa_google_account_proxy_new
-goa_google_account_proxy_new_finish
-goa_google_account_proxy_new_sync
-goa_google_account_proxy_new_for_bus
-goa_google_account_proxy_new_for_bus_finish
-goa_google_account_proxy_new_for_bus_sync
-GoaGoogleAccountSkeleton
-GoaGoogleAccountSkeletonClass
-goa_google_account_skeleton_new
-<SUBSECTION Standard>
-GOA_TYPE_GOOGLE_ACCOUNT
-GOA_IS_GOOGLE_ACCOUNT
-GOA_GOOGLE_ACCOUNT
-GOA_GOOGLE_ACCOUNT_GET_IFACE
-GOA_TYPE_GOOGLE_ACCOUNT_PROXY
-GOA_IS_GOOGLE_ACCOUNT_PROXY
-GOA_IS_GOOGLE_ACCOUNT_PROXY_CLASS
-GOA_GOOGLE_ACCOUNT_PROXY
-GOA_GOOGLE_ACCOUNT_PROXY_CLASS
-GOA_GOOGLE_ACCOUNT_PROXY_GET_CLASS
-GOA_TYPE_GOOGLE_ACCOUNT_SKELETON
-GOA_IS_GOOGLE_ACCOUNT_SKELETON
-GOA_IS_GOOGLE_ACCOUNT_SKELETON_CLASS
-GOA_GOOGLE_ACCOUNT_SKELETON
-GOA_GOOGLE_ACCOUNT_SKELETON_CLASS
-GOA_GOOGLE_ACCOUNT_SKELETON_GET_CLASS
-GoaGoogleAccountProxyPrivate
-GoaGoogleAccountSkeletonPrivate
-goa_google_account_get_type
-goa_google_account_proxy_get_type
-goa_google_account_skeleton_get_type
-</SECTION>
-
-<SECTION>
-<FILE>GoaFacebookAccount</FILE>
-GoaFacebookAccount
-GoaFacebookAccountIface
-goa_facebook_account_interface_info
-goa_facebook_account_override_properties
-goa_facebook_account_get_user_name
-goa_facebook_account_set_user_name
-GoaFacebookAccountProxy
-GoaFacebookAccountProxyClass
-goa_facebook_account_proxy_new
-goa_facebook_account_proxy_new_finish
-goa_facebook_account_proxy_new_sync
-goa_facebook_account_proxy_new_for_bus
-goa_facebook_account_proxy_new_for_bus_finish
-goa_facebook_account_proxy_new_for_bus_sync
-GoaFacebookAccountSkeleton
-GoaFacebookAccountSkeletonClass
-goa_facebook_account_skeleton_new
-<SUBSECTION Standard>
-GOA_TYPE_FACEBOOK_ACCOUNT
-GOA_IS_FACEBOOK_ACCOUNT
-GOA_FACEBOOK_ACCOUNT
-GOA_FACEBOOK_ACCOUNT_GET_IFACE
-GOA_TYPE_FACEBOOK_ACCOUNT_PROXY
-GOA_IS_FACEBOOK_ACCOUNT_PROXY
-GOA_IS_FACEBOOK_ACCOUNT_PROXY_CLASS
-GOA_FACEBOOK_ACCOUNT_PROXY
-GOA_FACEBOOK_ACCOUNT_PROXY_CLASS
-GOA_FACEBOOK_ACCOUNT_PROXY_GET_CLASS
-GOA_TYPE_FACEBOOK_ACCOUNT_SKELETON
-GOA_IS_FACEBOOK_ACCOUNT_SKELETON
-GOA_IS_FACEBOOK_ACCOUNT_SKELETON_CLASS
-GOA_FACEBOOK_ACCOUNT_SKELETON
-GOA_FACEBOOK_ACCOUNT_SKELETON_CLASS
-GOA_FACEBOOK_ACCOUNT_SKELETON_GET_CLASS
-GoaFacebookAccountProxyPrivate
-GoaFacebookAccountSkeletonPrivate
-goa_facebook_account_get_type
-goa_facebook_account_proxy_get_type
-goa_facebook_account_skeleton_get_type
-</SECTION>
-
-<SECTION>
-<FILE>GoaYahooAccount</FILE>
-GoaYahooAccount
-GoaYahooAccountIface
-goa_yahoo_account_interface_info
-goa_yahoo_account_override_properties
-goa_yahoo_account_get_guid
-goa_yahoo_account_set_guid
-GoaYahooAccountProxy
-GoaYahooAccountProxyClass
-goa_yahoo_account_proxy_new
-goa_yahoo_account_proxy_new_finish
-goa_yahoo_account_proxy_new_sync
-goa_yahoo_account_proxy_new_for_bus
-goa_yahoo_account_proxy_new_for_bus_finish
-goa_yahoo_account_proxy_new_for_bus_sync
-GoaYahooAccountSkeleton
-GoaYahooAccountSkeletonClass
-goa_yahoo_account_skeleton_new
-<SUBSECTION Standard>
-GOA_TYPE_YAHOO_ACCOUNT
-GOA_IS_YAHOO_ACCOUNT
-GOA_YAHOO_ACCOUNT
-GOA_YAHOO_ACCOUNT_GET_IFACE
-GOA_TYPE_YAHOO_ACCOUNT_PROXY
-GOA_IS_YAHOO_ACCOUNT_PROXY
-GOA_IS_YAHOO_ACCOUNT_PROXY_CLASS
-GOA_YAHOO_ACCOUNT_PROXY
-GOA_YAHOO_ACCOUNT_PROXY_CLASS
-GOA_YAHOO_ACCOUNT_PROXY_GET_CLASS
-GOA_TYPE_YAHOO_ACCOUNT_SKELETON
-GOA_IS_YAHOO_ACCOUNT_SKELETON
-GOA_IS_YAHOO_ACCOUNT_SKELETON_CLASS
-GOA_YAHOO_ACCOUNT_SKELETON
-GOA_YAHOO_ACCOUNT_SKELETON_CLASS
-GOA_YAHOO_ACCOUNT_SKELETON_GET_CLASS
-GoaYahooAccountProxyPrivate
-GoaYahooAccountSkeletonPrivate
-goa_yahoo_account_get_type
-goa_yahoo_account_proxy_get_type
-goa_yahoo_account_skeleton_get_type
-</SECTION>
-
-<SECTION>
-<FILE>GoaTwitterAccount</FILE>
-GoaTwitterAccount
-GoaTwitterAccountIface
-goa_twitter_account_interface_info
-goa_twitter_account_override_properties
-goa_twitter_account_get_id
-goa_twitter_account_set_id
-GoaTwitterAccountProxy
-GoaTwitterAccountProxyClass
-goa_twitter_account_proxy_new
-goa_twitter_account_proxy_new_finish
-goa_twitter_account_proxy_new_sync
-goa_twitter_account_proxy_new_for_bus
-goa_twitter_account_proxy_new_for_bus_finish
-goa_twitter_account_proxy_new_for_bus_sync
-GoaTwitterAccountSkeleton
-GoaTwitterAccountSkeletonClass
-goa_twitter_account_skeleton_new
-<SUBSECTION Standard>
-GOA_TYPE_TWITTER_ACCOUNT
-GOA_IS_TWITTER_ACCOUNT
-GOA_TWITTER_ACCOUNT
-GOA_TWITTER_ACCOUNT_GET_IFACE
-GOA_TYPE_TWITTER_ACCOUNT_PROXY
-GOA_IS_TWITTER_ACCOUNT_PROXY
-GOA_IS_TWITTER_ACCOUNT_PROXY_CLASS
-GOA_TWITTER_ACCOUNT_PROXY
-GOA_TWITTER_ACCOUNT_PROXY_CLASS
-GOA_TWITTER_ACCOUNT_PROXY_GET_CLASS
-GOA_TYPE_TWITTER_ACCOUNT_SKELETON
-GOA_IS_TWITTER_ACCOUNT_SKELETON
-GOA_IS_TWITTER_ACCOUNT_SKELETON_CLASS
-GOA_TWITTER_ACCOUNT_SKELETON
-GOA_TWITTER_ACCOUNT_SKELETON_CLASS
-GOA_TWITTER_ACCOUNT_SKELETON_GET_CLASS
-GoaTwitterAccountProxyPrivate
-GoaTwitterAccountSkeletonPrivate
-goa_twitter_account_get_type
-goa_twitter_account_proxy_get_type
-goa_twitter_account_skeleton_get_type
-</SECTION>
-
-<SECTION>
<FILE>GoaOAuth2Based</FILE>
GoaOAuth2Based
GoaOAuth2BasedIface
diff --git a/doc/goa.types b/doc/goa.types
index 683660b..71b9622 100644
--- a/doc/goa.types
+++ b/doc/goa.types
@@ -2,18 +2,6 @@ goa_client_get_type
goa_account_get_type
goa_account_proxy_get_type
goa_account_skeleton_get_type
-goa_google_account_get_type
-goa_google_account_proxy_get_type
-goa_google_account_skeleton_get_type
-goa_facebook_account_get_type
-goa_facebook_account_proxy_get_type
-goa_facebook_account_skeleton_get_type
-goa_yahoo_account_get_type
-goa_yahoo_account_proxy_get_type
-goa_yahoo_account_skeleton_get_type
-goa_twitter_account_get_type
-goa_twitter_account_proxy_get_type
-goa_twitter_account_skeleton_get_type
goa_manager_get_type
goa_manager_proxy_get_type
goa_manager_skeleton_get_type
diff --git a/src/goabackend/goafacebookprovider.c b/src/goabackend/goafacebookprovider.c
index 051a4f8..ba37182 100644
--- a/src/goabackend/goafacebookprovider.c
+++ b/src/goabackend/goafacebookprovider.c
@@ -222,13 +222,11 @@ build_object (GoaProvider *provider,
GError **error)
{
GoaAccount *account;
- GoaFacebookAccount *facebook_account;
gboolean ret;
gchar *user_name;
user_name = NULL;
account = NULL;
- facebook_account = NULL;
ret = FALSE;
/* Chain up */
@@ -240,12 +238,6 @@ build_object (GoaProvider *provider,
goto out;
account = goa_object_get_account (GOA_OBJECT (object));
- facebook_account = goa_object_get_facebook_account (GOA_OBJECT (object));
- if (facebook_account == NULL)
- {
- facebook_account = goa_facebook_account_skeleton_new ();
- goa_object_skeleton_set_facebook_account (object, facebook_account);
- }
user_name = g_key_file_get_string (key_file, group, "Identity", NULL);
if (user_name == NULL)
@@ -259,13 +251,9 @@ build_object (GoaProvider *provider,
goto out;
}
- goa_facebook_account_set_user_name (facebook_account, user_name);
-
ret = TRUE;
out:
- if (facebook_account != NULL)
- g_object_unref (facebook_account);
if (account != NULL)
g_object_unref (account);
return ret;
diff --git a/src/goabackend/goagoogleprovider.c b/src/goabackend/goagoogleprovider.c
index 5f35386..1e0364e 100644
--- a/src/goabackend/goagoogleprovider.c
+++ b/src/goabackend/goagoogleprovider.c
@@ -252,7 +252,6 @@ build_object (GoaProvider *provider,
GError **error)
{
GoaAccount *account;
- GoaGoogleAccount *google_account;
GoaMail *mail;
GoaCalendar *calendar;
GoaContacts *contacts;
@@ -264,7 +263,6 @@ build_object (GoaProvider *provider,
email_address = NULL;
account = NULL;
- google_account = NULL;
mail = NULL;
calendar = NULL;
contacts = NULL;
@@ -279,12 +277,6 @@ build_object (GoaProvider *provider,
goto out;
account = goa_object_get_account (GOA_OBJECT (object));
- google_account = goa_object_get_google_account (GOA_OBJECT (object));
- if (google_account == NULL)
- {
- google_account = goa_google_account_skeleton_new ();
- goa_object_skeleton_set_google_account (object, google_account);
- }
email_address = g_key_file_get_string (key_file, group, "Identity", NULL);
if (email_address == NULL /* || !is_valid_email_address () */)
@@ -298,8 +290,6 @@ build_object (GoaProvider *provider,
goto out;
}
- goa_google_account_set_email_address (google_account, email_address);
-
mail = goa_object_get_mail (GOA_OBJECT (object));
mail_enabled = g_key_file_get_boolean (key_file, group, "MailEnabled", NULL);
if (mail_enabled)
@@ -377,8 +367,6 @@ build_object (GoaProvider *provider,
g_object_unref (calendar);
if (mail != NULL)
g_object_unref (mail);
- if (google_account != NULL)
- g_object_unref (google_account);
if (account != NULL)
g_object_unref (account);
return ret;
diff --git a/src/goabackend/goatwitterprovider.c b/src/goabackend/goatwitterprovider.c
index 6db0236..52681ec 100644
--- a/src/goabackend/goatwitterprovider.c
+++ b/src/goabackend/goatwitterprovider.c
@@ -242,13 +242,11 @@ build_object (GoaProvider *provider,
GError **error)
{
GoaAccount *account;
- GoaTwitterAccount *twitter_account;
gboolean ret;
gchar *id;
id = NULL;
account = NULL;
- twitter_account = NULL;
ret = FALSE;
/* Chain up */
@@ -260,12 +258,6 @@ build_object (GoaProvider *provider,
goto out;
account = goa_object_get_account (GOA_OBJECT (object));
- twitter_account = goa_object_get_twitter_account (GOA_OBJECT (object));
- if (twitter_account == NULL)
- {
- twitter_account = goa_twitter_account_skeleton_new ();
- goa_object_skeleton_set_twitter_account (object, twitter_account);
- }
id = g_key_file_get_string (key_file, group, "Identity", NULL);
if (id == NULL)
@@ -279,14 +271,10 @@ build_object (GoaProvider *provider,
goto out;
}
- goa_twitter_account_set_id (twitter_account, id);
-
ret = TRUE;
out:
g_free (id);
- if (twitter_account != NULL)
- g_object_unref (twitter_account);
if (account != NULL)
g_object_unref (account);
return ret;
diff --git a/src/goabackend/goayahooprovider.c b/src/goabackend/goayahooprovider.c
index 8c89dd8..f62ea4f 100644
--- a/src/goabackend/goayahooprovider.c
+++ b/src/goabackend/goayahooprovider.c
@@ -283,13 +283,11 @@ build_object (GoaProvider *provider,
GError **error)
{
GoaAccount *account;
- GoaYahooAccount *yahoo_account;
gboolean ret;
gchar *guid;
guid = NULL;
account = NULL;
- yahoo_account = NULL;
ret = FALSE;
/* Chain up */
@@ -301,12 +299,6 @@ build_object (GoaProvider *provider,
goto out;
account = goa_object_get_account (GOA_OBJECT (object));
- yahoo_account = goa_object_get_yahoo_account (GOA_OBJECT (object));
- if (yahoo_account == NULL)
- {
- yahoo_account = goa_yahoo_account_skeleton_new ();
- goa_object_skeleton_set_yahoo_account (object, yahoo_account);
- }
guid = g_key_file_get_string (key_file, group, "Identity", NULL);
if (guid == NULL)
@@ -320,14 +312,10 @@ build_object (GoaProvider *provider,
goto out;
}
- goa_yahoo_account_set_guid (yahoo_account, guid);
-
ret = TRUE;
out:
g_free (guid);
- if (yahoo_account != NULL)
- g_object_unref (yahoo_account);
if (account != NULL)
g_object_unref (account);
return ret;