[ekiga] Fix discrepancy in possible values for forward/reject timeout
- From: Eugen Dedu <ededu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Fix discrepancy in possible values for forward/reject timeout
- Date: Mon, 21 Jul 2014 14:46:51 +0000 (UTC)
commit c198acee52985669ae2afde2e68d99d49f4d8de4
Author: Tim Marston <tim ed am>
Date: Mon Jul 21 16:44:09 2014 +0200
Fix discrepancy in possible values for forward/reject timeout
In GUI it was 10..299, and in code it was 0..60. Fixes
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=751019.
lib/engine/components/opal/opal-call.cpp | 4 ++--
lib/engine/gui/gtk-frontend/preferences-window.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/lib/engine/components/opal/opal-call.cpp b/lib/engine/components/opal/opal-call.cpp
index bae3533..d565e75 100644
--- a/lib/engine/components/opal/opal-call.cpp
+++ b/lib/engine/components/opal/opal-call.cpp
@@ -214,13 +214,13 @@ void Opal::Call::set_no_answer_forward (unsigned delay, const std::string & uri)
{
forward_uri = uri;
- NoAnswerTimer.SetInterval (0, PMIN (delay, 60));
+ NoAnswerTimer.SetInterval (0, PMIN (delay, 299));
}
void Opal::Call::set_reject_delay (unsigned delay)
{
- NoAnswerTimer.SetInterval (0, PMIN (delay, 60));
+ NoAnswerTimer.SetInterval (0, PMIN (delay, 299));
}
diff --git a/lib/engine/gui/gtk-frontend/preferences-window.cpp
b/lib/engine/gui/gtk-frontend/preferences-window.cpp
index c95de35..e82fde3 100644
--- a/lib/engine/gui/gtk-frontend/preferences-window.cpp
+++ b/lib/engine/gui/gtk-frontend/preferences-window.cpp
@@ -631,7 +631,7 @@ gm_pw_init_call_options_page (PreferencesWindow *self,
/* Translators: the full sentence is Forward calls after x seconds. */
gm_pw_spin_new (container, _("Forward calls after"), _("seconds"),
self->priv->call_options_settings, "no-answer-timeout",
- _("Automatically reject or forward incoming calls if no answer is given after the
specified amount of time (in seconds)"), 10.0, 299.0, 1.0);
+ _("Automatically reject or forward incoming calls if no answer is given after the
specified amount of time (in seconds)"), 0.0, 299.0, 1.0);
gm_pw_toggle_new (container, _("_Automatically answer incoming calls"),
self->priv->call_options_settings, "auto-answer",
_("If enabled, automatically answer incoming calls"));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]