From a136192db2bedce9e088ab55710461b5af22d2cd Mon Sep 17 00:00:00 2001
From: Karim Gemayel <kgemayel@process-one.net>
Date: Mon, 1 Jun 2009 16:34:38 +0000
Subject: [PATCH] API renaming : bare_jid_to_jid -> full

SVN Revision: 2121
---
 src/ejabberd_sm.erl          | 4 ++--
 src/mod_configure.erl        | 4 ++--
 src/mod_disco.erl            | 2 +-
 src/mod_echo.erl             | 2 +-
 src/mod_muc/mod_muc_room.erl | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl
index 7bb0cf35a..b5c8270e9 100644
--- a/src/ejabberd_sm.erl
+++ b/src/ejabberd_sm.erl
@@ -465,7 +465,7 @@ do_route(From, To, Packet) ->
 			      fun({_, R}) ->
 				      do_route(
 					From,
-					exmpp_jid:bare_jid_to_jid(To, R),
+					exmpp_jid:full(To, R),
 					Packet)
 			      end, PResources);
 		       true ->
@@ -479,7 +479,7 @@ do_route(From, To, Packet) ->
 		    lists:foreach(
 		      fun(R) ->
 			      do_route(From,
-				       exmpp_jid:bare_jid_to_jid(To, R),
+				       exmpp_jid:full(To, R),
 				       Packet)
 		      end, get_user_resources(exmpp_jid:lnode(To), 
                                       exmpp_jid:ldomain(To)));
diff --git a/src/mod_configure.erl b/src/mod_configure.erl
index 9dc25ffc8..838ce0ddb 100644
--- a/src/mod_configure.erl
+++ b/src/mod_configure.erl
@@ -304,7 +304,7 @@ get_user_resources(BareJID) ->
 		      #xmlel{ns = ?NS_DISCO_ITEMS, name = 'item', attrs =
 		       [?XMLATTR('jid', 
                          exmpp_jid:jid_to_binary(
-                                  exmpp_jid:bare_jid_to_jid(BareJID, R))),
+                                  exmpp_jid:full(BareJID, R))),
 			    ?XMLATTR('name', 
                          exmpp_jid:lnode(BareJID))]}
 	      end, lists:sort(Rs)).
@@ -1677,7 +1677,7 @@ set_form(From, Host, ?NS_ADMINL("user-stats"), Lang, XData) ->
 
     Resources = ejabberd_sm:get_user_resources(exmpp_jid:lnode(JID), 
                                                exmpp_jid:ldomain(JID)),
-    IPs1 = [ejabberd_sm:get_user_ip(exmpp_jid:bare_jid_to_jid(JID,Resource)) 
+    IPs1 = [ejabberd_sm:get_user_ip(exmpp_jid:full(JID,Resource)) 
                 || Resource <- Resources],
     IPs = [inet_parse:ntoa(IP)++":"++integer_to_list(Port) || {IP, Port} <- IPs1],
 
diff --git a/src/mod_disco.erl b/src/mod_disco.erl
index b548464eb..a75b173f4 100644
--- a/src/mod_disco.erl
+++ b/src/mod_disco.erl
@@ -397,7 +397,7 @@ get_user_resources(JID) ->
     lists:map(fun(R) ->
 		      #xmlel{ns = ?NS_DISCO_ITEMS, name = 'item', attrs = [
 			  ?XMLATTR('jid',
-			    exmpp_jid:jid_to_binary(exmpp_jid:bare_jid_to_jid(JID, R))),
+			    exmpp_jid:jid_to_binary(exmpp_jid:full(JID, R))),
 			  ?XMLATTR('name', exmpp_jid:lnode(JID))
 			]}
 	      end, lists:sort(Rs)).
diff --git a/src/mod_echo.erl b/src/mod_echo.erl
index a1df48723..27a2850a5 100644
--- a/src/mod_echo.erl
+++ b/src/mod_echo.erl
@@ -174,7 +174,7 @@ do_client_version(disabled, _From, _To) ->
 do_client_version(enabled, From, To) ->
     %% It is important to identify this process and packet
     Random_resource = integer_to_list(random:uniform(100000)),
-    From2 = exmpp_jid:bare_jid_to_jid(From,Random_resource),
+    From2 = exmpp_jid:full(From,Random_resource),
     
     %% Build an iq:query request
     Request = #xmlel{ns = ?NS_SOFT_VERSION, name = 'query'},
diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl
index d16e09020..3dc9b1577 100644
--- a/src/mod_muc/mod_muc_room.erl
+++ b/src/mod_muc/mod_muc_room.erl
@@ -3533,7 +3533,7 @@ tab_count_user(JID) ->
     
     
 jid_replace_resource(JID, Resource) ->
-    exmpp_jid:bare_jid_to_jid(JID, Resource).
+    exmpp_jid:full(JID, Resource).