more easy properties for network, fix typo with "Strength".

[framework/uifw/edbus.git] / src / lib / connman / e_connman_private.h

diff --git a/src/lib/connman/e_connman_private.h b/src/lib/connman/e_connman_private.h
index 3190e50..4f1af9f 100644 (file)
--- a/src/lib/connman/e_connman_private.h
+++ b/src/lib/connman/e_connman_private.h
@@ -1,8 +1,13 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+
 #include <Eina.h>
 #include <eina_safety_checks.h>
 
 #include "E_Connman.h"
-#include <stdio.h>
 
 static const char manager_path[] = "/";
 
@@ -22,6 +27,7 @@ extern const char *e_connman_prop_devices;
 extern const char *e_connman_prop_interface;
 extern const char *e_connman_prop_ipv4_address;
 extern const char *e_connman_prop_ipv4_method;
+extern const char *e_connman_prop_address;
 extern const char *e_connman_prop_name;
 extern const char *e_connman_prop_network;
 extern const char *e_connman_prop_networks;
@@ -30,18 +36,40 @@ extern const char *e_connman_prop_policy;
 extern const char *e_connman_prop_powered;
 extern const char *e_connman_prop_priority;
 extern const char *e_connman_prop_profiles;
+extern const char *e_connman_prop_services;
 extern const char *e_connman_prop_remember;
 extern const char *e_connman_prop_scan_interval;
 extern const char *e_connman_prop_scanning;
 extern const char *e_connman_prop_state;
-extern const char *e_connman_prop_strengh;
+extern const char *e_connman_prop_strength;
+extern const char *e_connman_prop_frequency;
 extern const char *e_connman_prop_type;
 extern const char *e_connman_prop_wifi_mode;
 extern const char *e_connman_prop_wifi_passphrase;
 extern const char *e_connman_prop_wifi_security;
 extern const char *e_connman_prop_wifi_ssid;
+extern const char *e_connman_prop_wifi_channel;
+extern const char *e_connman_prop_wifi_eap;
+extern const char *e_connman_prop_error;
+extern const char *e_connman_prop_mode;
+extern const char *e_connman_prop_security;
+extern const char *e_connman_prop_passphrase;
+extern const char *e_connman_prop_passphrase_required;
+extern const char *e_connman_prop_favorite;
+extern const char *e_connman_prop_immutable;
+extern const char *e_connman_prop_auto_connect;
+extern const char *e_connman_prop_setup_required;
+extern const char *e_connman_prop_apn;
+extern const char *e_connman_prop_mcc;
+extern const char *e_connman_prop_mnc;
+extern const char *e_connman_prop_roaming;
+
 extern int _e_dbus_connman_log_dom;
 
+#ifndef EINA_LOG_DEFAULT_COLOR
+#define EINA_LOG_DEFAULT_COLOR EINA_COLOR_CYAN
+#endif
+
 #undef DBG
 #undef INF
 #undef WRN
@@ -58,21 +86,21 @@ __dbus_callback_check_and_init(const char *file, int line, const char *function,
    if (!msg)
      {
        if (err)
-         ERROR(file, function, line,
-               "an error was reported by server: "
-               "name=\"%s\", message=\"%s\"",
-               err->name, err->message);
+         ERR(file, function, line,
+              "an error was reported by server: "
+              "name=\"%s\", message=\"%s\"",
+              err->name, err->message);
        else
-         ERROR(file, function, line,
-               "callback without message arguments!");
+         ERR(file, function, line,
+              "callback without message arguments!");
 
        return 0;
      }
 
    if (!dbus_message_iter_init(msg, itr))
      {
-       ERROR(file, function, line,
-            "could not init iterator.");
+       ERR(file, function, line,
+           "could not init iterator.");
        return 0;
      }
 
@@ -89,9 +117,9 @@ __dbus_iter_type_check(const char *file, int line, const char *function, int typ
    if (type == expected)
      return 1;
 
-   ERROR(file, function, line,
-        "expected type %s (%c) but got %c instead!",
-        expected_name, expected, type);
+   ERR(file, function, line,
+       "expected type %s (%c) but got %c instead!",
+       expected_name, expected, type);
 
    return 0;
 }
@@ -112,8 +140,8 @@ void e_connman_element_unregister(E_Connman_Element *element);
 bool e_connman_element_objects_array_get_stringshared(const E_Connman_Element *element, const char *property, unsigned int *count, E_Connman_Element ***elements);
 unsigned char *e_connman_element_bytes_array_get_stringshared(const E_Connman_Element *element, const char *property, unsigned int *count);
 
-bool e_connman_element_call_with_path(E_Connman_Element *element, const char *method_name, const char *string, E_DBus_Method_Return_Cb cb, Eina_Inlist **pending, E_DBus_Method_Return_Cb user_cb, const void *user_data);
-
 bool e_connman_element_message_send(E_Connman_Element *element, const char *method_name, E_DBus_Method_Return_Cb cb, DBusMessage *msg, Eina_Inlist **pending, E_DBus_Method_Return_Cb user_cb, const void *user_data);
 
 bool e_connman_element_call_full(E_Connman_Element *element, const char *method_name, E_DBus_Method_Return_Cb cb, Eina_Inlist **pending, E_DBus_Method_Return_Cb user_cb, const void *user_data);
+bool e_connman_element_call_with_path(E_Connman_Element *element, const char *method_name, const char *string, E_DBus_Method_Return_Cb cb, Eina_Inlist **pending, E_DBus_Method_Return_Cb user_cb, const void *user_data);
+bool e_connman_element_call_with_string(E_Connman_Element *element, const char *method_name, const char *string, E_DBus_Method_Return_Cb cb, Eina_Inlist **pending, E_DBus_Method_Return_Cb user_cb, const void *user_data);