Clean up the useless

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44fc113..51be390 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,13 +1,10 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(net-config C)
-SET(VENDOR "samsung")
 SET(PACKAGE ${PROJECT_NAME})
-SET(PKGNAME "com.${VENDOR}.${PACKAGE}")
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(BINDIR "${PREFIX}/sbin")
 SET(DATADIR "${PREFIX}/share")
 SET(LIBDIR "${PREFIX}/lib")
-# SET(PROFDIR "${PREFIX}/var/lib/${PROJECT_NAME}")
 
 SET(SRCS
        src/main.c
@@ -55,11 +52,8 @@ IF("${ARCH}" STREQUAL "arm")
        MESSAGE("add -DEMBEDDED_TARGET")
 ENDIF("${ARCH}" STREQUAL "arm")
 
-ADD_DEFINITIONS("-DVENDOR=\"${VENDOR}\"")
 ADD_DEFINITIONS("-DPACKAGE=\"${PACKAGE}\"")
-ADD_DEFINITIONS("-DPACKAGE_NAME=\"${PKGNAME}\"")
 ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"")
-ADD_DEFINITIONS("-DPROFILE_DIR=\"${PROFDIR}\"")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
 

diff --git a/debian/changelog b/debian/changelog
index 49003c0..fde9244 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+net-config (0.1.85-2) unstable; urgency=low
+
+  * Clean up the useless
+  * Git: slp/pkgs/n/net-config
+  * Tag: net-config_0.1.85-2
+
+ -- Danny Jeongseok Seo <s.seo@samsung.com>  Tue, 05 Jun 2012 10:41:42 +0900
+
 net-config (0.1.85-1) unstable; urgency=low
 
   * Fix Wi-Fi BG Scan bug for default value

