Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
J
jami-daemon
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
130
Issues
130
List
Boards
Labels
Service Desk
Milestones
Iterations
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
savoirfairelinux
jami-daemon
Commits
3c23dc42
Commit
3c23dc42
authored
May 16, 2012
by
Alexandre Savard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#10725: cleanup client logs
parent
c0213533
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
5 deletions
+11
-5
gnome/src/contacts/calltree.c
gnome/src/contacts/calltree.c
+5
-0
gnome/src/contacts/conferencelist.c
gnome/src/contacts/conferencelist.c
+0
-2
gnome/src/dbus/dbus.c
gnome/src/dbus/dbus.c
+6
-3
No files found.
gnome/src/contacts/calltree.c
View file @
3c23dc42
...
...
@@ -1048,6 +1048,11 @@ remove_conference(GtkTreeModel *model, GtkTreePath *path UNUSED, GtkTreeIter *it
void
calltree_remove_conference
(
calltab_t
*
tab
,
const
conference_obj_t
*
conf
)
{
if
(
conf
==
NULL
)
{
ERROR
(
"Could not remove conference, conference pointer is NULL"
);
return
;
}
ConferenceRemoveCtx
context
=
{
tab
,
conf
};
GtkTreeStore
*
store
=
tab
->
store
;
GtkTreeModel
*
model
=
GTK_TREE_MODEL
(
store
);
...
...
gnome/src/contacts/conferencelist.c
View file @
3c23dc42
...
...
@@ -111,7 +111,6 @@ void conferencelist_remove(calltab_t *tab, const gchar* const conf)
gchar
*
c
=
(
gchar
*
)
conferencelist_get
(
tab
,
conf
);
if
(
c
==
NULL
)
{
ERROR
(
"ConferenceList: Error: Could not find conference %s"
,
conf
);
return
;
}
...
...
@@ -130,7 +129,6 @@ conference_obj_t* conferencelist_get(calltab_t *tab, const gchar* const conf_id)
GList
*
c
=
g_queue_find_custom
(
tab
->
conferenceQueue
,
conf_id
,
is_confID_confstruct
);
if
(
c
==
NULL
)
{
ERROR
(
"ConferenceList: Error: Could not find conference %s"
,
conf_id
);
return
NULL
;
}
...
...
gnome/src/dbus/dbus.c
View file @
3c23dc42
...
...
@@ -154,7 +154,6 @@ incoming_message_cb(DBusGProxy *proxy UNUSED, const gchar *callID UNUSED,
id
=
call
->
_callID
;
}
else
{
conference_obj_t
*
conf
=
conferencelist_get
(
current_calls_tab
,
callID
);
if
(
!
conf
)
{
ERROR
(
"Message received, but no recipient found"
);
return
;
...
...
@@ -279,7 +278,6 @@ conference_changed_cb(DBusGProxy *proxy UNUSED, const gchar *confID,
DEBUG
(
"DBUS: Conference state changed: %s
\n
"
,
state
);
conference_obj_t
*
changed_conf
=
conferencelist_get
(
current_calls_tab
,
confID
);
if
(
changed_conf
==
NULL
)
{
ERROR
(
"DBUS: Conference is NULL in conference state changed"
);
return
;
...
...
@@ -353,8 +351,13 @@ static void
conference_removed_cb
(
DBusGProxy
*
proxy
UNUSED
,
const
gchar
*
confID
,
void
*
foo
UNUSED
)
{
DEBUG
(
"
DBUS:
Conference removed %s"
,
confID
);
DEBUG
(
"Conference removed %s"
,
confID
);
conference_obj_t
*
c
=
conferencelist_get
(
current_calls_tab
,
confID
);
if
(
c
==
NULL
)
{
ERROR
(
"Could not find conference %s from list"
,
confID
);
return
;
}
calltree_remove_conference
(
current_calls_tab
,
c
);
im_widget_update_state
(
IM_WIDGET
(
c
->
_im_widget
),
FALSE
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment