diff options
| author | Mikhail Zabaluev <mikhail.zabaluev@nokia.com> | 2011-03-15 17:38:43 +0200 |
|---|---|---|
| committer | Mikhail Zabaluev <mikhail.zabaluev@nokia.com> | 2011-03-15 17:38:43 +0200 |
| commit | 0f3bf0b7b43016e84bc1c5f9448659c20bd0dcaf (patch) | |
| tree | 369b73a23ca334daa4806b2e976f8d6ac7128d09 | |
| parent | 2736821fc3332e887af8cd8196257d1d90e7957f (diff) | |
| parent | b7032831188d340407e858266d437bdfcfc42eb7 (diff) | |
Merge branch 'keepalive-default'
| -rw-r--r-- | src/protocol.c | 2 | ||||
| -rw-r--r-- | src/sip-connection.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/protocol.c b/src/protocol.c index b6e9b9f..77fef75 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -111,7 +111,7 @@ static TpCMParamSpec rakia_params[] = { /* Keep-alive interval */ { "keepalive-interval", DBUS_TYPE_UINT32_AS_STRING, G_TYPE_UINT, - TP_CONN_MGR_PARAM_FLAG_HAS_DEFAULT, GUINT_TO_POINTER(0), PARAM_EASY }, + 0, NULL, PARAM_EASY }, /* Use SRV DNS lookup to discover STUN server for media NAT traversal * (defaults to true unless stun-server is set) */ diff --git a/src/sip-connection.c b/src/sip-connection.c index 81bcce4..f24847f 100644 --- a/src/sip-connection.c +++ b/src/sip-connection.c @@ -510,7 +510,7 @@ rakia_connection_class_init (RakiaConnectionClass *klass) "Interval between keepalive probes in seconds " "(0 = disabled, unset = use a default interval)", 0, G_MAXUINT32, 0, - G_PARAM_CONSTRUCT | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); INST_PROP(PROP_KEEPALIVE_INTERVAL); param_spec = g_param_spec_boolean ("discover-binding", |