Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
6fd38dfb
Commit
6fd38dfb
authored
11 years ago
by
Tristan Matthews
Browse files
Options
Downloads
Patches
Plain Diff
gnome: cleanup
Refs #45628
parent
a5374592
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
gnome/src/dbus/dbus.c
+1
-1
1 addition, 1 deletion
gnome/src/dbus/dbus.c
gnome/src/dbus/dbus.h
+1
-1
1 addition, 1 deletion
gnome/src/dbus/dbus.h
gnome/src/video/video_callbacks.c
+3
-3
3 additions, 3 deletions
gnome/src/video/video_callbacks.c
with
5 additions
and
5 deletions
gnome/src/dbus/dbus.c
+
1
−
1
View file @
6fd38dfb
...
@@ -2060,7 +2060,7 @@ dbus_get_conference_list(void)
...
@@ -2060,7 +2060,7 @@ dbus_get_conference_list(void)
}
}
gchar
**
gchar
**
dbus_get_display_name
_list
(
const
gchar
*
confID
)
dbus_get_display_name
s
(
const
gchar
*
confID
)
{
{
GError
*
error
=
NULL
;
GError
*
error
=
NULL
;
gchar
**
list
=
NULL
;
gchar
**
list
=
NULL
;
...
...
This diff is collapsed.
Click to expand it.
gnome/src/dbus/dbus.h
+
1
−
1
View file @
6fd38dfb
...
@@ -432,7 +432,7 @@ void dbus_add_participant(const gchar *callID, const gchar *confID);
...
@@ -432,7 +432,7 @@ void dbus_add_participant(const gchar *callID, const gchar *confID);
* Return a list of display names for this conference (confID)
* Return a list of display names for this conference (confID)
*/
*/
gchar
**
gchar
**
dbus_get_display_name
_list
(
const
gchar
*
confID
);
dbus_get_display_name
s
(
const
gchar
*
confID
);
/**
/**
* Return a list of participant for this conference (confID)
* Return a list of participant for this conference (confID)
...
...
This diff is collapsed.
Click to expand it.
gnome/src/video/video_callbacks.c
+
3
−
3
View file @
6fd38dfb
...
@@ -258,9 +258,9 @@ add_handle(const gchar *id)
...
@@ -258,9 +258,9 @@ add_handle(const gchar *id)
title_prefix
=
_
(
"Conference with"
);
title_prefix
=
_
(
"Conference with"
);
/* get all the participants name */
/* get all the participants name */
gchar
**
display_name
_list
=
dbus_get_display_name
_list
(
id
);
gchar
**
display_name
s
=
dbus_get_display_name
s
(
id
);
name
=
g_strjoinv
(
", "
,
display_name
_list
);
name
=
g_strjoinv
(
", "
,
display_name
s
);
g_strfreev
(
display_name
_list
);
g_strfreev
(
display_name
s
);
}
else
if
(
call_type
==
IS_CALL
)
{
/* on a simple call */
}
else
if
(
call_type
==
IS_CALL
)
{
/* on a simple call */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment