[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/network/telepathy-accounts-kcm-plugins/gabble
From:       George Goldberg <grundleborg () googlemail ! com>
Date:       2009-08-10 13:51:52
Message-ID: 1249912312.914212.14317.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1009626 by gberg:

Add a widget for proxy/stun/conference server settings.

 M  +2 -0      CMakeLists.txt  
 M  +11 -0     gabble-account-ui.cpp  
 A             proxy-settings-widget.cpp   [License: LGPL (v2.1+)]
 A             proxy-settings-widget.h   [License: LGPL (v2.1+)]
 A             proxy-settings-widget.ui  


--- trunk/playground/network/telepathy-accounts-kcm-plugins/gabble/CMakeLists.txt #1009625:1009626
@@ -9,11 +9,13 @@
      gabble-account-ui.cpp
      mandatory-parameters-widget.cpp
      server-settings-widget.cpp
+     proxy-settings-widget.cpp
 )
 
 kde4_add_ui_files (kcmtelepathyaccounts_plugin_gabble_SRCS
                    mandatory-parameters-widget.ui
                    server-settings-widget.ui
+                   proxy-settings-widget.ui
 )
 
 kde4_add_plugin (kcmtelepathyaccounts_plugin_gabble
--- trunk/playground/network/telepathy-accounts-kcm-plugins/gabble/gabble-account-ui.cpp #1009625:1009626
@@ -21,6 +21,7 @@
 #include "gabble-account-ui.h"
 
 #include "mandatory-parameters-widget.h"
+#include "proxy-settings-widget.h"
 #include "server-settings-widget.h"
 
 #include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
@@ -53,6 +54,15 @@
     registerSupportedOptionalParameter("low-bandwidth", QVariant::Bool);
     registerSupportedOptionalParameter("ignore-ssl-errors", QVariant::Bool);
     registerSupportedOptionalParameter("keepalive-interval", QVariant::UInt);
+
+    registerSupportedOptionalParameter("stun-server", QVariant::String);
+    registerSupportedOptionalParameter("stun-port", QVariant::UInt);
+    registerSupportedOptionalParameter("fallback-stun-server", QVariant::String);
+    registerSupportedOptionalParameter("fallback-stun-port", QVariant::UInt);
+    registerSupportedOptionalParameter("https-proxy-server", QVariant::String);
+    registerSupportedOptionalParameter("https-proxy-port", QVariant::UInt);
+    registerSupportedOptionalParameter("fallback-socks5-proxies", QVariant::StringList);
+    registerSupportedOptionalParameter("fallback-conference-server", QVariant::String);
 }
 
 GabbleAccountUi::~GabbleAccountUi()
@@ -81,6 +91,7 @@
 
     // Add each of the optional parameter widgets.
     widgets.append(new ServerSettingsWidget(parameters, values));
+    widgets.append(new ProxySettingsWidget(parameters, values));
 
     return widgets;
 }
[prev in list] [next in list] [prev in thread] [next in thread]