libtransport.git Changeset - 10f8f610d05d

Changeset - 10f8f610d05d

Parent rev.

Child rev.

[Not reviewed]

0 4 0

Jan Kaluza - 10 years ago 2016-02-22 09:23:23
jkaluza@redhat.com

Libtransport: Fix 'register' command in AdminInterface

4 files changed with 15 insertions and 2 deletions:

libtransport/AdminInterface.cpp

spectrum/src/frontends/xmpp/XMPPFrontend.cpp

spectrum/src/frontends/xmpp/XMPPFrontend.h

spectrum_manager/src/CMakeLists.txt

0 comments (0 inline, 0 general)

libtransport/AdminInterface.cpp

➞

Show inline comments

 			res.jid = args[1];
 			res.uin = args[2];
 			if (args.size() == 3) {
-				res.password = args[3];
+				res.password = "";
+			}
 			else {
-				res.password = args[4];
+				res.password = args[3];
+			}
 			res.language = "en";
 			res.encoding = "utf-8";

spectrum/src/frontends/xmpp/XMPPFrontend.cpp

➞

Show inline comments

 	onCapabilitiesReceived(jid, m_entityCapsManager->getCaps(jid));
+}
 std::string XMPPFrontend::getRegistrationFields() {
 	std::string fields = "Jabber ID";
 // 	if (CONFIG_BOOL(m_config, "registration.needRegistration")) {
 		fields += "\n" + CONFIG_STRING(m_config, "registration.username_label") + "\n";
 		fields += CONFIG_STRING(m_config, "registration.password_label");
 // 	}
 	return fields;
+}
+}

spectrum/src/frontends/xmpp/XMPPFrontend.h

➞

Show inline comments

@@ @@ -94,6 +94,8 @@ namespace Transport { @@
 				return m_rawXML;
+			}
 			std::string getRegistrationFields();
 		private:
 			void handleConnected();
 			void handleConnectionError(const Swift::ComponentError &error);

spectrum_manager/src/CMakeLists.txt

➞

Show inline comments

 endif()
 INSTALL(TARGETS spectrum2_manager RUNTIME DESTINATION bin)
 IF(NOT EXISTS "/etc/spectrum2/spectrum_manager.cfg")
 INSTALL(FILES
 	spectrum_manager.cfg
 	DESTINATION /etc/spectrum2
+	)
 ENDIF()
 INSTALL(DIRECTORY
 	html

0 comments (0 inline, 0 general)