Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
a51be11c
Commit
a51be11c
authored
Jun 09, 2010
by
Alexandre Savard
Browse files
[#3424] Fix GTK warnings in Local IP configuration
parent
4298b708
Changes
1
Hide whitespace changes
Inline
Side-by-side
sflphone-client-gnome/src/config/accountconfigdialog.c
View file @
a51be11c
...
@@ -1297,7 +1297,8 @@ void show_account_window (account_t * a) {
...
@@ -1297,7 +1297,8 @@ void show_account_window (account_t * a) {
// Get current protocol for this account protocol
// Get current protocol for this account protocol
gchar
*
currentProtocol
=
"SIP"
;
gchar
*
currentProtocol
=
"SIP"
;
currentProtocol
=
(
gchar
*
)
gtk_combo_box_get_active_text
(
GTK_COMBO_BOX
(
protocolComboBox
));
if
(
protocolComboBox
)
currentProtocol
=
(
gchar
*
)
gtk_combo_box_get_active_text
(
GTK_COMBO_BOX
(
protocolComboBox
));
// Do not need advanced or security one for the IP2IP account
// Do not need advanced or security one for the IP2IP account
if
(
g_strcasecmp
(
currentAccount
->
accountID
,
IP2IP
)
!=
0
)
{
if
(
g_strcasecmp
(
currentAccount
->
accountID
,
IP2IP
)
!=
0
)
{
...
@@ -1322,7 +1323,8 @@ void show_account_window (account_t * a) {
...
@@ -1322,7 +1323,8 @@ void show_account_window (account_t * a) {
}
}
// Emit signal to hide advanced and security tabs in case of IAX
// Emit signal to hide advanced and security tabs in case of IAX
g_signal_emit_by_name
(
GTK_WIDGET
(
protocolComboBox
),
"changed"
,
NULL
);
if
(
protocolComboBox
)
g_signal_emit_by_name
(
GTK_WIDGET
(
protocolComboBox
),
"changed"
,
NULL
);
gtk_notebook_set_current_page
(
GTK_NOTEBOOK
(
notebook
)
,
0
);
gtk_notebook_set_current_page
(
GTK_NOTEBOOK
(
notebook
)
,
0
);
...
@@ -1332,7 +1334,11 @@ void show_account_window (account_t * a) {
...
@@ -1332,7 +1334,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
// Update protocol in case it changed
gchar
*
proto
=
(
gchar
*
)
gtk_combo_box_get_active_text
(
GTK_COMBO_BOX
(
protocolComboBox
));
gchar
*
proto
=
NULL
;
if
(
protocolComboBox
)
proto
=
(
gchar
*
)
gtk_combo_box_get_active_text
(
GTK_COMBO_BOX
(
protocolComboBox
));
else
proto
=
"SIP"
;
// If cancel button is pressed
// If cancel button is pressed
if
(
response
==
GTK_RESPONSE_CANCEL
)
{
if
(
response
==
GTK_RESPONSE_CANCEL
)
{
...
@@ -1364,7 +1370,6 @@ void show_account_window (account_t * a) {
...
@@ -1364,7 +1370,6 @@ void show_account_window (account_t * a) {
g_strdup
((
gchar
*
)
gtk_entry_get_text
(
GTK_ENTRY
(
entryMailbox
))));
g_strdup
((
gchar
*
)
gtk_entry_get_text
(
GTK_ENTRY
(
entryMailbox
))));
}
}
if
(
proto
&&
strcmp
(
proto
,
"SIP"
)
==
0
)
{
if
(
proto
&&
strcmp
(
proto
,
"SIP"
)
==
0
)
{
if
(
g_strcasecmp
(
currentAccount
->
accountID
,
IP2IP
)
!=
0
)
{
if
(
g_strcasecmp
(
currentAccount
->
accountID
,
IP2IP
)
!=
0
)
{
...
...
Write
Preview
Supports
Markdown
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