From 17f113d30f11fdc9c0ef0854777bfc1176797946 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 6 Jun 2014 15:25:15 +0200
Subject: [PATCH] Add configuration of AVPF in the proxy config GTK dialog.

---
 gtk/propertybox.c  | 10 +++++++++
 gtk/sip_account.ui | 54 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+)

diff --git a/gtk/propertybox.c b/gtk/propertybox.c
index 81d3db345..23211fa3b 100644
--- a/gtk/propertybox.c
+++ b/gtk/propertybox.c
@@ -922,6 +922,10 @@ void linphone_gtk_show_proxy_config(GtkWidget *pb, LinphoneProxyConfig *cfg){
 			linphone_proxy_config_register_enabled(cfg));
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(w,"publish")),
 			linphone_proxy_config_publish_enabled(cfg));
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(w,"avpf")),
+			linphone_proxy_config_avpf_enabled(cfg));
+		gtk_spin_button_set_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(w,"avpf_rr_interval")),
+			linphone_proxy_config_get_avpf_rr_interval(cfg));
 	}
 	g_object_set_data(G_OBJECT(w),"config",(gpointer)cfg);
 	g_object_set_data(G_OBJECT(w),"parameters",(gpointer)pb);
@@ -978,6 +982,12 @@ void linphone_gtk_proxy_ok(GtkButton *button){
 	linphone_proxy_config_enable_register(cfg,
 		gtk_toggle_button_get_active(
 			GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(w,"register"))));
+	linphone_proxy_config_enable_avpf(cfg,
+		gtk_toggle_button_get_active(
+			GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(w,"avpf"))));
+	linphone_proxy_config_set_avpf_rr_interval(cfg,
+		(int)gtk_spin_button_get_value(
+			GTK_SPIN_BUTTON(linphone_gtk_get_widget(w,"avpf_rr_interval"))));
 
 	/* check if tls was asked but is not enabled in transport configuration*/
 	if (tport==LinphoneTransportTls){
diff --git a/gtk/sip_account.ui b/gtk/sip_account.ui
index d0a93d5dc..6d03932d1 100644
--- a/gtk/sip_account.ui
+++ b/gtk/sip_account.ui
@@ -8,6 +8,13 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">5</property>
+    <property name="lower">1</property>
+    <property name="value">5</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">1</property>
+  </object>
   <object class="GtkDialog" id="sip_account">
     <property name="can_focus">False</property>
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -235,6 +242,37 @@
                             <property name="bottom_attach">6</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="GtkLabel" id="avpf_rr_interval_label">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="label" translatable="yes">AVPF regular RTCP interval (sec):</property>
+                            <property name="justify">right</property>
+                          </object>
+                          <packing>
+                            <property name="top_attach">6</property>
+                            <property name="bottom_attach">7</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSpinButton" id="avpf_rr_interval">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="primary_icon_activatable">False</property>
+                            <property name="secondary_icon_activatable">False</property>
+                            <property name="primary_icon_sensitive">True</property>
+                            <property name="secondary_icon_sensitive">True</property>
+                            <property name="adjustment">adjustment2</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">6</property>
+                            <property name="bottom_attach">7</property>
+                          </packing>
+                        </child>
                         <child>
                           <object class="GtkLabel" id="label40">
                             <property name="visible">True</property>
@@ -311,6 +349,22 @@
                         <property name="position">2</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkCheckButton" id="avpf">
+                        <property name="label" translatable="yes">Enable AVPF</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
                   </object>
                 </child>
               </object>