[farsight2/master] Share the same default stun timeout in stream and component

[Olivier Crête]

---
 transmitters/rawudp/fs-rawudp-component.c          |    3 ---
 transmitters/rawudp/fs-rawudp-component.h          |    4 ++++
 transmitters/rawudp/fs-rawudp-stream-transmitter.c |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/transmitters/rawudp/fs-rawudp-component.c b/transmitters/rawudp/fs-rawudp-component.c
index 933bfcb..f1e2733 100644
--- a/transmitters/rawudp/fs-rawudp-component.c
+++ b/transmitters/rawudp/fs-rawudp-component.c
@@ -63,9 +63,6 @@
 #define DEFAULT_UPNP_MAPPING_TIMEOUT (600)
 #define DEFAULT_UPNP_DISCOVERY_TIMEOUT (10)
 
-#define MAX_STUN_TIMEOUT (60)
-#define DEFAULT_STUN_TIMEOUT (10)
-
 /* Signals */
 enum
 {
diff --git a/transmitters/rawudp/fs-rawudp-component.h b/transmitters/rawudp/fs-rawudp-component.h
index d37379a..1dbf377 100644
--- a/transmitters/rawudp/fs-rawudp-component.h
+++ b/transmitters/rawudp/fs-rawudp-component.h
@@ -57,6 +57,10 @@ typedef struct _FsRawUdpComponent FsRawUdpComponent;
 typedef struct _FsRawUdpComponentClass FsRawUdpComponentClass;
 typedef struct _FsRawUdpComponentPrivate FsRawUdpComponentPrivate;
 
+#define MAX_STUN_TIMEOUT (60)
+#define DEFAULT_STUN_TIMEOUT (10)
+
+
 /**
  * FsRawUdpComponentClass:
  * @parent_class: Our parent
diff --git a/transmitters/rawudp/fs-rawudp-stream-transmitter.c b/transmitters/rawudp/fs-rawudp-stream-transmitter.c
index 5c90fa7..7dbbb91 100644
--- a/transmitters/rawudp/fs-rawudp-stream-transmitter.c
+++ b/transmitters/rawudp/fs-rawudp-stream-transmitter.c
@@ -280,7 +280,7 @@ fs_rawudp_stream_transmitter_class_init (FsRawUdpStreamTransmitterClass *klass)
       g_param_spec_uint ("stun-timeout",
           "The timeout for the STUN reply",
           "How long to wait for for the STUN reply (in seconds) before giving up",
-          1, G_MAXUINT, 30,
+          1, MAX_STUN_TIMEOUT, DEFAULT_STUN_TIMEOUT,
           G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
-- 
1.5.6.5