Skip to content
Snippets Groups Projects
Commit c1717c5d authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Use the previous declared curAlias function in accountwindow

parent e534ad04
No related branches found
No related tags found
No related merge requests found
...@@ -175,11 +175,11 @@ msgstr "Введите пожалуйста следующие данные" ...@@ -175,11 +175,11 @@ msgstr "Введите пожалуйста следующие данные"
#: ../sflphone-gtk/src/assistant.c:213 #: ../sflphone-gtk/src/assistant.c:213
msgid "Create a free SIP/IAX2 account on sflphone.org" msgid "Create a free SIP/IAX2 account on sflphone.org"
msgstr "" msgstr "Создать бесплатный SIP/IAX2-аккаунт на sflphone.org"
#: ../sflphone-gtk/src/assistant.c:215 #: ../sflphone-gtk/src/assistant.c:215
msgid "Register an existing SIP or IAX2 account" msgid "Register an existing SIP or IAX2 account"
msgstr "" msgstr "Зарегистрировать существующий SIP или IAX2 аккаунт"
#: ../sflphone-gtk/src/assistant.c:230 #: ../sflphone-gtk/src/assistant.c:230
msgid "SIP account configuration" msgid "SIP account configuration"
...@@ -300,7 +300,7 @@ msgstr "Кодеки" ...@@ -300,7 +300,7 @@ msgstr "Кодеки"
#: ../sflphone-gtk/src/audioconf.c:823 #: ../sflphone-gtk/src/audioconf.c:823
msgid "Noise reduction" msgid "Noise reduction"
msgstr "" msgstr "Уменьшение шума"
#: ../sflphone-gtk/src/audioconf.c:830 #: ../sflphone-gtk/src/audioconf.c:830
msgid "Ringtones" msgid "Ringtones"
...@@ -346,7 +346,7 @@ msgstr "Автоответчик" ...@@ -346,7 +346,7 @@ msgstr "Автоответчик"
#: ../sflphone-gtk/src/calltree.c:521 #: ../sflphone-gtk/src/calltree.c:521
#, fuzzy #, fuzzy
msgid "Record a call" msgid "Record a call"
msgstr "Позвонить" msgstr "Записать переговор"
#: ../sflphone-gtk/src/configwindow.c:382 #: ../sflphone-gtk/src/configwindow.c:382
msgid "Protocol" msgid "Protocol"
...@@ -358,7 +358,7 @@ msgstr "Статус" ...@@ -358,7 +358,7 @@ msgstr "Статус"
#: ../sflphone-gtk/src/configwindow.c:492 #: ../sflphone-gtk/src/configwindow.c:492
msgid "Stun parameters will apply to each SIP account created." msgid "Stun parameters will apply to each SIP account created."
msgstr "" msgstr "STUN-параметры будут эффективны для каждого созданного SIP-аккаунта"
#: ../sflphone-gtk/src/configwindow.c:500 #: ../sflphone-gtk/src/configwindow.c:500
#, fuzzy #, fuzzy
...@@ -430,11 +430,11 @@ msgstr "Общие настройки" ...@@ -430,11 +430,11 @@ msgstr "Общие настройки"
#: ../sflphone-gtk/src/configwindow.c:714 #: ../sflphone-gtk/src/configwindow.c:714
msgid "_Destination folder" msgid "_Destination folder"
msgstr "" msgstr "Папка назна_чения"
#: ../sflphone-gtk/src/configwindow.c:719 #: ../sflphone-gtk/src/configwindow.c:719
msgid "Select a folder" msgid "Select a folder"
msgstr "" msgstr "Выберите папку"
#: ../sflphone-gtk/src/configwindow.c:744 #: ../sflphone-gtk/src/configwindow.c:744
msgid "Preferences" msgid "Preferences"
...@@ -450,7 +450,7 @@ msgstr "Настройки звука" ...@@ -450,7 +450,7 @@ msgstr "Настройки звука"
#: ../sflphone-gtk/src/configwindow.c:774 #: ../sflphone-gtk/src/configwindow.c:774
msgid "Record" msgid "Record"
msgstr "" msgstr "Записать"
#: ../sflphone-gtk/src/configwindow.c:798 #: ../sflphone-gtk/src/configwindow.c:798
msgid "Accounts" msgid "Accounts"
......
...@@ -92,18 +92,12 @@ show_account_window (account_t * a) ...@@ -92,18 +92,12 @@ show_account_window (account_t * a)
curPassword = g_hash_table_lookup(currentAccount->properties, ACCOUNT_PASSWORD); curPassword = g_hash_table_lookup(currentAccount->properties, ACCOUNT_PASSWORD);
curUsername = g_hash_table_lookup(currentAccount->properties, ACCOUNT_USERNAME); curUsername = g_hash_table_lookup(currentAccount->properties, ACCOUNT_USERNAME);
curMailbox = g_hash_table_lookup(currentAccount->properties, ACCOUNT_MAILBOX); curMailbox = g_hash_table_lookup(currentAccount->properties, ACCOUNT_MAILBOX);
if (strcmp(curAccountType, "SIP") == 0) {
/*stun_enabled = g_hash_table_lookup(currentAccount->properties, ACCOUNT_SIP_STUN_ENABLED);
stun_server = g_hash_table_lookup(currentAccount->properties, ACCOUNT_SIP_STUN_SERVER);
*/
}
} }
else else
{ {
currentAccount = g_new0(account_t, 1); currentAccount = g_new0(account_t, 1);
currentAccount->properties = g_hash_table_new(NULL, g_str_equal); currentAccount->properties = g_hash_table_new(NULL, g_str_equal);
curAccountID = "test"; curAccountID = "new";
} }
dialog = GTK_DIALOG(gtk_dialog_new_with_buttons (_("Account settings"), dialog = GTK_DIALOG(gtk_dialog_new_with_buttons (_("Account settings"),
...@@ -151,7 +145,7 @@ show_account_window (account_t * a) ...@@ -151,7 +145,7 @@ show_account_window (account_t * a)
gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5); gtk_misc_set_alignment(GTK_MISC (label), 0, 0.5);
entryAlias = gtk_entry_new(); entryAlias = gtk_entry_new();
gtk_label_set_mnemonic_widget (GTK_LABEL (label), entryAlias); gtk_label_set_mnemonic_widget (GTK_LABEL (label), entryAlias);
gtk_entry_set_text(GTK_ENTRY(entryAlias), g_hash_table_lookup(currentAccount->properties, ACCOUNT_ALIAS)); gtk_entry_set_text(GTK_ENTRY(entryAlias), curAlias);
gtk_table_attach ( GTK_TABLE( table ), entryAlias, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); gtk_table_attach ( GTK_TABLE( table ), entryAlias, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
label = gtk_label_new_with_mnemonic (_("_Protocol")); label = gtk_label_new_with_mnemonic (_("_Protocol"));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment