From 6fd38dfbc7a2507c284dfaf919953aa0e9a2a859 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Fri, 18 Apr 2014 17:19:21 -0400
Subject: [PATCH] gnome: cleanup
Refs #45628
---
gnome/src/dbus/dbus.c | 2 +-
gnome/src/dbus/dbus.h | 2 +-
gnome/src/video/video_callbacks.c | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnome/src/dbus/dbus.c b/gnome/src/dbus/dbus.c
index 437255bce5..03eb658e60 100644
--- a/gnome/src/dbus/dbus.c
+++ b/gnome/src/dbus/dbus.c
@@ -2060,7 +2060,7 @@ dbus_get_conference_list(void)
}
gchar **
-dbus_get_display_name_list(const gchar *confID)
+dbus_get_display_names(const gchar *confID)
{
GError *error = NULL;
gchar **list = NULL;
diff --git a/gnome/src/dbus/dbus.h b/gnome/src/dbus/dbus.h
index 619ade0766..27112e2985 100644
--- a/gnome/src/dbus/dbus.h
+++ b/gnome/src/dbus/dbus.h
@@ -432,7 +432,7 @@ void dbus_add_participant(const gchar *callID, const gchar *confID);
* Return a list of display names for this conference (confID)
*/
gchar **
-dbus_get_display_name_list(const gchar *confID);
+dbus_get_display_names(const gchar *confID);
/**
* Return a list of participant for this conference (confID)
diff --git a/gnome/src/video/video_callbacks.c b/gnome/src/video/video_callbacks.c
index 920d2d6366..96024560be 100644
--- a/gnome/src/video/video_callbacks.c
+++ b/gnome/src/video/video_callbacks.c
@@ -258,9 +258,9 @@ add_handle(const gchar *id)
title_prefix = _("Conference with");
/* get all the participants name */
- gchar **display_name_list = dbus_get_display_name_list(id);
- name = g_strjoinv(", ", display_name_list);
- g_strfreev(display_name_list);
+ gchar **display_names = dbus_get_display_names(id);
+ name = g_strjoinv(", ", display_names);
+ g_strfreev(display_names);
} else if (call_type == IS_CALL) { /* on a simple call */
--
GitLab