murmur: more detailed log patch (temporary solution)

2 files changed, 63 insertions, 0 deletions

diff --git a/media-sound/murmur/files/acl_edit_log.patch b/media-sound/murmur/files/acl_edit_log.patch
new file mode 100644
index 0000000..784cd9c
--- /dev/null
+++ b/media-sound/murmur/files/acl_edit_log.patch
@@ -0,0 +1,62 @@
+diff --git a/src/murmur/Messages.cpp b/src/murmur/Messages.cpp
+index 529f287..f4a5de9 100644
+--- a/src/murmur/Messages.cpp
++++ b/src/murmur/Messages.cpp
+@@ -1326,19 +1326,38 @@ void Server::msgACL(ServerUser *uSource, MumbleProto::ACL &msg) {
+ 
+ 			QHash<QString, QSet<int> > hOldTemp;
+ 
++			log(uSource, QString("Updating ACL in channel %1").arg(*c));
++			log("old  groups and acl follows:");
++
+ 			foreach(g, c->qhGroups) {
++			    log(QString("group: ") + g->qsName + " have following users: ");
++			    int m;
++			    QString member_list;
++			    foreach(m, g->members())
++			      {
++				member_list += getUserName(m);
++				member_list += ", ";
++			      }
++			    member_list.remove(member_list.length() -2, 2);
++			    log(member_list);
++
+ 				hOldTemp.insert(g->qsName, g->qsTemporary);
+ 				delete g;
+ 			}
+ 
+ 			foreach(a, c->qlACL)
++			  {
++			    //TODO: print acl
+ 				delete a;
++			  }
+ 
+ 			c->qhGroups.clear();
+ 			c->qlACL.clear();
+ 
+ 			c->bInheritACL = msg.inherit_acls();
+ 
++			log("new groups and acl follows:");
++
+ 			for (int i = 0; i < msg.groups_size(); ++i) {
+ 				const MumbleProto::ACL_ChanGroup &group = msg.groups(i);
+ 				g = new Group(c, u8(group.name()));
+@@ -1350,6 +1369,18 @@ void Server::msgACL(ServerUser *uSource, MumbleProto::ACL &msg) {
+ 				for (int j = 0; j < group.remove_size(); ++j)
+ 					if (!getUserName(group.remove(j)).isEmpty())
+ 						g->qsRemove << group.remove(j);
++
++				log(QString("group: ") + g->qsName + " have following users: ");
++				int m;
++				QString member_list;
++				foreach(m, g->members())
++				  {
++				    member_list += getUserName(m);
++				    member_list += ", ";
++				  }
++				member_list.remove(member_list.length() -2, 2);
++				log(member_list);
++
+ 				g->qsTemporary = hOldTemp.value(g->qsName);
+ 			}
+ 
diff --git a/media-sound/murmur/murmur-scm.ebuild b/media-sound/murmur/murmur-scm.ebuild
index 9ad507a..b1a2c2d 100644
--- a/media-sound/murmur/murmur-scm.ebuild
+++ b/media-sound/murmur/murmur-scm.ebuild
@@ -56,6 +56,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/acl_edit_log.patch"
 	qt4-r2_src_prepare
 
 	sed \