diff options
author | Denis Ollier <larchunix@users.noreply.github.com> | 2018-05-19 16:49:37 +0300 |
---|---|---|
committer | Denis Ollier <larchunix@users.noreply.github.com> | 2018-05-19 16:49:37 +0300 |
commit | a4a55b9003f041594f966518e977aa52229d00a1 (patch) | |
tree | ae9390edd5eb881406eee3fa5b9be4a70568ae4c /plugins/telepathy | |
parent | 190bf6460645dad8d411cce862ff79fe1a90d5b3 (diff) |
telepathy: don't use deprecated tp_connection_parse_object_path()
Diffstat (limited to 'plugins/telepathy')
-rw-r--r-- | plugins/telepathy/telepathy_channel_handler.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/plugins/telepathy/telepathy_channel_handler.c b/plugins/telepathy/telepathy_channel_handler.c index 6f0d39f30..9acde98a7 100644 --- a/plugins/telepathy/telepathy_channel_handler.c +++ b/plugins/telepathy/telepathy_channel_handler.c @@ -213,8 +213,8 @@ static void remmina_tp_channel_handler_get_contacts(TpConnection *connection, gu RemminaTpChannelHandler *chandler = (RemminaTpChannelHandler*)user_data; TpContact *contact; gchar *token; - gchar *cm; - gchar *protocol; + const gchar *cm; + const gchar *protocol; gchar *filename; GdkPixbuf *pixbuf; GtkWidget *image; @@ -245,14 +245,13 @@ static void remmina_tp_channel_handler_get_contacts(TpConnection *connection, gu if (token == NULL) { return; } - if (!tp_connection_parse_object_path(chandler->connection, &protocol, &cm)) { - g_print("tp_connection_parse_object_path: failed\n"); + protocol = tp_connection_get_protocol_name(chandler->connection); + cm = tp_connection_get_cm_name(chandler->connection); + if (!protocol || !cm) { return; } token = tp_escape_as_identifier(token); filename = g_build_filename(g_get_user_cache_dir(), "telepathy", "avatars", cm, protocol, token, NULL); - g_free(cm); - g_free(protocol); g_free(token); if (g_file_test(filename, G_FILE_TEST_EXISTS)) { pixbuf = gdk_pixbuf_new_from_file(filename, NULL); |