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
a7f7a7e3
Commit
a7f7a7e3
authored
15 years ago
by
Alexandre Savard
Browse files
Options
Downloads
Patches
Plain Diff
[#3324] Fix segfault when sending IAX account propertis only
parent
dd28d9c6
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
sflphone-client-gnome/src/config/accountconfigdialog.c
+34
-29
34 additions, 29 deletions
sflphone-client-gnome/src/config/accountconfigdialog.c
with
34 additions
and
29 deletions
sflphone-client-gnome/src/config/accountconfigdialog.c
+
34
−
29
View file @
a7f7a7e3
...
@@ -1323,8 +1323,11 @@ void show_account_window (account_t * a) {
...
@@ -1323,8 +1323,11 @@ void show_account_window (account_t * a) {
/**************/
/**************/
response
=
gtk_dialog_run
(
GTK_DIALOG
(
dialog
));
response
=
gtk_dialog_run
(
GTK_DIALOG
(
dialog
));
// Update protocol in case it changed
proto
=
(
gchar
*
)
gtk_combo_box_get_active_text
(
GTK_COMBO_BOX
(
protocolComboBox
));
// If cancel button is pressed
// If cancel button is pressed
if
(
response
!
=
GTK_RESPONSE_
ACCEPT
)
{
if
(
response
=
=
GTK_RESPONSE_
CANCEL
)
{
gtk_widget_destroy
(
GTK_WIDGET
(
dialog
));
gtk_widget_destroy
(
GTK_WIDGET
(
dialog
));
return
;
return
;
}
}
...
@@ -1332,9 +1335,7 @@ void show_account_window (account_t * a) {
...
@@ -1332,9 +1335,7 @@ void show_account_window (account_t * a) {
// If accept button is
// If accept button is
if
(
g_strcasecmp
(
currentAccount
->
accountID
,
IP2IP
)
!=
0
)
{
if
(
g_strcasecmp
(
currentAccount
->
accountID
,
IP2IP
)
!=
0
)
{
g_hash_table_replace
(
currentAccount
->
properties
,
g_strdup
(
ACCOUNT_RESOLVE_ONCE
),
g_strdup
(
gtk_toggle_button_get_active
(
GTK_TOGGLE_BUTTON
(
entryResolveNameOnlyOnce
))
?
"false"
:
"true"
));
g_hash_table_replace
(
currentAccount
->
properties
,
g_hash_table_replace
(
currentAccount
->
properties
,
g_strdup
(
ACCOUNT_ALIAS
),
g_strdup
(
ACCOUNT_ALIAS
),
g_strdup
((
gchar
*
)
gtk_entry_get_text
(
GTK_ENTRY
(
entryAlias
))));
g_strdup
((
gchar
*
)
gtk_entry_get_text
(
GTK_ENTRY
(
entryAlias
))));
...
@@ -1353,9 +1354,6 @@ void show_account_window (account_t * a) {
...
@@ -1353,9 +1354,6 @@ void show_account_window (account_t * a) {
g_hash_table_replace
(
currentAccount
->
properties
,
g_hash_table_replace
(
currentAccount
->
properties
,
g_strdup
(
ACCOUNT_MAILBOX
),
g_strdup
(
ACCOUNT_MAILBOX
),
g_strdup
((
gchar
*
)
gtk_entry_get_text
(
GTK_ENTRY
(
entryMailbox
))));
g_strdup
((
gchar
*
)
gtk_entry_get_text
(
GTK_ENTRY
(
entryMailbox
))));
g_hash_table_replace
(
currentAccount
->
properties
,
g_strdup
(
ACCOUNT_REGISTRATION_EXPIRE
),
g_strdup
((
gchar
*
)
gtk_entry_get_text
(
GTK_ENTRY
(
expireSpinBox
))));
}
}
...
@@ -1363,6 +1361,14 @@ void show_account_window (account_t * a) {
...
@@ -1363,6 +1361,14 @@ void show_account_window (account_t * a) {
if
(
g_strcasecmp
(
currentAccount
->
accountID
,
IP2IP
)
!=
0
)
{
if
(
g_strcasecmp
(
currentAccount
->
accountID
,
IP2IP
)
!=
0
)
{
g_hash_table_replace
(
currentAccount
->
properties
,
g_strdup
(
ACCOUNT_RESOLVE_ONCE
),
g_strdup
(
gtk_toggle_button_get_active
(
GTK_TOGGLE_BUTTON
(
entryResolveNameOnlyOnce
))
?
"false"
:
"true"
));
g_hash_table_replace
(
currentAccount
->
properties
,
g_strdup
(
ACCOUNT_REGISTRATION_EXPIRE
),
g_strdup
((
gchar
*
)
gtk_entry_get_text
(
GTK_ENTRY
(
expireSpinBox
))));
g_hash_table_replace
(
currentAccount
->
properties
,
g_hash_table_replace
(
currentAccount
->
properties
,
g_strdup
(
ACCOUNT_ROUTE
),
g_strdup
(
ACCOUNT_ROUTE
),
g_strdup
((
gchar
*
)
gtk_entry_get_text
(
GTK_ENTRY
(
entryRouteSet
))));
g_strdup
((
gchar
*
)
gtk_entry_get_text
(
GTK_ENTRY
(
entryRouteSet
))));
...
@@ -1441,7 +1447,6 @@ void show_account_window (account_t * a) {
...
@@ -1441,7 +1447,6 @@ void show_account_window (account_t * a) {
g_strdup
(
LOCAL_PORT
),
g_strdup
(
LOCAL_PORT
),
g_strdup
((
gchar
*
)
gtk_entry_get_text
(
GTK_ENTRY
(
localPortSpinBox
))));
g_strdup
((
gchar
*
)
gtk_entry_get_text
(
GTK_ENTRY
(
localPortSpinBox
))));
}
/* Set new credentials if any */
/* Set new credentials if any */
DEBUG
(
"Config: Setting credentials"
);
DEBUG
(
"Config: Setting credentials"
);
...
@@ -1464,6 +1469,8 @@ void show_account_window (account_t * a) {
...
@@ -1464,6 +1469,8 @@ void show_account_window (account_t * a) {
dbus_set_number_of_credential
(
currentAccount
,
currentAccount
->
credential_information
->
len
);
dbus_set_number_of_credential
(
currentAccount
,
currentAccount
->
credential_information
->
len
);
}
}
}
}
}
/** @todo Verify if it's the best condition to check */
/** @todo Verify if it's the best condition to check */
if
(
g_strcasecmp
(
currentAccount
->
accountID
,
"new"
)
==
0
)
{
if
(
g_strcasecmp
(
currentAccount
->
accountID
,
"new"
)
==
0
)
{
dbus_add_account
(
currentAccount
);
dbus_add_account
(
currentAccount
);
...
@@ -1475,9 +1482,7 @@ void show_account_window (account_t * a) {
...
@@ -1475,9 +1482,7 @@ void show_account_window (account_t * a) {
// Perpetuate changes to the deamon
// Perpetuate changes to the deamon
codec_list_update_to_daemon
(
currentAccount
);
codec_list_update_to_daemon
(
currentAccount
);
gtk_widget_destroy
(
GTK_WIDGET
(
dialog
));
gtk_widget_destroy
(
GTK_WIDGET
(
dialog
));
}
}
GtkWidget
*
create_direct_ip_calls_tab
(
account_t
**
a
)
{
GtkWidget
*
create_direct_ip_calls_tab
(
account_t
**
a
)
{
...
...
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