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
1952bef1
Commit
1952bef1
authored
11 years ago
by
Tristan Matthews
Browse files
Options
Downloads
Patches
Plain Diff
gnome: cleanup dbus
Removed excessive logging Refactored error handling
parent
52d11593
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
gnome/src/dbus/dbus.c
+4
-21
4 additions, 21 deletions
gnome/src/dbus/dbus.c
with
4 additions
and
21 deletions
gnome/src/dbus/dbus.c
+
4
−
21
View file @
1952bef1
...
@@ -1634,12 +1634,7 @@ dbus_set_noise_suppress_state(gboolean state)
...
@@ -1634,12 +1634,7 @@ dbus_set_noise_suppress_state(gboolean state)
{
{
GError
*
error
=
NULL
;
GError
*
error
=
NULL
;
org_sflphone_SFLphone_ConfigurationManager_set_noise_suppress_state
(
config_proxy
,
state
,
&
error
);
org_sflphone_SFLphone_ConfigurationManager_set_noise_suppress_state
(
config_proxy
,
state
,
&
error
);
check_error
(
error
);
if
(
error
)
{
g_warning
(
"Failed to call set_noise_suppress_state() on "
"ConfigurationManager: %s"
,
error
->
message
);
g_error_free
(
error
);
}
}
}
/**
/**
...
@@ -1666,12 +1661,7 @@ dbus_set_agc_state(gboolean state)
...
@@ -1666,12 +1661,7 @@ dbus_set_agc_state(gboolean state)
{
{
GError
*
error
=
NULL
;
GError
*
error
=
NULL
;
org_sflphone_SFLphone_ConfigurationManager_set_agc_state
(
config_proxy
,
state
,
&
error
);
org_sflphone_SFLphone_ConfigurationManager_set_agc_state
(
config_proxy
,
state
,
&
error
);
check_error
(
error
);
if
(
error
)
{
g_warning
(
"Failed to call set_agc_state() on "
"ConfigurationManager: %s"
,
error
->
message
);
g_error_free
(
error
);
}
}
}
int
int
...
@@ -1688,7 +1678,6 @@ dbus_is_iax2_enabled()
...
@@ -1688,7 +1678,6 @@ dbus_is_iax2_enabled()
void
void
dbus_join_participant
(
const
gchar
*
sel_callID
,
const
gchar
*
drag_callID
)
dbus_join_participant
(
const
gchar
*
sel_callID
,
const
gchar
*
drag_callID
)
{
{
g_debug
(
"Join participant %s and %s
\n
"
,
sel_callID
,
drag_callID
);
GError
*
error
=
NULL
;
GError
*
error
=
NULL
;
gboolean
result
;
gboolean
result
;
org_sflphone_SFLphone_CallManager_join_participant
(
call_proxy
,
sel_callID
,
org_sflphone_SFLphone_CallManager_join_participant
(
call_proxy
,
sel_callID
,
...
@@ -1699,7 +1688,6 @@ dbus_join_participant(const gchar *sel_callID, const gchar *drag_callID)
...
@@ -1699,7 +1688,6 @@ dbus_join_participant(const gchar *sel_callID, const gchar *drag_callID)
void
void
dbus_add_participant
(
const
gchar
*
callID
,
const
gchar
*
confID
)
dbus_add_participant
(
const
gchar
*
callID
,
const
gchar
*
confID
)
{
{
g_debug
(
"Add participant %s to %s
\n
"
,
callID
,
confID
);
GError
*
error
=
NULL
;
GError
*
error
=
NULL
;
gboolean
result
;
gboolean
result
;
org_sflphone_SFLphone_CallManager_add_participant
(
call_proxy
,
callID
,
org_sflphone_SFLphone_CallManager_add_participant
(
call_proxy
,
callID
,
...
@@ -2051,7 +2039,6 @@ dbus_get_participant_list(const gchar *confID)
...
@@ -2051,7 +2039,6 @@ dbus_get_participant_list(const gchar *confID)
GError
*
error
=
NULL
;
GError
*
error
=
NULL
;
gchar
**
list
=
NULL
;
gchar
**
list
=
NULL
;
g_debug
(
"Get conference %s participant list"
,
confID
);
org_sflphone_SFLphone_CallManager_get_participant_list
(
call_proxy
,
confID
,
&
list
,
&
error
);
org_sflphone_SFLphone_CallManager_get_participant_list
(
call_proxy
,
confID
,
&
list
,
&
error
);
check_error
(
error
);
check_error
(
error
);
...
@@ -2336,12 +2323,10 @@ dbus_screensaver_uninhibit(void)
...
@@ -2336,12 +2323,10 @@ dbus_screensaver_uninhibit(void)
{
{
if
(
cookie
==
0
)
if
(
cookie
==
0
)
return
;
return
;
g_debug
(
"uninhibit"
);
GVariant
*
parameters
=
g_variant_new
(
"(u)"
,
cookie
);
GVariant
*
parameters
=
g_variant_new
(
"(u)"
,
cookie
);
if
(
parameters
==
NULL
)
{
if
(
parameters
==
NULL
)
{
g_warning
(
"Could not create session manager uninhibit "
g_warning
(
"Could not create session manager uninhibit parameters"
);
"parameters"
);
return
;
return
;
}
}
...
@@ -2356,7 +2341,6 @@ void
...
@@ -2356,7 +2341,6 @@ void
dbus_presence_publish
(
const
gchar
*
accountID
,
gboolean
status
)
dbus_presence_publish
(
const
gchar
*
accountID
,
gboolean
status
)
{
{
GError
*
error
=
NULL
;
GError
*
error
=
NULL
;
g_debug
(
"DBus: publish presence status."
);
org_sflphone_SFLphone_PresenceManager_publish
(
presence_proxy
,
accountID
,
status
,
"Tout va bien."
,
NULL
);
org_sflphone_SFLphone_PresenceManager_publish
(
presence_proxy
,
accountID
,
status
,
"Tout va bien."
,
NULL
);
check_error
(
error
);
check_error
(
error
);
}
}
...
@@ -2364,7 +2348,6 @@ dbus_presence_publish(const gchar *accountID, gboolean status)
...
@@ -2364,7 +2348,6 @@ dbus_presence_publish(const gchar *accountID, gboolean status)
void
void
dbus_presence_subscribe
(
const
gchar
*
accountID
,
const
gchar
*
uri
,
gboolean
flag
)
dbus_presence_subscribe
(
const
gchar
*
accountID
,
const
gchar
*
uri
,
gboolean
flag
)
{
{
g_debug
(
"DBus: subscrbe presence status %s:%s."
,
uri
,
flag
?
"true"
:
"false"
);
GError
*
error
=
NULL
;
GError
*
error
=
NULL
;
org_sflphone_SFLphone_PresenceManager_subscribe_buddy
(
presence_proxy
,
accountID
,
uri
,
flag
,
NULL
);
org_sflphone_SFLphone_PresenceManager_subscribe_buddy
(
presence_proxy
,
accountID
,
uri
,
flag
,
NULL
);
check_error
(
error
);
check_error
(
error
);
...
...
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