libtransport.git Changeset - be5a77cb7134

Changeset - be5a77cb7134

Parent rev.

Child rev.

[Not reviewed]

Merge

0 17 1

HanzZ - 13 years ago 2012-12-04 16:37:52
hanzz.k@gmail.com

Merge branch 'master' of github.com:hanzz/libtransport

17 files changed with 52 insertions and 42 deletions:

backends/libcommuni/ircnetworkplugin.h

backends/libcommuni/session.cpp

backends/twitter/libtwitcurl/base64.cpp

backends/twitter/libtwitcurl/base64.h

backends/twitter/libtwitcurl/urlencode.cpp

backends/twitter/libtwitcurl/urlencode.h

include/transport/discoitemsresponder.h

include/transport/gatewayresponder.h

include/transport/memoryusage.h

include/transport/rosterresponder.h

packaging/fedora/build_rpm.sh

packaging/fedora/spectrum2.spec

spectrum/src/win32/ServiceWrapper.cpp

spectrum_manager/src/methods.h

src/blockresponder.h

src/discoinforesponder.h

src/storageresponder.h

0 comments (0 inline, 0 general)

backends/libcommuni/ircnetworkplugin.h

➞

Show inline comments

 		int m_currentServer;
 		std::string m_identify;
 		bool m_firstPing;
 };
@@ \ No newline at end of file @@
 };

backends/libcommuni/session.cpp

➞

Show inline comments

 				np->handleParticipantChanged(user, nickname, TO_UTF8(channel) + suffix,(int) flags, pbnetwork::STATUS_ONLINE);
+			}
 			break;
 		case 366:
 			// ask /who to get away states
 			channel = m->parameters().value(1);
 			LOG4CXX_INFO(logger, user << "Asking /who for channel " << TO_UTF8(channel));
 			sendCommand(IrcCommand::createWho(channel));
 			break;
 		case 432:

backends/twitter/libtwitcurl/base64.cpp

➞

Show inline comments

+  }
   return ret;
+}
@@ \ No newline at end of file @@
+}

backends/twitter/libtwitcurl/base64.h

➞

Show inline comments

 #include <string>
 std::string base64_encode(unsigned char const* , unsigned int len);
 std::string base64_decode(std::string const& s);
@@ \ No newline at end of file @@
 std::string base64_decode(std::string const& s);

backends/twitter/libtwitcurl/urlencode.cpp

➞

Show inline comments

@@ @@ -37,4 +37,4 @@ std::string urlencode( const std::string &c ) @@
+		}
+	}
 	return escaped;
+}
@@ \ No newline at end of file @@
+}

backends/twitter/libtwitcurl/urlencode.h

➞

Show inline comments

@@ @@ -7,4 +7,4 @@ @@
 std::string char2hex( char dec );
 std::string urlencode( const std::string &c );
 #endif // __URLENCODE_H__
@@ \ No newline at end of file @@
 #endif // __URLENCODE_H__

include/transport/discoitemsresponder.h

➞

Show inline comments

 		DiscoInfoResponder *m_discoInfoResponder;
 };
+}
@@ \ No newline at end of file @@
+}

include/transport/gatewayresponder.h

➞

Show inline comments

 		UserManager *m_userManager;
 };
+}
@@ \ No newline at end of file @@
+}

include/transport/memoryusage.h

➞

Show inline comments

@@ @@ -32,4 +32,4 @@ namespace Transport { @@
 	void process_mem_usage(double& shared, double& resident_set, pid_t pid = 0);
 #endif
+}
@@ \ No newline at end of file @@
+}

include/transport/rosterresponder.h

➞

Show inline comments

 		UserManager *m_userManager;
 };
+}
@@ \ No newline at end of file @@
+}

packaging/fedora/build_rpm.sh

➞

Show inline comments

