diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2009-06-12 17:55:52 +0800 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2009-06-12 17:55:52 +0800 |
| commit | 40e02734065878fcfbb0a316ca2217a5676862e8 (patch) | |
| tree | 97cf862d6fb7b5617e076d5a2560e1d756aab25b /libempathy | |
| parent | f399b307ebc18c2382cb09ac24b41de2f5212bf7 (diff) | |
| download | gsoc2013-empathy-40e02734065878fcfbb0a316ca2217a5676862e8.tar gsoc2013-empathy-40e02734065878fcfbb0a316ca2217a5676862e8.tar.gz gsoc2013-empathy-40e02734065878fcfbb0a316ca2217a5676862e8.tar.bz2 gsoc2013-empathy-40e02734065878fcfbb0a316ca2217a5676862e8.tar.lz gsoc2013-empathy-40e02734065878fcfbb0a316ca2217a5676862e8.tar.xz gsoc2013-empathy-40e02734065878fcfbb0a316ca2217a5676862e8.tar.zst gsoc2013-empathy-40e02734065878fcfbb0a316ca2217a5676862e8.zip | |
Drop PORT access control support for now
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-tp-file.c | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/libempathy/empathy-tp-file.c b/libempathy/empathy-tp-file.c index d7d51ec71..76882022a 100644 --- a/libempathy/empathy-tp-file.c +++ b/libempathy/empathy-tp-file.c @@ -163,17 +163,12 @@ tp_file_get_available_socket_types_cb (TpProxy *proxy, GUINT_TO_POINTER (TP_SOCKET_ADDRESS_TYPE_IPV4))) != NULL) { priv->socket_address_type = TP_SOCKET_ADDRESS_TYPE_IPV4; - g_array_sort (access_controls, empathy_uint_compare); - - /* here port is preferred over localhost */ - if ((g_array_index (access_controls, guint, 0) == - TP_SOCKET_ACCESS_CONTROL_LOCALHOST) && - (g_array_index (access_controls, guint, 1) == - TP_SOCKET_ACCESS_CONTROL_PORT)) - priv->socket_access_control = TP_SOCKET_ACCESS_CONTROL_PORT; - else - priv->socket_access_control = - g_array_index (access_controls, guint, 0); + + /* TODO: we should prefer PORT over LOCALHOST when the CM will + * support it. + */ + + priv->socket_access_control = TP_SOCKET_ACCESS_CONTROL_LOCALHOST; } out: @@ -571,15 +566,12 @@ static void initialize_empty_ac_variant (TpSocketAccessControl ac, GValue *val) { + /* TODO: we will add more types here once we support PORT access control. */ if (ac == TP_SOCKET_ACCESS_CONTROL_LOCALHOST) { g_value_init (val, G_TYPE_STRING); g_value_set_static_string (val, ""); } - else if (ac == TP_SOCKET_ACCESS_CONTROL_PORT) - { - g_value_init (val, TP_STRUCT_TYPE_SOCKET_ADDRESS_IPV4); - } } static void |