Merge "[ACR-456]Add enumeration for connection type" into tizen

diff --git a/include/net_connection.h b/include/net_connection.h
index f658d50..9cbb5b6 100755 (executable)
--- a/include/net_connection.h
+++ b/include/net_connection.h
@@ -55,6 +55,7 @@ typedef enum
     CONNECTION_TYPE_CELLULAR = 2,  /**< Cellular type */
     CONNECTION_TYPE_ETHERNET = 3,  /**< Ethernet type */
     CONNECTION_TYPE_BT = 4,  /**< Bluetooth type */
+    CONNECTION_TYPE_PROXY, /**< Proxy type (Since 3.0) */
 } connection_type_e;
 
 /**

diff --git a/src/connection.c b/src/connection.c
index 304deca..3d13899 100755 (executable)
--- a/src/connection.c
+++ b/src/connection.c
@@ -34,6 +34,8 @@ static int __connection_convert_net_state(int status)
                return CONNECTION_TYPE_ETHERNET;
        case VCONFKEY_NETWORK_BLUETOOTH:
                return CONNECTION_TYPE_BT;
+       case VCONFKEY_NETWORK_DEFAULT_PROXY:
+               return CONNECTION_TYPE_PROXY;
        default:
                return CONNECTION_TYPE_DISCONNECTED;
        }