Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
savoirfairelinux
jami-daemon
Commits
e6ad7651
Commit
e6ad7651
authored
Jul 21, 2010
by
Alexandre Savard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[#3218] Small UI fix callable_obj_free
parent
94affc53
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
9 deletions
+11
-9
sflphone-client-gnome/src/actions.c
sflphone-client-gnome/src/actions.c
+7
-5
sflphone-client-gnome/src/callable_obj.c
sflphone-client-gnome/src/callable_obj.c
+2
-2
sflphone-client-gnome/src/dbus/dbus.c
sflphone-client-gnome/src/dbus/dbus.c
+2
-2
No files found.
sflphone-client-gnome/src/actions.c
View file @
e6ad7651
...
...
@@ -189,6 +189,8 @@ sflphone_ringing(callable_obj_t * c )
void
sflphone_hung_up
(
callable_obj_t
*
c
)
{
DEBUG
(
"Actions: SFLphone hungup"
);
calllist_remove
(
current_calls
,
c
->
_callID
);
calltree_remove_call
(
current_calls
,
c
,
NULL
);
c
->
_state
=
CALL_STATE_DIALING
;
...
...
@@ -228,7 +230,7 @@ void sflphone_fill_account_list (void) {
if(!(*accountID))
DEBUG("hhhhhhhhhmmmmmmmmmmmm");
*/
for
(
accountID
=
array
;
*
accountID
;
accountID
++
)
{
account_t
*
a
=
g_new0
(
account_t
,
1
);
...
...
@@ -321,10 +323,10 @@ void sflphone_fill_account_list (void) {
a
->
protocol_state_description
=
g_hash_table_lookup
(
details
,
REGISTRATION_STATE_DESCRIPTION
);
}
// Set the current account message number
current_account_set_message_number
(
count
);
sflphone_fill_codec_list
();
// Set the current account message number
current_account_set_message_number
(
count
);
sflphone_fill_codec_list
();
}
gboolean
sflphone_init
()
{
...
...
sflphone-client-gnome/src/callable_obj.c
View file @
e6ad7651
...
...
@@ -135,6 +135,8 @@ void *threaded_clock_incrementer(void *pc) {
while
(
call
->
clockStarted
)
{
DEBUG
(
"CLOCK STARTED: %d"
,
call
->
clockStarted
);
gchar
*
res
;
int
duration
;
time_t
start
,
current
;
...
...
@@ -170,8 +172,6 @@ void *threaded_clock_incrementer(void *pc) {
calltree_update_clock
(
call
);
g_free
(
res
);
sleep
(
1
);
}
}
...
...
sflphone-client-gnome/src/dbus/dbus.c
View file @
e6ad7651
...
...
@@ -145,9 +145,9 @@ call_state_cb(DBusGProxy *proxy UNUSED, const gchar* callID, const gchar* state,
calltree_update_call
(
history
,
c
,
NULL
);
}
stop_notification
();
sflphone_hung_up
(
c
);
calltree_update_call
(
history
,
c
,
NULL
);
calltree_update_call
(
history
,
c
,
NULL
);
status_bar_display_account
();
sflphone_hung_up
(
c
);
}
else
if
(
strcmp
(
state
,
"UNHOLD_CURRENT"
)
==
0
)
{
...
...
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