diff --git a/include/dbus.h b/include/dbus.h
index ee0aa02..505f48d 100644 (file)
--- a/include/dbus.h
+++ b/include/dbus.h
@@ -1,80 +1,80 @@
-/*\r
- * Network Configuration Module\r
- *\r
- * Copyright (c) 2000 - 2012 Samsung Electronics Co., Ltd. All rights reserved.\r
- *\r
- * Contact: Danny JS Seo <S.Seo@samsung.com>\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- *\r
- */\r
-\r
-#ifndef __NETCONFIG_DBUS_H__\r
-#define __NETCONFIG_DBUS_H__\r
-\r
-#ifdef __cplusplus\r
-extern "C" {\r
-#endif\r
-\r
-#include <glib.h>\r
-#include <dbus/dbus.h>\r
-#include <dbus/dbus-glib.h>\r
-\r
+/*
+ * Network Configuration Module
+ *
+ * Copyright (c) 2000 - 2012 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Contact: Danny JS Seo <S.Seo@samsung.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#ifndef __NETCONFIG_DBUS_H__
+#define __NETCONFIG_DBUS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <glib.h>
+#include <dbus/dbus.h>
+#include <dbus/dbus-glib.h>
+
 #define CONNMAN_SERVICE                                        "net.connman"
 #define CONNMAN_PATH                                   "/net/connman"
-\r
+
 #define SUPPLICANT_SERVICE                             "fi.w1.wpa_supplicant1"
 #define SUPPLICANT_INTERFACE                   "fi.w1.wpa_supplicant1"
 #define SUPPLICANT_PATH                                        "/fi/w1/wpa_supplicant1"
-#define SUPPLICANT_GLOBAL_INTERFACE            "org.freedesktop.DBus.Properties"\r
-\r
-#define CONNMAN_MANAGER_INTERFACE              CONNMAN_SERVICE ".Manager"\r
-#define CONNMAN_SERVICE_INTERFACE              CONNMAN_SERVICE ".Service"\r
-#define CONNMAN_TECHNOLOGY_INTERFACE   CONNMAN_SERVICE ".Technology"\r
-#define CONNMAN_MANAGER_PATH                   "/"\r
+#define SUPPLICANT_GLOBAL_INTERFACE            "org.freedesktop.DBus.Properties"
+
+#define CONNMAN_MANAGER_INTERFACE              CONNMAN_SERVICE ".Manager"
+#define CONNMAN_SERVICE_INTERFACE              CONNMAN_SERVICE ".Service"
+#define CONNMAN_TECHNOLOGY_INTERFACE   CONNMAN_SERVICE ".Technology"
+#define CONNMAN_MANAGER_PATH                   "/"
 
 #define CONNMAN_WIFI_SERVICE_PROFILE_PREFIX            CONNMAN_PATH "/service/wifi_"
 #define CONNMAN_WIFI_TECHNOLOGY_PREFIX                 CONNMAN_PATH "/technology/wifi"
-\r
-#define DBUS_PATH_MAX_BUFLEN           512\r
-#define DBUS_STATE_MAX_BUFLEN          64\r
-\r
-typedef enum {\r
-       NETCONFIG_DBUS_RESULT_GET_BGSCAN_MODE,\r
-       NETCONFIG_DBUS_RESULT_DEFAULT_TECHNOLOGY,\r
-} netconfig_dbus_result_type;\r
-\r
-struct dbus_input_arguments {\r
-       int type;\r
-       void *data;\r
-};\r
-\r
+
+#define DBUS_PATH_MAX_BUFLEN           512
+#define DBUS_STATE_MAX_BUFLEN          64
+
+typedef enum {
+       NETCONFIG_DBUS_RESULT_GET_BGSCAN_MODE,
+       NETCONFIG_DBUS_RESULT_DEFAULT_TECHNOLOGY,
+} netconfig_dbus_result_type;
+
+struct dbus_input_arguments {
+       int type;
+       void *data;
+};
+
 char *netconfig_wifi_get_connected_service_name(DBusMessage *message);
-DBusMessage *netconfig_invoke_dbus_method(const char *dest, DBusConnection *connection,\r
-               const char *path, const char *interface_name, const char *method);\r
-DBusMessage *netconfig_supplicant_invoke_dbus_method(const char *dest,\r
-               DBusConnection *connection,\r
-               const char *path, const char *interface_name,\r
-               const char *method, GList *args);\r
-DBusMessage *netconfig_dbus_send_request(const char *destination, char *param_array[]);\r
-void netconfig_dbus_parse_recursive(DBusMessageIter *iter,\r
-               netconfig_dbus_result_type result_type, void *data);\r
-char *netconfig_dbus_get_string(DBusMessage *msg);\r
-\r
-DBusGConnection *netconfig_setup_dbus(void);\r
-\r
-#ifdef __cplusplus\r
-}\r
-#endif\r
-\r
-#endif /* __NETCONFIG_DBUS_H__ */\r
+DBusMessage *netconfig_invoke_dbus_method(const char *dest, DBusConnection *connection,
+               const char *path, const char *interface_name, const char *method);
+DBusMessage *netconfig_supplicant_invoke_dbus_method(const char *dest,
+               DBusConnection *connection,
+               const char *path, const char *interface_name,
+               const char *method, GList *args);
+DBusMessage *netconfig_dbus_send_request(const char *destination, char *param_array[]);
+void netconfig_dbus_parse_recursive(DBusMessageIter *iter,
+               netconfig_dbus_result_type result_type, void *data);
+char *netconfig_dbus_get_string(DBusMessage *msg);
+
+DBusGConnection *netconfig_setup_dbus(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __NETCONFIG_DBUS_H__ */

diff --git a/packaging/net-config.changes b/packaging/net-config.changes
index 492be89..0b82cf7 100644 (file)
--- a/packaging/net-config.changes
+++ b/packaging/net-config.changes
@@ -1,6 +1,8 @@
+* Thu Jul 19 2012 Danny JS Seo <S.Seo@samsung.com> - 0.1.85_2
+- Upgrade net-config according to the ConnMan 0.78
+
 * Thu Jul 12 09:37:03 CST 2012 Arron <arron.wang@intel.com> - 0.1.74
 - Add systemd support
 
 * Fri Jun 15 2012 Chris Leech <christopher.leech@linux.intel.com> - 0.1.74
 - move dbus files from /usr/etc/dbus-1 to /etc/dbus-1
-

diff --git a/packaging/net-config.spec b/packaging/net-config.spec
index 1aa211a..0e86bed 100644 (file)
--- a/packaging/net-config.spec
+++ b/packaging/net-config.spec
@@ -2,7 +2,7 @@
 
 Name:       net-config
 Summary:    TIZEN Network Configuration Module
-Version:    0.1.85_1
+Version:    0.1.85_2
 Release:    1
 Group:      System/Network
 License:    Apache License Version 2.0

diff --git a/src/wifi-indicator.c b/src/wifi-indicator.c
index e606e34..621c94a 100644 (file)
--- a/src/wifi-indicator.c
+++ b/src/wifi-indicator.c
@@ -37,7 +37,6 @@
 
 #define VCONFKEY_WIFI_SNR_MIN                          -85
 #define VCONFKEY_WIFI_SNR_MAX                          -55
-#define NETCONFIG_WIFI_WEAK_SIGNAL                     -85
 
 static guint netconfig_wifi_indicator_timer = 0;