diff options
| -rw-r--r-- | data/gabble.manager | 9 | ||||
| -rw-r--r-- | src/gabble-connection-manager.c | 15 |
2 files changed, 2 insertions, 22 deletions
diff --git a/data/gabble.manager b/data/gabble.manager index a37ecda5..5595a69d 100644 --- a/data/gabble.manager +++ b/data/gabble.manager @@ -2,17 +2,10 @@ Name = gabble BusName = org.freedesktop.Telepathy.ConnectionManager.gabble ObjectPath = /org/freedesktop/Telepathy/ConnectionManager/gabble -Protos = jabber,google-talk +Protos = jabber [Proto jabber] MandatoryParams = s:account,s:password OptionalParams = s:server,q:port,b:old-ssl default-port = 5222 default-old-ssl = 0 - -[Proto google-talk] -MandatoryParams = s:account,s:password -OptionalParams = s:server,q:port,b:old-ssl -default-server = talk.google.com -default-port = 5223 -default-old-ssl = 1 diff --git a/src/gabble-connection-manager.c b/src/gabble-connection-manager.c index 9e50690b..6b7e56b3 100644 --- a/src/gabble-connection-manager.c +++ b/src/gabble-connection-manager.c @@ -154,15 +154,6 @@ struct _GabbleParamSpec { const gsize offset; }; -static const GabbleParamSpec google_talk_params[] = { - { "account", DBUS_TYPE_STRING_AS_STRING, G_TYPE_STRING, TRUE, NULL, G_STRUCT_OFFSET(GabbleParams, account) }, - { "password", DBUS_TYPE_STRING_AS_STRING, G_TYPE_STRING, TRUE, NULL, G_STRUCT_OFFSET(GabbleParams, password) }, - { "server", DBUS_TYPE_STRING_AS_STRING, G_TYPE_STRING, FALSE, "talk.google.com", G_STRUCT_OFFSET(GabbleParams, server) }, - { "port", DBUS_TYPE_UINT16_AS_STRING, G_TYPE_UINT, FALSE, GINT_TO_POINTER(5223), G_STRUCT_OFFSET(GabbleParams, port) }, - { "old-ssl", DBUS_TYPE_BOOLEAN_AS_STRING, G_TYPE_BOOLEAN, FALSE, GINT_TO_POINTER(TRUE), G_STRUCT_OFFSET(GabbleParams, old_ssl) }, - { NULL, NULL, 0, 0, NULL, 0 } -}; - static const GabbleParamSpec jabber_params[] = { { "account", DBUS_TYPE_STRING_AS_STRING, G_TYPE_STRING, TRUE, NULL, G_STRUCT_OFFSET(GabbleParams, account) }, { "password", DBUS_TYPE_STRING_AS_STRING, G_TYPE_STRING, TRUE, NULL, G_STRUCT_OFFSET(GabbleParams, password) }, @@ -181,10 +172,6 @@ get_parameters (const char *proto, const GabbleParamSpec **params, GError **erro { *params = jabber_params; } - else if (!strcmp (proto, "google-talk")) - { - *params = google_talk_params; - } else { g_debug ("%s: unknown protocol %s", G_STRFUNC, proto); @@ -608,7 +595,7 @@ gboolean gabble_connection_manager_get_parameter_defaults (GabbleConnectionManag */ gboolean gabble_connection_manager_list_protocols (GabbleConnectionManager *obj, gchar *** ret, GError **error) { - const char *protocols[] = { "jabber", "google-talk", NULL }; + const char *protocols[] = { "jabber", NULL }; *ret = g_strdupv ((gchar **)protocols); |