Align variable name for ef_index to maintain uniformatiy.

diff --git a/introspection/ex.xml b/introspection/ex.xml
old mode 100644 (file)
new mode 100755 (executable)
index ac9aa3c..9aa52e5
--- a/introspection/ex.xml
+++ b/introspection/ex.xml
@@ -110,7 +110,7 @@
                <!--
                        SetPreferredPlmn:
                        @mode: add(1), edit(2), delete(3)
-                       @ef_index: Operator index in the EFplmnsel of the SIM
+                       @index: Operator index in the EFplmnsel of the SIM
                        @act: Access technology. GSM(1), GPRS(2), EGPRS(3), UMTS(4), IS95A(17), IS95B(18), EHRPD(25), LTE(33)
                        @plmn: Plmn
                        @result: Success(0)
@@ -119,14 +119,14 @@
                -->
                <method name="SetPreferredPlmn">
                        <arg direction="in" type="i" name="mode"/>
-                       <arg direction="in" type="i" name="ef_index"/>
+                       <arg direction="in" type="i" name="index"/>
                        <arg direction="in" type="i" name="act"/>
                        <arg direction="in" type="s" name="plmn"/>
                        <arg direction="out" type="i" name="result"/>
                </method>
                <!--
                        GetPreferredPlmn:
-                       @list: A set of key/dict paris with preferred plmn list. <para>dict items are:</para><itemizedlist><listitem>"plmn" <type>string</type></listitem><listitem>"act" <type>int</type></listitem><listitem>"ef_index" <type>int</type></listitem></itemizedlist>
+                       @list: A set of key/dict paris with preferred plmn list. <para>dict items are:</para><itemizedlist><listitem>"plmn" <type>string</type></listitem><listitem>"act" <type>int</type></listitem><listitem>"index" <type>int</type></listitem></itemizedlist>
                        @result: Success(0)
 
                        Get Preferred Plmn list

diff --git a/introspection/network.xml b/introspection/network.xml
old mode 100644 (file)
new mode 100755 (executable)
index f0b41b1..da2721b
--- a/introspection/network.xml
+++ b/introspection/network.xml
@@ -137,7 +137,7 @@
                <!--
                        SetPreferredPlmn:
                        @mode: add(1), edit(2), delete(3)
-                       @ef_index: Operator index in the EFplmnsel of the SIM
+                       @index: Operator index in the EFplmnsel of the SIM
                        @act: Access technology. GSM(1), GPRS(2), EGPRS(3), UMTS(4), IS95A(17), IS95B(18), EHRPD(25), LTE(33)
                        @plmn: Plmn
                        @result: Success(0)
@@ -146,7 +146,7 @@
                -->
                <method name="SetPreferredPlmn">
                        <arg direction="in" type="i" name="mode"/>
-                       <arg direction="in" type="i" name="ef_index"/>
+                       <arg direction="in" type="i" name="index"/>
                        <arg direction="in" type="i" name="act"/>
                        <arg direction="in" type="s" name="plmn"/>
                        <arg direction="out" type="i" name="result"/>
@@ -154,7 +154,7 @@
 
                <!--
                        GetPreferredPlmn:
-                       @list: A set of key/dict paris with preferred plmn list. <para>dict items are:</para><itemizedlist><listitem>"plmn" <type>string</type></listitem><listitem>"act" <type>int</type></listitem><listitem>"ef_index" <type>int</type></listitem></itemizedlist>
+                       @list: A set of key/dict paris with preferred plmn list. <para>dict items are:</para><itemizedlist><listitem>"plmn" <type>string</type></listitem><listitem>"act" <type>int</type></listitem><listitem>"index" <type>int</type></listitem></itemizedlist>
                        @result: Success(0)
 
                        Get Preferred Plmn list

diff --git a/src/network.c b/src/network.c
old mode 100644 (file)
new mode 100755 (executable)
index 75cb6f5..fc16451
--- a/src/network.c
+++ b/src/network.c
@@ -477,7 +477,7 @@ static gboolean
 on_network_set_preferred_plmn (TelephonyNetwork *network,
                GDBusMethodInvocation *invocation,
                gint mode,
-               gint ef_index,
+               gint index,
                gint act,
                const gchar *plmn,
                gpointer user_data)
@@ -490,7 +490,7 @@ on_network_set_preferred_plmn (TelephonyNetwork *network,
        ur = MAKE_UR(ctx, network, invocation);
 
        req.operation = mode;
-       req.ef_index = ef_index;
+       req.index = index;
        req.act = act;
 
        memcpy(req.plmn, plmn, 6);
@@ -857,7 +857,7 @@ gboolean dbus_plugin_network_response(struct custom_data *ctx, UserRequest *ur,
                                                        g_variant_new_string(resp_get_preferred_plmn->list[i].plmn));
                                        g_variant_builder_add(&b, "{sv}", "act", g_variant_new_int32(resp_get_preferred_plmn->list[i].act));
                                        g_variant_builder_add(&b, "{sv}", "index",
-                                                       g_variant_new_int32(resp_get_preferred_plmn->list[i].ef_index));
+                                                       g_variant_new_int32(resp_get_preferred_plmn->list[i].index));
 
                                        buf = _get_network_name_by_plmn(co_network, resp_get_preferred_plmn->list[i].plmn);
                                        if (buf)