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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
c59b45dd
Commit
c59b45dd
authored
12 years ago
by
Tristan Matthews
Browse files
Options
Downloads
Patches
Plain Diff
* #10736: gnome: cleanup
parent
d4b64d2b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
gnome/src/callable_obj.h
+1
-2
1 addition, 2 deletions
gnome/src/callable_obj.h
gnome/src/contacts/calltree.c
+2
-2
2 additions, 2 deletions
gnome/src/contacts/calltree.c
with
3 additions
and
4 deletions
gnome/src/callable_obj.h
+
1
−
2
View file @
c59b45dd
...
...
@@ -96,8 +96,7 @@ typedef struct {
int
_state_code
;
// The numeric state code as defined in SIP or IAX
gchar
*
_state_code_description
;
// A textual description of _state_code
gchar
*
_callID
;
// The call ID
// gchar* _confID; // The conference ID (NULL if don't participate to a conference)
gchar
*
_historyConfID
;
// Persistent conf id to be stored in history
gchar
*
_historyConfID
;
// Persistent conf id to be stored in history
gchar
*
_accountID
;
// The account the call is made with
time_t
_time_start
;
// The timestamp the call was initiating
time_t
_time_stop
;
// The timestamp the call was over
...
...
This diff is collapsed.
Click to expand it.
gnome/src/contacts/calltree.c
+
2
−
2
View file @
c59b45dd
...
...
@@ -1196,9 +1196,9 @@ handle_drop_into(GtkTreeModel *model, GtkTreeIter *source_iter, GtkTreeIter *des
}
else
{
// Happens when we drag a call on anther call which participate to a conference
callable_obj_t
*
dest_call
=
calllist_get_call
(
current_calls_tab
,
dest_ID
);
if
(
dest_call
)
{
if
(
dest_call
)
{
gchar
*
conf_ID
=
dbus_get_conference_id
(
dest_call
->
_callID
);
if
(
g_strcmp0
(
conf_ID
,
""
)
!=
0
)
{
if
(
g_strcmp0
(
conf_ID
,
""
)
!=
0
)
{
sflphone_add_participant
(
source_ID
,
conf_ID
);
result
=
TRUE
;
}
...
...
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