@@ new file 100755 @@
 #!/bin/sh
 DIRNAME=spectrum2
 echo "Cleaning up old sources ..."
 rm -rf spectrum2-*
 echo "Checking out a fresh copy ..."
 rm -rf $DIRNAME
 git clone ../../.git $DIRNAME
 rm -rf $DIRNAME/.git
 echo "Creating tarball ..."
 tar czf $DIRNAME.tar.gz $DIRNAME
 echo "Building package"
 rpmbuild -ta $DIRNAME.tar.gz

packaging/fedora/spectrum2.spec

➞

Show inline comments

@@ @@ -4,42 +4,32 @@ @@
 Summary: XMPP transport
 Name: spectrum2
 Version: 2.0
-Release: %{?_release}%{!?_release:1}%{?dist}
 Release: 1%{?dist}
 Group: Applications/Internet
 License: GPLv3
 Source0: spectrum2.tar.gz
 URL: http://swift.im/
 # BuildRequires: cmake
 # BuildRequires: boost-devel
 # BuildRequires: mysql-devel
 # BuildRequires: cppunit-devel
 # BuildRequires: libsqlite3x-devel
 # BuildRequires: protobuf-devel
 # BuildRequires: protobuf-compiler
 # BuildRequires: popt-devel
 # BuildRequires: libidn-devel
 # BuildRequires: expat-devel
 # BuildRequires: avahi-devel
 # BuildRequires: log4cxx-devel
 Requires: boost
 Requires: mysql-libs
 %if 0%{?rhel}
 Requires: sqlite
 BuildRequires: cmake
 BuildRequires: boost-devel
 BuildRequires: mysql-devel
 BuildRequires: cppunit-devel
 %if 0%{?rhel} > 0 && 0%{?rhel} <= 6
 BuildRequires: sqlite-devel
 %else
-Requires: libsqlite3x
+BuildRequires: libsqlite3x-devel
 %endif
 Requires: protobuf
 Requires: popt
 Requires: libidn
 Requires: expat
 Requires: avahi
 Requires: log4cxx
 #----
 BuildRequires: protobuf-devel
 BuildRequires: protobuf-compiler
 BuildRequires: popt-devel
 BuildRequires: libidn-devel
 BuildRequires: expat-devel
 BuildRequires: avahi-devel
 BuildRequires: log4cxx-devel
 BuildRequires: swiften-devel
 Requires:      libtransport%{?_isa} = %{version}-%{release}
 Requires:      swiften
 %description
-Spectrum 2.0
+Spectrum 2 is an XMPP transport/gateway and also simple XMPP server.
 %prep
 %setup -q -n spectrum2
@@ @@ -200,7 +190,7 @@ Libtransport library @@
 %changelog
-* Nov 30 2012 Jan Kaluza <jkaluza@redhat.com> - 2.0
+* Mon Dec 03 2012 Jan Kaluza <jkaluza@redhat.com> - 2.0-1
 - Work in progress
 * Mon Jul 25 2011 Jan Kaluza <jkaluza@redhat.com> - 1.0-4

spectrum/src/win32/ServiceWrapper.cpp

➞

Show inline comments

@@ @@ -117,4 +117,4 @@ void ServiceWrapper::RunService() { @@
 	};
 	StartServiceCtrlDispatcherA(serviceTable);
+}
@@ \ No newline at end of file @@
+}

spectrum_manager/src/methods.h

➞

Show inline comments

 std::vector<std::string> show_list(ManagerConfig *config, bool show = true);
 std::string get_response();
@@ \ No newline at end of file @@
 std::string get_response();

src/blockresponder.h

➞

Show inline comments

 		UserManager *m_userManager;
 };
+}
@@ \ No newline at end of file @@
+}

src/discoinforesponder.h

➞

Show inline comments

 		std::map<std::string, std::string> m_commands;
 };
+}
@@ \ No newline at end of file @@
+}

src/storageresponder.h

➞

Show inline comments

 		UserManager *m_userManager;
 };
+}
@@ \ No newline at end of file @@
+}

0 comments (0 inline, 0 general)