Revert "Fix SocketConfigServer module loading failure issue"

This reverts commit dfe8fccdba097542d80dcd94faad0a6212e8719b.

Change-Id: I47e1f2bc4307dcb18db6f53c510c5b0f99083d53

diff --git a/ism/modules/panelagent/socketconfigserver/Makefile.am b/ism/modules/panelagent/socketconfigserver/Makefile.am
index ada3ae7..6ac0b5f 100644 (file)
--- a/ism/modules/panelagent/socketconfigserver/Makefile.am
+++ b/ism/modules/panelagent/socketconfigserver/Makefile.am
@@ -21,7 +21,7 @@ AM_CPPFLAGS = -I$(top_builddir) \
 noinst_HEADERS =
 
 
-CONFIG_SOCKETCONFIGSERVER_PANELAGENT_MODULE  = socketconfigserver.la
+CONFIG_SOCKETCONFIGSERVER_PANELAGENT_MODULE  = socket_config_server.la
 
 
 if SCIM_LD_VERSION_SCRIPT
@@ -31,11 +31,11 @@ endif
 moduledir              = @SCIM_MODULE_PATH@/$(SCIM_BINARY_VERSION)/PanelAgent
 module_LTLIBRARIES     = $(CONFIG_SOCKETCONFIGSERVER_PANELAGENT_MODULE)
 
-socketconfigserver_la_SOURCES  = socket_config_server_panel_agent_module.cpp
+socket_config_server_la_SOURCES  = socket_config_server_panel_agent_module.cpp
 
-socketconfigserver_la_CXXFLAGS = @DLOG_CFLAGS@ @ECORE_CFLAGS@
+socket_config_server_la_CXXFLAGS = @DLOG_CFLAGS@ @ECORE_CFLAGS@
 
-socketconfigserver_la_LDFLAGS  = -avoid-version \
+socket_config_server_la_LDFLAGS  = -avoid-version \
                          -rpath $(moduledir) \
                          -module \
                          $(LD_VERSION_SCRIPT_OPTION) \
@@ -44,4 +44,4 @@ socketconfigserver_la_LDFLAGS  = -avoid-version \
                          @DLOG_LIBS@ \
                          @ECORE_LIBS@
 
-socketconfigserver_la_LIBADD    = $(top_builddir)/ism/src/libscim@SCIM_EPOCH@.la
+socket_config_server_la_LIBADD    = $(top_builddir)/ism/src/libscim@SCIM_EPOCH@.la

diff --git a/ism/src/isf_panel_agent_manager.cpp b/ism/src/isf_panel_agent_manager.cpp
index 6440a0a..e732440 100644 (file)
--- a/ism/src/isf_panel_agent_manager.cpp
+++ b/ism/src/isf_panel_agent_manager.cpp
@@ -120,14 +120,14 @@ bool PanelAgentManager::initialize (InfoManager* info_manager, const ConfigPoint
         PanelAgentModule* _panel_agent_module = new PanelAgentModule;
 
         if (!_panel_agent_module) {
-            LOGW ("");
+            LOGD ("");
             continue;
         }
 
         _panel_agent_module->load (*it, config);
 
         if (!_panel_agent_module->valid ()) {
-            LOGW ("");
+            LOGD ("");
             delete _panel_agent_module;
             continue;
         }
@@ -135,7 +135,7 @@ bool PanelAgentManager::initialize (InfoManager* info_manager, const ConfigPoint
         PanelAgentPointer _panelagent = _panel_agent_module->get_instance ();
 
         if (_panelagent.null ()) {
-            LOGW ("");
+            LOGD ("");
             delete _panel_agent_module;
             continue;
         }