commit fea8405a7b458079925b2478c5c8cd782f15af44
author Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com> Fri May 13 16:32:51 2016 -0400
committer Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com> Fri May 13 16:32:51 2016 -0400
tree c1bb0fcf6dc7880bc271d66de59414a3b0e883f6
parent 07107e96b5289517eeaa3291e1b8bb106ac2daf0

do not differentiate ip2ip and SIP in the UI

The ip2ip account is no longer unique nor required, it is simply
a SIP account which has no hostname. Thus we must not differentiate
it in the UI.

Change-Id: I382e58f9803e2e78dbd019d1bb6a392df946fdd5
Tuleap: #689

src/accountadvancedtab.cpp

diff --git a/src/accountadvancedtab.cpp b/src/accountadvancedtab.cpp
index 46dbbd2..0faadd6 100644
--- a/src/accountadvancedtab.cpp
+++ b/src/accountadvancedtab.cpp
@@ -346,52 +346,38 @@
     g_return_if_fail(IS_ACCOUNT_ADVANCED_TAB(self));
     AccountAdvancedTabPrivate *priv = ACCOUNT_ADVANCED_TAB_GET_PRIVATE(self);
 
-    /* check if its ip2ip account */
-    const QByteArray& alias = priv->account->alias().toUtf8();
-
-    /* if account is IP2IP we don't need the registration box */
-    if (strcmp(alias.constData(), "IP2IP") == 0) {
-        gtk_container_remove(GTK_CONTAINER(priv->vbox_main), priv->frame_registration);
-        priv->frame_registration = NULL;
-        priv->box_registration = NULL;
+    /* only show registration timeout for SIP account */
+    if (priv->account->protocol() != Account::Protocol::SIP) {
+        gtk_container_remove(GTK_CONTAINER(priv->box_registration), priv->box_registration_expire);
         priv->box_registration_expire = NULL;
+    } else {
+        gtk_adjustment_set_value(GTK_ADJUSTMENT(priv->adjustment_registration_timeout),
+                                 priv->account->registrationExpire());
+        g_signal_connect(priv->adjustment_registration_timeout,
+                         "value-changed", G_CALLBACK(registration_expire_changed), self);
+    }
+
+    /* only show allow call options for Ring accounts */
+    if (priv->account->protocol() != Account::Protocol::RING) {
+        gtk_container_remove(GTK_CONTAINER(priv->box_registration), priv->checkbutton_allow_incoming_unknown);
         priv->checkbutton_allow_incoming_unknown = NULL;
+        gtk_container_remove(GTK_CONTAINER(priv->box_registration), priv->checkbutton_allow_incoming_history);
         priv->checkbutton_allow_incoming_history = NULL;
+        gtk_container_remove(GTK_CONTAINER(priv->box_registration), priv->checkbutton_allow_incoming_contacts);
         priv->checkbutton_allow_incoming_contacts = NULL;
     } else {
-        /* only show registration timeout for SIP account */
-        if (priv->account->protocol() != Account::Protocol::SIP) {
-            gtk_container_remove(GTK_CONTAINER(priv->box_registration), priv->box_registration_expire);
-            priv->box_registration_expire = NULL;
-        } else {
-            gtk_adjustment_set_value(GTK_ADJUSTMENT(priv->adjustment_registration_timeout),
-                                     priv->account->registrationExpire());
-            g_signal_connect(priv->adjustment_registration_timeout,
-                             "value-changed", G_CALLBACK(registration_expire_changed), self);
-        }
-
-        /* only show allow call options for Ring accounts */
-        if (priv->account->protocol() != Account::Protocol::RING) {
-            gtk_container_remove(GTK_CONTAINER(priv->box_registration), priv->checkbutton_allow_incoming_unknown);
-            priv->checkbutton_allow_incoming_unknown = NULL;
-            gtk_container_remove(GTK_CONTAINER(priv->box_registration), priv->checkbutton_allow_incoming_history);
-            priv->checkbutton_allow_incoming_history = NULL;
-            gtk_container_remove(GTK_CONTAINER(priv->box_registration), priv->checkbutton_allow_incoming_contacts);
-            priv->checkbutton_allow_incoming_contacts = NULL;
-        } else {
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->checkbutton_allow_incoming_unknown),
-                                         priv->account->allowIncomingFromUnknown());
-            g_signal_connect(priv->checkbutton_allow_incoming_unknown,
-                             "toggled", G_CALLBACK(allow_from_unknown_toggled), self);
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->checkbutton_allow_incoming_history),
-                                         priv->account->allowIncomingFromHistory());
-            g_signal_connect(priv->checkbutton_allow_incoming_history,
-                             "toggled", G_CALLBACK(allow_from_history_toggled), self);
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->checkbutton_allow_incoming_contacts),
-                                         priv->account->allowIncomingFromContact());
-            g_signal_connect(priv->checkbutton_allow_incoming_contacts,
-                             "toggled", G_CALLBACK(allow_from_contacts_toggled), self);
-        }
+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->checkbutton_allow_incoming_unknown),
+                                     priv->account->allowIncomingFromUnknown());
+        g_signal_connect(priv->checkbutton_allow_incoming_unknown,
+                         "toggled", G_CALLBACK(allow_from_unknown_toggled), self);
+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->checkbutton_allow_incoming_history),
+                                     priv->account->allowIncomingFromHistory());
+        g_signal_connect(priv->checkbutton_allow_incoming_history,
+                         "toggled", G_CALLBACK(allow_from_history_toggled), self);
+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->checkbutton_allow_incoming_contacts),
+                                     priv->account->allowIncomingFromContact());
+        g_signal_connect(priv->checkbutton_allow_incoming_contacts,
+                         "toggled", G_CALLBACK(allow_from_contacts_toggled), self);
     }
 
     /* local port */