Hello community,
here is the log from the commit of package vacuum-im for openSUSE:Factory
checked in at 2014-11-10 17:28:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vacuum-im (Old)
and /work/SRC/openSUSE:Factory/.vacuum-im.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vacuum-im"
Changes:
--------
--- /work/SRC/openSUSE:Factory/vacuum-im/vacuum-im.changes 2014-01-28
15:39:02.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.vacuum-im.new/vacuum-im.changes 2014-11-10
17:28:36.000000000 +0100
@@ -1,0 +2,12 @@
+Thu Nov 6 20:48:12 UTC 2014 - egdf...@opensuse.org
+
+- delete fix_utils_version.patch, not needen
+
+-------------------------------------------------------------------
+Thu Nov 6 20:37:18 UTC 2014 - egdf...@opensuse.org
+
+- update source
+ * Fixed automatic activation of notifications
+ * Fixed conference entrance detection by status codes
+
+-------------------------------------------------------------------
Old:
----
fix_utils_version.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vacuum-im.spec ++++++
--- /var/tmp/diff_new_pack.E5fjmC/_old 2014-11-10 17:28:37.000000000 +0100
+++ /var/tmp/diff_new_pack.E5fjmC/_new 2014-11-10 17:28:37.000000000 +0100
@@ -2,7 +2,6 @@
# spec file for package vacuum-im
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# Copyright Andrey Karepin <egdf...@opensuse.org>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +17,7 @@
%define sname vacuum
-%define rbuild 2368
+%define rbuild 2455
Name: %{sname}-im
Summary: Crossplatform Jabber client written on Qt
License: GPL-3.0
@@ -32,8 +31,6 @@
Patch1: paranoia.patch
# PATCH-FIX-OPENSUSE fix_default_smiles.patch
Patch2: fix_default_smiles.patch
-# PATCH-FEATURE-UPSTREAM fix_utils_version.patch
-Patch3: fix_utils_version.patch
Url: http://www.vacuum-im.org/
BuildRequires: cmake >= 2.8
BuildRequires: fdupes
@@ -75,7 +72,6 @@
%patch0 -p1
%patch1 -p0
%patch2 -p0
-%patch3 -p0
%build
%{__mkdir} build
++++++ vacuum-im-1.2.4.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/1.2.4/CHANGELOG new/1.2.4/CHANGELOG
--- old/1.2.4/CHANGELOG 2014-01-26 16:54:26.000000000 +0100
+++ new/1.2.4/CHANGELOG 2014-11-06 21:33:25.000000000 +0100
@@ -5,6 +5,10 @@
[*] Enhancement
[-] Bug fix
+------
+ [-] Fixed automatic activation of notifications
+ [-] Fixed conference entrance detection by status codes
+
v1.2.4
------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/1.2.4/config.cmake new/1.2.4/config.cmake
--- old/1.2.4/config.cmake 2014-01-26 16:54:13.000000000 +0100
+++ new/1.2.4/config.cmake 2014-11-06 21:33:25.000000000 +0100
@@ -3,7 +3,7 @@
if (UNIX)
set(VERSION_UTILS 1.17.0)
- set(VERSION_UTILS_ABI 1.17)
+ set(VERSION_UTILS_ABI 17)
endif (UNIX)
if (APPLE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/1.2.4/src/interfaces/imultiuserchat.h
new/1.2.4/src/interfaces/imultiuserchat.h
--- old/1.2.4/src/interfaces/imultiuserchat.h 2014-01-26 16:54:24.000000000
+0100
+++ new/1.2.4/src/interfaces/imultiuserchat.h 2014-11-06 21:33:25.000000000
+0100
@@ -26,6 +26,7 @@
#define MUC_SC_NON_ANONYMOUS 100
#define MUC_SC_AFFIL_CHANGED 101
#define MUC_SC_CONFIG_CHANGED 104
+#define MUC_SC_SELF_PRESENCE 110
#define MUC_SC_NOW_LOGGING_ENABLED 170
#define MUC_SC_NOW_LOGGING_DISABLED 171
#define MUC_SC_NOW_NON_ANONYMOUS 172
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/1.2.4/src/plugins/multiuserchat/multiuserchat.cpp
new/1.2.4/src/plugins/multiuserchat/multiuserchat.cpp
--- old/1.2.4/src/plugins/multiuserchat/multiuserchat.cpp 2014-01-26
16:54:23.000000000 +0100
+++ new/1.2.4/src/plugins/multiuserchat/multiuserchat.cpp 2014-11-06
21:33:25.000000000 +0100
@@ -663,7 +663,7 @@
else if (showText == "xa")
show = IPresence::ExtendedAway;
else
- show = IPresence::Online; //������� ���
������ ������� � ����������
+ show = IPresence::Online;
QString status = AStanza.firstElement("status").text();
Jid realJid = itemElem.attribute("jid");
@@ -690,7 +690,7 @@
FUsers.insert(fromNick,user);
}
- if (!isOpen() && (fromNick == FNickName ||
FStatusCodes.contains(MUC_SC_ROOM_ENTER)))
+ if (!isOpen() && (fromNick == FNickName ||
FStatusCodes.contains(MUC_SC_SELF_PRESENCE)))
{
FNickName = fromNick;
FMainUser = user;
@@ -742,15 +742,15 @@
}
else if (FStatusCodes.contains(MUC_SC_USER_KICKED))
//User kicked
{
- QString byUser =
itemElem.firstChildElement("actor").attribute("jid");
+ QString actor =
itemElem.firstChildElement("actor").attribute("nick");
QString reason =
itemElem.firstChildElement("reason").text();
- emit userKicked(fromNick,reason,byUser);
+ emit userKicked(fromNick,reason,actor);
}
else if (FStatusCodes.contains(MUC_SC_USER_BANNED))
//User baned
{
- QString byUser =
itemElem.firstChildElement("actor").attribute("jid");
+ QString actor =
itemElem.firstChildElement("actor").attribute("nick");
QString reason =
itemElem.firstChildElement("reason").text();
- emit userBanned(fromNick,reason,byUser);
+ emit userBanned(fromNick,reason,actor);
}
else if (!xelem.firstChildElement("destroy").isNull())
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/1.2.4/src/plugins/notifications/notifications.cpp
new/1.2.4/src/plugins/notifications/notifications.cpp
--- old/1.2.4/src/plugins/notifications/notifications.cpp 2014-01-26
16:54:22.000000000 +0100
+++ new/1.2.4/src/plugins/notifications/notifications.cpp 2014-11-06
21:33:25.000000000 +0100
@@ -363,7 +363,7 @@
if ((record.notification.kinds & INotification::AutoActivate)>0)
{
FDelayedActivations.append(notifyId);
- QTimer::singleShot(0,this,SLOT(onActivateDelayedActivations()));
+ QTimer::singleShot(0,this,SLOT(onDelayedActivations()));
}
FRemoveAll->setVisible(!FNotifyMenu->isEmpty());
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
