Replace double code by function calls (dialog libraries handling)

Change-Id: I17fc700e47a258b281214fe29e075bc782fb6acd