Fix issues on import improvements

diff --git a/src/mod_offline_riak.erl b/src/mod_offline_riak.erl
index 24d565383f614a7970ba4173d2d4a8b7cf030861..824abc89c4df1f6bbe466321b63ff1cccf504cc3 100644 (file)
--- a/src/mod_offline_riak.erl
+++ b/src/mod_offline_riak.erl
@@ -13,7 +13,7 @@
 -export([init/2, store_messages/5, pop_messages/2, remove_expired_messages/1,
         remove_old_messages/2, remove_user/2, read_message_headers/2,
         read_message/3, remove_message/3, read_all_messages/2,
-        remove_all_messages/2, count_messages/2, import/2]).
+        remove_all_messages/2, count_messages/2, import/1]).
 
 -include("xmpp.hrl").
 -include("mod_offline.hrl").
@@ -133,7 +133,7 @@ count_messages(LUser, LServer) ->
             0
     end.
 
-import(_LServer, #offline_msg{us = US, timestamp = TS} = M) ->
+import(#offline_msg{us = US, timestamp = TS} = M) ->
     ejabberd_riak:put(M, offline_msg_schema(),
                      [{i, TS}, {'2i', [{<<"us">>, US}]}]).
 

diff --git a/src/mod_privacy.erl b/src/mod_privacy.erl
index 97a8f18046022c3d3da6385ed1f5f272194dd9e9..f1b8411d24ea7bf3b5b313e2041e164d9b63bc7e 100644 (file)
--- a/src/mod_privacy.erl
+++ b/src/mod_privacy.erl
@@ -35,6 +35,7 @@
         process_iq_set/3, process_iq_get/3, get_user_list/3,
         check_packet/6, remove_user/2, encode_list_item/1,
         is_list_needdb/1, updated_list/3,
+        import_start/2, import_stop/2,
          item_to_xml/1, get_user_lists/2, import/5,
         set_privacy_list/1, mod_opt_type/1, depends/2]).
 

diff --git a/src/mod_privacy_mnesia.erl b/src/mod_privacy_mnesia.erl
index 4642ba58ee55676c8a10a899a099ca0a881c6d9b..a93e92139fc3e47b05c9d2ad2081b35b422f17ed 100644 (file)
--- a/src/mod_privacy_mnesia.erl
+++ b/src/mod_privacy_mnesia.erl
@@ -15,7 +15,7 @@
         process_default_set/3, process_active_set/3,
         remove_privacy_list/3, set_privacy_list/1,
         set_privacy_list/4, get_user_list/2, get_user_lists/2,
-        remove_user/2, import/2]).
+        remove_user/2, import/1]).
 
 -include("xmpp.hrl").
 -include("mod_privacy.hrl").
@@ -144,7 +144,7 @@ remove_user(LUser, LServer) ->
     F = fun () -> mnesia:delete({privacy, {LUser, LServer}}) end,
     mnesia:transaction(F).
 
-import(_LServer, #privacy{} = P) ->
+import(#privacy{} = P) ->
     mnesia:dirty_write(P).
 
 %%%===================================================================

diff --git a/src/mod_privacy_riak.erl b/src/mod_privacy_riak.erl
index 509ff5ebb22b72bc5680ed37cf418cb3648be870..b96a08cbc64ea8db0ba959224dcc84e05b5ee6db 100644 (file)
--- a/src/mod_privacy_riak.erl
+++ b/src/mod_privacy_riak.erl
@@ -15,7 +15,7 @@
         process_default_set/3, process_active_set/3,
         remove_privacy_list/3, set_privacy_list/1,
         set_privacy_list/4, get_user_list/2, get_user_lists/2,
-        remove_user/2, import/2]).
+        remove_user/2, import/1]).
 
 -export([privacy_schema/0]).
 
@@ -145,7 +145,7 @@ get_user_lists(LUser, LServer) ->
 remove_user(LUser, LServer) ->
     {atomic, ejabberd_riak:delete(privacy, {LUser, LServer})}.
 
-import(_LServer, #privacy{} = P) ->
+import(#privacy{} = P) ->
     ejabberd_riak:put(P, privacy_schema()).
 
 %%%===================================================================

diff --git a/src/mod_vcard_ldap.erl b/src/mod_vcard_ldap.erl
index d8efe30f5c4fcd6d0585e0e84dbff290f4c42ee9..c9e19690fc07e74e4a2f96a9e6bd2bd613e4dd20 100644 (file)
--- a/src/mod_vcard_ldap.erl
+++ b/src/mod_vcard_ldap.erl
@@ -14,7 +14,7 @@
 %% API
 -export([start_link/2]).
 -export([init/2, stop/1, get_vcard/2, set_vcard/4, search/4,
-        remove_user/2, import/2, search_fields/1, search_reported/1,
+        remove_user/2, import/3, search_fields/1, search_reported/1,
         mod_opt_type/1, opt_type/1]).
 
 %% gen_server callbacks
@@ -157,7 +157,7 @@ search_items(Entries, State) ->
 remove_user(_User, _Server) ->
     {atomic, not_implemented}.
 
-import(_, _) ->
+import(_, _, _) ->
     pass.
 
 %%%===================================================================