diff --git a/sflphone-client-gnome/src/accountlist.c b/sflphone-client-gnome/src/accountlist.c index cd635575ff56021e1dda0dd4343caa37915b87fd..8a4187df746b60a0cc3f7f0223b20a1cf48d5e35 100644 --- a/sflphone-client-gnome/src/accountlist.c +++ b/sflphone-client-gnome/src/accountlist.c @@ -184,7 +184,7 @@ const gchar * account_state_name(account_state_t s) state = _("Error"); break; case ACCOUNT_STATE_ERROR_AUTH: - state = _("Bad authentification"); + state = _("Authentication Failed"); break; case ACCOUNT_STATE_ERROR_NETWORK: state = _("Network unreachable"); diff --git a/sflphone-client-gnome/src/contacts/history.c b/sflphone-client-gnome/src/contacts/history.c index c547ac0fcab219d4d1cb72c706e3c64773f69753..5ce53416f65c3120f79739d92033776cab2cba65 100644 --- a/sflphone-client-gnome/src/contacts/history.c +++ b/sflphone-client-gnome/src/contacts/history.c @@ -65,50 +65,46 @@ static GtkTreeModel* history_create_filter (GtkTreeModel* child) static gboolean history_is_visible (GtkTreeModel* model, GtkTreeIter* iter, gpointer data UNUSED) { - if (SHOW_SEARCHBAR) - { - GValue val, obj; + GValue val, obj; - callable_obj_t *history_entry = NULL; - gchar* text = NULL; - gchar* search = (gchar*)gtk_entry_get_text(GTK_ENTRY(history_searchbar_widget)); - memset (&val, 0, sizeof(val)); - memset (&obj, 0, sizeof(obj)); - - // Fetch the call description - gtk_tree_model_get_value (GTK_TREE_MODEL(model), iter, 1, &val); - if(G_VALUE_HOLDS_STRING(&val)){ - text = (gchar *)g_value_get_string(&val); - } - - // Fetch the call type - gtk_tree_model_get_value (GTK_TREE_MODEL(model), iter, 2, &obj); - if (G_VALUE_HOLDS_POINTER (&obj)){ - history_entry = (gpointer) g_value_get_pointer (&obj); - } + callable_obj_t *history_entry = NULL; + gchar* text = NULL; + gchar* search = (gchar*)gtk_entry_get_text(GTK_ENTRY(history_searchbar_widget)); + memset (&val, 0, sizeof(val)); + memset (&obj, 0, sizeof(obj)); + + // Fetch the call description + gtk_tree_model_get_value (GTK_TREE_MODEL(model), iter, 1, &val); + if(G_VALUE_HOLDS_STRING(&val)){ + text = (gchar *)g_value_get_string(&val); + } + + // Fetch the call type + gtk_tree_model_get_value (GTK_TREE_MODEL(model), iter, 2, &obj); + if (G_VALUE_HOLDS_POINTER (&obj)){ + history_entry = (gpointer) g_value_get_pointer (&obj); + } - if(text != NULL) + if(text != NULL) + { + if (history_entry) { - if (history_entry) + // Filter according to the type of call + // MISSED, INCOMING, OUTGOING, ALL + if ((int)get_current_history_search_type () == SEARCH_ALL) + return g_regex_match_simple(search, text, G_REGEX_CASELESS, 0); + else { - // Filter according to the type of call - // MISSED, INCOMING, OUTGOING, ALL - if ((int)get_current_history_search_type () == SEARCH_ALL) - return g_regex_match_simple(search, text, G_REGEX_CASELESS, 0); - else - { - // We need a match on the history_state_t and the current search type - return (history_entry->_history_state + 1) == (int)get_current_history_search_type () && - g_regex_match_simple(search, text, G_REGEX_CASELESS, 0); - } + // We need a match on the history_state_t and the current search type + return (history_entry->_history_state + 1) == (int)get_current_history_search_type () && + g_regex_match_simple(search, text, G_REGEX_CASELESS, 0); } } + } - // Clean up - g_value_unset (&val); - g_value_unset (&obj); + // Clean up + g_value_unset (&val); + g_value_unset (&obj); - return TRUE; - } return TRUE; } diff --git a/sflphone-client-gnome/src/dbus/dbus.c b/sflphone-client-gnome/src/dbus/dbus.c index 97ee5588913a567e7890461b4c387fe9025cdf20..9737e794dc3be665ca7f16e04624ea85f5c4da06 100644 --- a/sflphone-client-gnome/src/dbus/dbus.c +++ b/sflphone-client-gnome/src/dbus/dbus.c @@ -34,6 +34,8 @@ #include <actions.h> #include <string.h> +#define DEFAULT_DBUS_TIMEOUT 30000 + DBusGConnection * connection; DBusGProxy * callManagerProxy; DBusGProxy * configurationManagerProxy; @@ -389,6 +391,12 @@ dbus_connect () "errorAlert", G_TYPE_INT , G_TYPE_INVALID); dbus_g_proxy_connect_signal (configurationManagerProxy, "errorAlert", G_CALLBACK(error_alert), NULL, NULL); + + /* Defines a default timeout for the proxies */ + dbus_g_proxy_set_default_timeout(callManagerProxy, DEFAULT_DBUS_TIMEOUT); + dbus_g_proxy_set_default_timeout(instanceProxy, DEFAULT_DBUS_TIMEOUT); + dbus_g_proxy_set_default_timeout(configurationManagerProxy, DEFAULT_DBUS_TIMEOUT); + return TRUE; } diff --git a/sflphone-client-gnome/src/mainwindow.c b/sflphone-client-gnome/src/mainwindow.c index 9b987c66b1ac7652c90da6e7448fa70229fa72aa..d481473024f30dfcfc20cb8d4455417d554bfed5 100644 --- a/sflphone-client-gnome/src/mainwindow.c +++ b/sflphone-client-gnome/src/mainwindow.c @@ -197,21 +197,9 @@ create_main_window () gtk_box_pack_start (GTK_BOX (vbox), history->tree, TRUE /*expand*/, TRUE /*fill*/, 0 /*padding*/); gtk_box_pack_start (GTK_BOX (vbox), contacts->tree, TRUE /*expand*/, TRUE /*fill*/, 0 /*padding*/); - // gtk_box_pack_start (GTK_BOX (vbox), current_calls->searchbar, TRUE /*expand*/, TRUE /*fill*/, 0 /*padding*/); - // gtk_box_pack_start (GTK_BOX (vbox), history->searchbar, TRUE /*expand*/, TRUE /*fill*/, 0 /*padding*/); - // gtk_box_pack_start (GTK_BOX (vbox), contacts ->searchbar, TRUE /*expand*/, TRUE /*fill*/, 0 /*padding*/); - gtk_box_pack_start (GTK_BOX (vbox), subvbox, FALSE /*expand*/, FALSE /*fill*/, 0 /*padding*/); - - // if( SHOW_SEARCHBAR ){ - // filterEntry = create_filter_entry(); - // gtk_box_pack_start (GTK_BOX (subvbox), filterEntry, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/); - // gtk_widget_show_all ( filterEntry ); - // } - - - if( SHOW_VOLUME ){ + if( SHOW_VOLUME ){ speaker_control = create_slider("speaker"); gtk_box_pack_end (GTK_BOX (subvbox), speaker_control, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/); gtk_widget_show_all (speaker_control); @@ -350,22 +338,6 @@ main_window_volume_controls( gboolean *state ){ } } -void -main_window_searchbar( gboolean *state UNUSED){ - if( !SHOW_SEARCHBAR ) - { - // filterEntry = create_filter_entry(); - // gtk_box_pack_start (GTK_BOX (subvbox), filterEntry, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/); - // gtk_widget_show_all (filterEntry); - // *state = TRUE; - } - else - { - // gtk_container_remove( GTK_CONTAINER(subvbox) , filterEntry ); - // *state = FALSE; - } -} - void statusbar_push_message(const gchar * message, guint id) { diff --git a/sflphone-client-gnome/src/mainwindow.h b/sflphone-client-gnome/src/mainwindow.h index bdf3c0af125353ceb8ffa9ba4f7894805b004746..77825fbb512b09a6b0cf45715b389a34079bfba9 100644 --- a/sflphone-client-gnome/src/mainwindow.h +++ b/sflphone-client-gnome/src/mainwindow.h @@ -90,8 +90,6 @@ void statusbar_push_message( const gchar* message , guint id ); */ void statusbar_pop_message( guint id ); -void main_window_searchbar( gboolean *state ); - //static gboolean //on_key_released (GtkWidget *widget, GdkEventKey *event, // gpointer user_data); diff --git a/sflphone-client-gnome/src/menus.c b/sflphone-client-gnome/src/menus.c index db443f2a523ac0b208115078f7789297c9dbf81a..a7b95b9723ba68a12b6efd06ea79400ac917b2d8 100644 --- a/sflphone-client-gnome/src/menus.c +++ b/sflphone-client-gnome/src/menus.c @@ -614,16 +614,7 @@ view_volume_controls (GtkImageMenuItem *imagemenuitem UNUSED, dbus_set_volume_controls( state ); } -/* - static void - view_searchbar (GtkImageMenuItem *imagemenuitem UNUSED, - void* foo UNUSED) - { - gboolean state; - main_window_searchbar( &state ); - dbus_set_searchbar( state ); - } - */ + GtkWidget * create_view_menu() { diff --git a/sflphone-client-gnome/src/sflphone_const.h b/sflphone-client-gnome/src/sflphone_const.h index f576ea22a2f459e2802ef330f8d5a91b47faa7cc..a98c08525b309fc23461d996cb7491327e5894ea 100644 --- a/sflphone-client-gnome/src/sflphone_const.h +++ b/sflphone-client-gnome/src/sflphone_const.h @@ -77,8 +77,6 @@ log4c_category_t* log4c_sfl_gtk_category; #define SHOW_DIALPAD ( dbus_get_dialpad() ) /** Show/Hide the volume controls */ #define SHOW_VOLUME ( dbus_get_volume_controls() ) -/** Show/Hide the dialpad */ -#define SHOW_SEARCHBAR ( dbus_get_searchbar() ) /** Show/Hide the alsa configuration panel */ #define SHOW_ALSA_CONF ( dbus_get_audio_manager() == ALSA ) diff --git a/sflphone-client-kde/po/de/sflphone-client-kde.po b/sflphone-client-kde/po/de/sflphone-client-kde.po index da44ae52f633f8ef95329b5019bb3cdfba37dd9b..3df5026271a9b97e1a3e808718e6853df3493bec 100644 --- a/sflphone-client-kde/po/de/sflphone-client-kde.po +++ b/sflphone-client-kde/po/de/sflphone-client-kde.po @@ -38,7 +38,7 @@ msgstr "" #: ../src/Account.cpp:42 msgctxt "account state" -msgid "Bad authentification" +msgid "Authentication Failed" msgstr "" #: ../src/Account.cpp:44 diff --git a/sflphone-client-kde/po/es/sflphone-client-kde.po b/sflphone-client-kde/po/es/sflphone-client-kde.po index a1cbc3c04ba985cefbf4af95c31f9baf8983a77e..d2f4921bf98f6c95717f6a389333e15cff51bbf8 100644 --- a/sflphone-client-kde/po/es/sflphone-client-kde.po +++ b/sflphone-client-kde/po/es/sflphone-client-kde.po @@ -38,7 +38,7 @@ msgstr "" #: ../src/Account.cpp:42 msgctxt "account state" -msgid "Bad authentification" +msgid "Authentication Failed" msgstr "" #: ../src/Account.cpp:44 diff --git a/sflphone-client-kde/po/fr/sflphone-client-kde.po b/sflphone-client-kde/po/fr/sflphone-client-kde.po index d8a946740558f8bd8effee33aa236a25270a3737..7e73a3ee9fc66d2d2f5186c05ee2b5f77012d65e 100644 --- a/sflphone-client-kde/po/fr/sflphone-client-kde.po +++ b/sflphone-client-kde/po/fr/sflphone-client-kde.po @@ -37,7 +37,7 @@ msgstr "Erreur" #: ../src/Account.cpp:42 msgctxt "account state" -msgid "Bad authentification" +msgid "Authentication Failed" msgstr "Mauvaise authentification" #: ../src/Account.cpp:44 diff --git a/sflphone-client-kde/po/ru/sflphone-client-kde.po b/sflphone-client-kde/po/ru/sflphone-client-kde.po index 6cae504c5a3953557cc8b1e6bb42a1e8906aaf28..3a2f9f528549a963da6e8cb4483d53579d4f07ee 100644 --- a/sflphone-client-kde/po/ru/sflphone-client-kde.po +++ b/sflphone-client-kde/po/ru/sflphone-client-kde.po @@ -19,109 +19,109 @@ msgstr "" msgctxt "account state" msgid "Registered" msgstr "" - + #: ../src/Account.cpp:36 msgctxt "account state" msgid "Not Registered" msgstr "" - + #: ../src/Account.cpp:38 msgctxt "account state" msgid "Trying..." msgstr "" - + #: ../src/Account.cpp:40 msgctxt "account state" msgid "Error" msgstr "" - + #: ../src/Account.cpp:42 #, fuzzy msgctxt "account state" msgid "Bad authentification" msgstr "Включить предупреждения" - + #: ../src/Account.cpp:44 msgctxt "account state" msgid "Network unreachable" msgstr "" - + #: ../src/Account.cpp:46 msgctxt "account state" msgid "Host unreachable" msgstr "" - + #: ../src/Account.cpp:48 #, fuzzy msgctxt "account state" msgid "Stun configuration error" msgstr "Окно настроек" - + #: ../src/Account.cpp:50 #, fuzzy msgctxt "account state" msgid "Stun server invalid" msgstr "STUN-сервер" - + #: ../src/Account.cpp:51 msgctxt "account state" msgid "Invalid" msgstr "" - + #: ../src/AccountWizard.cpp:163 ../src/AccountWizard.cpp:278 msgid "Account Creation Wizard" msgstr "Мастер настройки SFLphone" - + #: ../src/AccountWizard.cpp:199 msgid "Creation of account succeed with these parameters" msgstr "Успешное создание аккаунта с этими настройками" - + #: ../src/AccountWizard.cpp:211 msgid "Creation of account has failed for the reason" msgstr "Создание аккаунта не получилось по этим причинам" - + #: ../src/AccountWizard.cpp:217 msgid "Register of account succeed with these parameters" msgstr "Успешное регистрация аккаунта с этими настройками" - + #: ../src/AccountWizard.cpp:255 ../src/AccountWizard.cpp:440 #: ../build/src/ui_dlgaccountsbase.h:359 msgid "Alias" msgstr "Псевдоним" - + #: ../src/AccountWizard.cpp:256 ../src/AccountWizard.cpp:441 #: ../build/src/ui_dlgaccountsbase.h:366 msgid "Server" msgstr "Сервер" - + #: ../src/AccountWizard.cpp:257 ../src/AccountWizard.cpp:442 #: ../build/src/ui_dlgaccountsbase.h:367 msgid "User" msgstr "Пользователь" - + #: ../src/AccountWizard.cpp:258 ../src/AccountWizard.cpp:443 #: ../build/src/ui_dlgaccountsbase.h:368 msgid "Password" msgstr "Пароль" - + #: ../src/AccountWizard.cpp:259 ../build/src/ui_dlgaccountsbase.h:360 msgid "Protocol" msgstr "Протокол" - + #: ../src/AccountWizard.cpp:260 ../build/src/ui_dlgaccountsbase.h:369 #: ../build/src/ui_sflphone_kdeview_base.h:396 msgid "Mailbox" msgstr "Звуковые сообщения" - + #: ../src/AccountWizard.cpp:279 #, fuzzy msgid "Welcome to the Account creation wizard of SFLphone" msgstr "Добро пожаловать в мастер настройки SFLphone" - -#: ../src/AccountWizard.cpp:281 -msgid "This wizard will help you setting up an account." -msgstr "Этот мастер установки поможет вам настроить ваш аккаунт." - + +#: ../src/AccountWizard.cpp:281 +msgid "This wizard will help you setting up an account." +msgstr "Этот мастер установки поможет вам настроить ваш аккаунт." + #: ../src/AccountWizard.cpp:309 ../src/conf/ConfigurationDialog.cpp:50 msgid "Accounts" msgstr "Аккаунты" @@ -1531,3 +1531,4 @@ msgstr "Внимание: Количество результатов превы #~ msgid "&Record" #~ msgstr "Записать" +>>>>>>> rc1:sflphone-client-kde/po/ru/sflphone-client-kde.po diff --git a/sflphone-client-kde/po/sflphone-client-kde.pot b/sflphone-client-kde/po/sflphone-client-kde.pot index a1cbc3c04ba985cefbf4af95c31f9baf8983a77e..d2f4921bf98f6c95717f6a389333e15cff51bbf8 100644 --- a/sflphone-client-kde/po/sflphone-client-kde.pot +++ b/sflphone-client-kde/po/sflphone-client-kde.pot @@ -38,7 +38,7 @@ msgstr "" #: ../src/Account.cpp:42 msgctxt "account state" -msgid "Bad authentification" +msgid "Authentication Failed" msgstr "" #: ../src/Account.cpp:44 diff --git a/sflphone-client-kde/po/zh_CN/sflphone-client-kde.po b/sflphone-client-kde/po/zh_CN/sflphone-client-kde.po index a1cbc3c04ba985cefbf4af95c31f9baf8983a77e..d2f4921bf98f6c95717f6a389333e15cff51bbf8 100644 --- a/sflphone-client-kde/po/zh_CN/sflphone-client-kde.po +++ b/sflphone-client-kde/po/zh_CN/sflphone-client-kde.po @@ -38,7 +38,7 @@ msgstr "" #: ../src/Account.cpp:42 msgctxt "account state" -msgid "Bad authentification" +msgid "Authentication Failed" msgstr "" #: ../src/Account.cpp:44 diff --git a/sflphone-client-kde/po/zh_HK/sflphone-client-kde.po b/sflphone-client-kde/po/zh_HK/sflphone-client-kde.po index a1cbc3c04ba985cefbf4af95c31f9baf8983a77e..d2f4921bf98f6c95717f6a389333e15cff51bbf8 100644 --- a/sflphone-client-kde/po/zh_HK/sflphone-client-kde.po +++ b/sflphone-client-kde/po/zh_HK/sflphone-client-kde.po @@ -38,7 +38,7 @@ msgstr "" #: ../src/Account.cpp:42 msgctxt "account state" -msgid "Bad authentification" +msgid "Authentication Failed" msgstr "" #: ../src/Account.cpp:44 diff --git a/sflphone-client-kde/src/Account.cpp b/sflphone-client-kde/src/Account.cpp index f20614bf6a4c3806c81a151f7ea67227bf3764f4..aee3cb2c54bb9c4f32ee35664061412287230629 100644 --- a/sflphone-client-kde/src/Account.cpp +++ b/sflphone-client-kde/src/Account.cpp @@ -39,7 +39,7 @@ const QString account_state_name(QString & s) if(s == QString(ACCOUNT_STATE_ERROR)) return i18nc("account state", "Error"); if(s == QString(ACCOUNT_STATE_ERROR_AUTH)) - return i18nc("account state", "Bad authentification"); + return i18nc("account state", "Authentication Failed"); if(s == QString(ACCOUNT_STATE_ERROR_NETWORK)) return i18nc("account state", "Network unreachable"); if(s == QString(ACCOUNT_STATE_ERROR_HOST)) diff --git a/sflphone-common/po/de.po b/sflphone-common/po/de.po index 0cc3e2d8012ecbc7e454c023882b58875ad7c06c..3246997221603826606007e9f55961220395cf49 100644 --- a/sflphone-common/po/de.po +++ b/sflphone-common/po/de.po @@ -36,7 +36,7 @@ msgid "Error" msgstr "Fehler" #: ../../sflphone-client-gnome/src/accountlist.c:187 -msgid "Bad authentification" +msgid "Authentication Failed" msgstr "Falsche Authentifizierung" #: ../../sflphone-client-gnome/src/accountlist.c:190 diff --git a/sflphone-common/po/es.po b/sflphone-common/po/es.po index d23b86974a3753c8e12c4590a899267c5e329c68..b583872d1767b5dea4656b653d84596223015308 100644 --- a/sflphone-common/po/es.po +++ b/sflphone-common/po/es.po @@ -37,7 +37,7 @@ msgid "Error" msgstr "Error" #: ../../sflphone-client-gnome/src/accountlist.c:187 -msgid "Bad authentification" +msgid "Authentication Failed" msgstr "Autenticación erronea" #: ../../sflphone-client-gnome/src/accountlist.c:190 diff --git a/sflphone-common/po/fr.po b/sflphone-common/po/fr.po index 00f01e79b6dfb7900d21bc86dda72d4b25baac44..446e0d6034343409dbff0531b80b9c1225a15e75 100644 --- a/sflphone-common/po/fr.po +++ b/sflphone-common/po/fr.po @@ -37,7 +37,7 @@ msgid "Error" msgstr "Erreur" #: ../../sflphone-client-gnome/src/accountlist.c:187 -msgid "Bad authentification" +msgid "Authentication Failed" msgstr "Erreur d'authentification" #: ../../sflphone-client-gnome/src/accountlist.c:190 diff --git a/sflphone-common/po/ru.po b/sflphone-common/po/ru.po index 9cc3d5c8977fe4521a5b35a6d37e1173c95063d1..be3ef6c7cc293d6ec52124ca92adc759430c354e 100644 --- a/sflphone-common/po/ru.po +++ b/sflphone-common/po/ru.po @@ -35,7 +35,7 @@ msgid "Error" msgstr "Ошибка" #: ../../sflphone-client-gnome/src/accountlist.c:187 -msgid "Bad authentification" +msgid "Authentication Failed" msgstr "Неправильная идентификация" #: ../../sflphone-client-gnome/src/accountlist.c:190 diff --git a/sflphone-common/po/sflphone.pot b/sflphone-common/po/sflphone.pot index 4d624badbeb9cc691b461a8c420062ad13745a1d..2ac855f1a8271172c05c2e32e42d15b842105182 100644 --- a/sflphone-common/po/sflphone.pot +++ b/sflphone-common/po/sflphone.pot @@ -35,7 +35,7 @@ msgid "Error" msgstr "" #: ../../sflphone-client-gnome/src/accountlist.c:187 -msgid "Bad authentification" +msgid "Authentication Failed" msgstr "" #: ../../sflphone-client-gnome/src/accountlist.c:190 diff --git a/sflphone-common/po/zh_CN.po b/sflphone-common/po/zh_CN.po index 0347cfcfed711a7e67e8a9718e8b1214b64fb0d0..76b222059b8dd74c95817976a4692e26c2999f24 100644 --- a/sflphone-common/po/zh_CN.po +++ b/sflphone-common/po/zh_CN.po @@ -36,7 +36,7 @@ msgid "Error" msgstr "注册失败" #: ../../sflphone-client-gnome/src/accountlist.c:187 -msgid "Bad authentification" +msgid "Authentication Failed" msgstr "认证错误" #: ../../sflphone-client-gnome/src/accountlist.c:190 diff --git a/sflphone-common/po/zh_HK.po b/sflphone-common/po/zh_HK.po index 2df95b89a9afc094bd3c61ee5762b0bf3baad932..5094cdc8a505f6fc14e73eab8642c851f32526f2 100644 --- a/sflphone-common/po/zh_HK.po +++ b/sflphone-common/po/zh_HK.po @@ -36,7 +36,7 @@ msgid "Error" msgstr "註冊失敗" #: ../../sflphone-client-gnome/src/accountlist.c:187 -msgid "Bad authentification" +msgid "Authentication Failed" msgstr "認證錯誤" #: ../../sflphone-client-gnome/src/accountlist.c:190