Hello community,
here is the log from the commit of package vacuum-im-plugins-dbusnotifications for openSUSE:Factory checked in at 2012-09-11 09:20:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vacuum-im-plugins-dbusnotifications (Old)
and /work/SRC/openSUSE:Factory/.vacuum-im-plugins-dbusnotifications.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vacuum-im-plugins-dbusnotifications", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/vacuum-im-plugins-dbusnotifications/vacuum-im-plugins-dbusnotifications.changes 2011-09-23 12:49:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.vacuum-im-plugins-dbusnotifications.new/vacuum-im-plugins-dbusnotifications.changes 2012-09-11 09:20:56.000000000 +0200
@@ -1,0 +2,12 @@
+Mon Sep 10 13:32:10 UTC 2012 - coolo@suse.com
+
+- remove buildrequire on library, already required by -devel
+
+-------------------------------------------------------------------
+Tue Jul 31 16:52:20 UTC 2012 - egdfree@opensuse.org
+
+- update to 1.0.2
+ * add settings dialogue
+ * update ru translations
+
+-------------------------------------------------------------------
Old:
----
vacuum-im-plugins-dbusnotifications-1.0.0.tar.bz2
New:
----
fix_cmake_rules.patch
vacuum-im-plugins-dbusnotifications-1.0.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vacuum-im-plugins-dbusnotifications.spec ++++++
--- /var/tmp/diff_new_pack.Gt2bF9/_old 2012-09-11 09:20:58.000000000 +0200
+++ /var/tmp/diff_new_pack.Gt2bF9/_new 2012-09-11 09:20:58.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package vacuum-im-plugins-dbusnotifications
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright Andrey Karepin
#
# All modifications and additions to the file contributed by third parties
@@ -17,34 +17,37 @@
#
-#
-%define app_name vacuum
-
+%define app_name vacuum-im
Name: vacuum-im-plugins-dbusnotifications
Summary: Vacuum-IM notification messages through system DBus
-Version: 1.0.0
-Release: 1
+License: GPL-3.0
+Group: System/Libraries
+Version: 1.0.2
+Release: 0
%if 0%{?suse_version} < 1120
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%endif
-License: GPL-3.0
-Group: System/Libraries
Source: %{name}-%{version}.tar.bz2
+Patch0: fix_cmake_rules.patch
Url: http://www.vacuum-im.org/
Requires: vacuum-im
-BuildRequires: aspell-devel cmake dbus-1-devel libqt4-devel libvacuumutils1_7 vacuum-im-devel
+BuildRequires: cmake
+BuildRequires: dbus-1-devel
BuildRequires: fdupes
+BuildRequires: libqt4-devel
+BuildRequires: vacuum-im-devel
%description
The plug-in uses org.freedesktop.Notifications for show of notification messages
%prep
%setup -q -n %{name}
+%patch0 -p1
%build
%{__mkdir} build
cd build
-cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=%{_prefix} -DINSTALL_LIB_DIR=%{_lib} -DVACUUM_SRC_PATH=%{_includedir}/%{app_name} -DVACUUM_LIB_PATH=%{_lib}
+cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=%{_prefix} -DINSTALL_LIB_DIR=%{_lib} -DINSTALL_APP_DIR=%{app_name} -DINSTALL_DOC_DIR=%{_defaultdocdir}
%{__make} %{?_smp_mflags}
%install
@@ -54,12 +57,10 @@
%fdupes %{buildroot}%{_datadir}
-%clean
-rm -rf %{buildroot}
-
%files
%defattr(-,root,root)
-%{_libdir}/%{app_name}
+%dir %{_libdir}/%{app_name}
+%{_libdir}/%{app_name}/plugins/
%{_datadir}/%{app_name}
%changelog
++++++ fix_cmake_rules.patch ++++++
diff -r a2b89c6efeb9 CMakeLists.txt
--- vacuum-im-plugins-dbusnotifications/CMakeLists.txt Fri Jul 29 11:56:23 2011 +0300
+++ vacuum-im-plugins-dbusnotifications/CMakeLists.txt Sun Jan 22 12:58:26 2012 +0400
@@ -3,6 +3,8 @@
project(dbusnotification-plugin)
set(PLUGIN_NAME "dbusnotifications")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_DEBUG")
+
add_custom_target(updatets)
include("translations.cmake")
@@ -34,7 +34,7 @@
if (WIN32)
include_directories("${CMAKE_INSTALL_PREFIX}/sdk")
elseif (UNIX)
- include_directories("${CMAKE_INSTALL_PREFIX}/include/vacuum")
+ include_directories("${CMAKE_INSTALL_PREFIX}/include/vacuum-im")
endif (WIN32)
set(SOURCES dbuspopuphandler.cpp )
diff -r a2b89c6efeb9 install.cmake
--- vacuum-im-plugins-dbusnotifications/install.cmake Fri Jul 29 11:56:23 2011 +0300
+++ vacuum-im-plugins-dbusnotifications/install.cmake Sun Jan 22 12:58:26 2012 +0400
@@ -6,9 +6,10 @@
set(INSTALL_RES_DIR "Resources")
elseif (UNIX)
- set(INSTALL_PREFIX "/usr/local")
+ set(INSTALL_PREFIX "/usr/local" CACHE STRING "")
- set(INSTALL_APP_DIR "vacuum")
+ set(INSTALL_APP_DIR "vacuum" CACHE STRING "")
set(INSTALL_LIB_DIR "lib" CACHE STRING "Name of directory for shared libraries on target system")
set(INSTALL_RES_DIR "share")
+ set(INSTALL_DOC_DIR "${INSTALL_RES_DIR}/doc" CACHE STRING "")
elseif (WIN32)
set(INSTALL_PREFIX "C:")
set(INSTALL_APP_DIR "vacuum")
@@ -37,7 +38,7 @@
set(INSTALL_LIBS "${INSTALL_LIB_DIR}")
set(INSTALL_PLUGINS "${INSTALL_LIB_DIR}/${INSTALL_APP_DIR}/plugins")
set(INSTALL_RESOURCES "${INSTALL_RES_DIR}/${INSTALL_APP_DIR}/resources")
- set(INSTALL_DOCUMENTS "${INSTALL_RES_DIR}/doc/${INSTALL_APP_DIR}")
+ set(INSTALL_DOCUMENTS "${INSTALL_DOC_DIR}/${INSTALL_APP_DIR}")
set(INSTALL_TRANSLATIONS "${INSTALL_RES_DIR}/${INSTALL_APP_DIR}/translations")
set(INSTALL_INCLUDES "include/${INSTALL_APP_DIR}")
endif (WIN32)
++++++ vacuum-im-plugins-dbusnotifications-1.0.0.tar.bz2 -> vacuum-im-plugins-dbusnotifications-1.0.2.tar.bz2 ++++++
Files old/vacuum-im-plugins-dbusnotifications/.hg/00changelog.i and new/vacuum-im-plugins-dbusnotifications/.hg/00changelog.i differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vacuum-im-plugins-dbusnotifications/.hg/branch new/vacuum-im-plugins-dbusnotifications/.hg/branch
--- old/vacuum-im-plugins-dbusnotifications/.hg/branch 2011-08-04 18:54:43.000000000 +0200
+++ new/vacuum-im-plugins-dbusnotifications/.hg/branch 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-dbusnotifications
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vacuum-im-plugins-dbusnotifications/.hg/cache/branchheads new/vacuum-im-plugins-dbusnotifications/.hg/cache/branchheads
--- old/vacuum-im-plugins-dbusnotifications/.hg/cache/branchheads 2011-07-29 17:56:58.000000000 +0200
+++ new/vacuum-im-plugins-dbusnotifications/.hg/cache/branchheads 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-a2b89c6efeb9dc13d5fd4c081246b3738efe2491 16
-a2b89c6efeb9dc13d5fd4c081246b3738efe2491 dbusnotifications
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vacuum-im-plugins-dbusnotifications/.hg/cache/tags new/vacuum-im-plugins-dbusnotifications/.hg/cache/tags
--- old/vacuum-im-plugins-dbusnotifications/.hg/cache/tags 2011-07-29 17:56:58.000000000 +0200
+++ new/vacuum-im-plugins-dbusnotifications/.hg/cache/tags 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-16 a2b89c6efeb9dc13d5fd4c081246b3738efe2491
-
Files old/vacuum-im-plugins-dbusnotifications/.hg/dirstate and new/vacuum-im-plugins-dbusnotifications/.hg/dirstate differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vacuum-im-plugins-dbusnotifications/.hg/hgrc new/vacuum-im-plugins-dbusnotifications/.hg/hgrc
--- old/vacuum-im-plugins-dbusnotifications/.hg/hgrc 2011-07-29 17:56:58.000000000 +0200
+++ new/vacuum-im-plugins-dbusnotifications/.hg/hgrc 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-[paths]
-default = https://code.google.com/p/vacuum-plugins.dbusnotifications/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vacuum-im-plugins-dbusnotifications/.hg/merge/5023099bb304ee1f842859ae7df46a76eccf3b08 new/vacuum-im-plugins-dbusnotifications/.hg/merge/5023099bb304ee1f842859ae7df46a76eccf3b08
--- old/vacuum-im-plugins-dbusnotifications/.hg/merge/5023099bb304ee1f842859ae7df46a76eccf3b08 2011-08-04 18:54:43.000000000 +0200
+++ new/vacuum-im-plugins-dbusnotifications/.hg/merge/5023099bb304ee1f842859ae7df46a76eccf3b08 1970-01-01 01:00:00.000000000 +0100
@@ -1,78 +0,0 @@
-// Plugin popup notifications for vacuum-im (c) Crying Angel, 2010
-// This plugin uses DBus to show notifications.
-
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Library General Public
-// License version 2 or later as published by the Free Software Foundation.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Library General Public License for more details.
-//
-// You should have received a copy of the GNU Library General Public License
-// along with this library; see the file COPYING.LIB. If not, write to
-// the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-// Boston, MA 02110-1301, USA.
-
-#ifndef DBUSPOPUPHANDLER_H
-#define DBUSPOPUPHANDLER_H
-
-#include <QDebug>
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#ifdef SVNINFO
-# include "svninfo.h"
-#else
-# define SVN_REVISION "0"
-#endif
-
-#define DBUSPOPUPHANDLER_UUID "{63685fbc-5a2d-4e8c-b9d5-d69ea8fbdb4e}"
-#define NHO_DBUSPOPUP 3000
-
-class DbusPopupHandler :
- public QObject,
- public IPlugin,
- public INotificationHandler
-{
- Q_OBJECT;
- Q_INTERFACES(IPlugin INotificationHandler);
-public:
- DbusPopupHandler();
- ~DbusPopupHandler();
- //IPlugin
- virtual QObject *instance() { return this; }
- virtual QUuid pluginUuid() const { return DBUSPOPUPHANDLER_UUID; }
- virtual void pluginInfo(IPluginInfo *APluginInfo);
- virtual bool initConnections(IPluginManager *APluginManager, int &AInitOrder);
- virtual bool initObjects();
- virtual bool initSettings();
- virtual bool startPlugin() { return true; }
- //INotificationHandler
- virtual bool showNotification(int AOrder, ushort AKind, int ANotifyId, const INotification &ANotification);
-
-protected slots:
- void onActionInvoked(unsigned int notifyId, QString action);
- void onWindowNotifyRemoved(/*int ANotifyId*/);
- void onApplicationQuit ();
-
-private:
- IAvatars *FAvatars;
- INotifications *FNotifications;
- QDBusInterface *FNotify;
-
- int FTimeout;
- bool FUpdateNotify;
- bool FUseFreedesktopSpec;
- bool FGnomeDaemon;
-};
-
-#endif // DBUSPOPUPHANDLER_H
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vacuum-im-plugins-dbusnotifications/.hg/merge/60f5ddf567fb168bb510c63c30cf4b5c9623c005 new/vacuum-im-plugins-dbusnotifications/.hg/merge/60f5ddf567fb168bb510c63c30cf4b5c9623c005
--- old/vacuum-im-plugins-dbusnotifications/.hg/merge/60f5ddf567fb168bb510c63c30cf4b5c9623c005 2011-08-04 18:54:43.000000000 +0200
+++ new/vacuum-im-plugins-dbusnotifications/.hg/merge/60f5ddf567fb168bb510c63c30cf4b5c9623c005 1970-01-01 01:00:00.000000000 +0100
@@ -1,188 +0,0 @@
-#include "dbuspopuphandler.h"
-
-DbusPopupHandler::DbusPopupHandler()
-{
- FAvatars = NULL;
- FNotifications = NULL;
- FNotify = NULL;
-}
-
-DbusPopupHandler::~DbusPopupHandler()
-{
- delete FNotify;
-}
-
-void DbusPopupHandler::pluginInfo(IPluginInfo *APluginInfo)
-{
- APluginInfo->name = tr("Dbus Popup Notifications Handler");
- APluginInfo->description = tr("Allows other modules use DBus to show notifications");
- APluginInfo->version = "1.0."SVN_REVISION;
- APluginInfo->author = "Crying Angel";
- APluginInfo->homePage = "http://www.vacuum-im.org";
- APluginInfo->dependences.append(NOTIFICATIONS_UUID);
- APluginInfo->dependences.append(AVATARTS_UUID);
-}
-
-bool DbusPopupHandler::initConnections(IPluginManager *APluginManager, int &/*AInitOrder*/)
-{
- IPlugin *plugin;
-
- plugin = APluginManager->pluginInterface("IAvatars").value(0,NULL);
- if (!plugin) return false;
- FAvatars = qobject_cast(plugin->instance());
-
- plugin = APluginManager->pluginInterface("INotifications").value(0,NULL);
- if (!plugin) return false;
- FNotifications = qobject_cast(plugin->instance());
-
- connect (APluginManager->instance(), SIGNAL(aboutToQuit()), this, SLOT(onApplicationQuit()));
-// connect (FNotifications->instance(), SIGNAL(notificationRemoved(int)),this,SLOT(onWindowNotifyRemoved(int)));
-
- return true;
-}
-
-bool DbusPopupHandler::initObjects()
-{
- FNotify = new QDBusInterface("org.freedesktop.Notifications",
- "/org/freedesktop/Notifications","org.freedesktop.Notifications",
- QDBusConnection::sessionBus()/*, this*/);
- if(FNotify->lastError().type() != QDBusError::NoError)
- {
- qWarning() << "DBus Notifys: Unable to create interface.";
- return false;
- }
- FUseFreedesktopSpec = true;
- qDebug() << "DBus Notifys: DBus interface created successfully.";
-
- QDBusMessage reply = FNotify->call(QDBus::Block,"GetServerInformation");
- if(reply.type() == QDBusMessage::ErrorMessage)
- {
- qWarning() << "DBus Error: " << reply.errorMessage();
- }
- else
- {
- for (int i=0;iinsertNotificationHandler(NHO_DBUSPOPUP, this);
-
- return true;
-}
-
-bool DbusPopupHandler::initSettings()
-{
- FTimeout = 6000;
- FUpdateNotify = false;
- return true;
-}
-
-bool DbusPopupHandler::showNotification(int AOrder, ushort AKind, int ANotifyId, const INotification &ANotification)
-{
- qDebug() << "DBus Notifys: showNotification requested.";
- if (AOrder!=NHO_DBUSPOPUP||!(AKind&INotification::PopupWindow)) return false;
- qDebug() << "DBus Notifys: showNotification request accepted.";
-
- Jid contactJid = ANotification.data.value(NDR_CONTACT_JID).toString();
- QString toolTip = ANotification.data.value(NDR_POPUP_HTML).toString();
- QString imgPath;
- QString iconPath;
-
- FTimeout = Options::node(OPV_NOTIFICATIONS_POPUPTIMEOUT).value().toInt()*1000;
-
- qDebug() << "NDR_TOOLTIP" << ANotification.data.value(NDR_TOOLTIP).toString();
- qDebug() << "NDR_POPUP_CAPTION" << ANotification.data.value(NDR_POPUP_CAPTION).toString();
- qDebug() << "NDR_POPUP_TITLE" << ANotification.data.value(NDR_POPUP_TITLE).toString();
- qDebug() << "NDR_POPUP_HTML" << ANotification.data.value(NDR_POPUP_HTML).toString();
- toolTip = toolTip.replace("<br />", "\n");
- qDebug() << "NDR_POPUP_HTML trimed 1" << toolTip;
- toolTip = toolTip.replace(QRegExp("<[^>]*>"), "");
- qDebug() << "NDR_POPUP_HTML trimed 2" << toolTip;
-
- if (FAvatars)
- {
- imgPath = FAvatars->avatarFileName(FAvatars->avatarHash(contactJid));
- }
-
- QList<QVariant> notifyArgs;
- notifyArgs.append("Vacuum IM"); //app-name
- notifyArgs.append((uint)ANotifyId); //id;
-// if(!FUseFreedesktopSpec)
-// notifyArgs.append(""); //event-id
- notifyArgs.append(iconPath); //app-icon(path to icon on disk)
- notifyArgs.append(ANotification.data.value(NDR_POPUP_CAPTION).toString()); //summary (notification title)
-// if(FUseFreedesktopSpec)
- if (FGnomeDaemon)
- {
- notifyArgs.append(ANotification.data.value(NDR_TOOLTIP).toString()+":\n"+toolTip/*ANotification.data.value(NDR_POPUP_HTML).toString()*/);
- }
- else
- {
- notifyArgs.append(ANotification.data.value(NDR_TOOLTIP).toString()+":\n"+ANotification.data.value(NDR_POPUP_HTML).toString());
- }
- //body
- QStringList acts;
- acts << "actOne" << tr("Show");
- acts << "actTwo" << tr("Ignore");
- notifyArgs.append(acts); //actions
- QVariantMap hints;
- if (!imgPath.isEmpty())
- {
- hints.insert("image_path", imgPath);
- }
- notifyArgs.append(hints); //hints
- notifyArgs.append(FTimeout); //timeout
-
- QDBusReply<uint> reply = FNotify->callWithArgumentList(QDBus::Block,"Notify",notifyArgs);
- if(reply.isValid())
- {
- if (FUpdateNotify)
- {
- ANotifyId = reply.value();
- }
- }
- else
- {
- qWarning() << "DBus Notifys Error: " << reply.error();
- };
-
- return true;
-}
-
-void DbusPopupHandler::onActionInvoked(unsigned int notifyId, QString action)
-{
- qDebug() << "DBus Notifys: action "<activateNotification(notifyId);
- else
- FNotifications->removeNotification(notifyId);
-
- FNotify->call("CloseNotification",notifyId);
-}
-
-void DbusPopupHandler::onWindowNotifyRemoved(/*int ANotifyId*/)
-{
-
-}
-
-void DbusPopupHandler::onApplicationQuit()
-{
- FNotifications->removeNotificationHandler(NHO_DBUSPOPUP, this);
-}
-
-//void DbusPopupHandler::onWindowNotifyDestroyed()
-//{
-
-//}
-
-Q_EXPORT_PLUGIN2(plg_notifications, DbusPopupHandler)
-
Files old/vacuum-im-plugins-dbusnotifications/.hg/merge/state and new/vacuum-im-plugins-dbusnotifications/.hg/merge/state differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vacuum-im-plugins-dbusnotifications/.hg/requires new/vacuum-im-plugins-dbusnotifications/.hg/requires
--- old/vacuum-im-plugins-dbusnotifications/.hg/requires 2011-07-29 17:56:56.000000000 +0200
+++ new/vacuum-im-plugins-dbusnotifications/.hg/requires 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-revlogv1
-store
-fncache
-dotencode
Files old/vacuum-im-plugins-dbusnotifications/.hg/store/00changelog.i and new/vacuum-im-plugins-dbusnotifications/.hg/store/00changelog.i differ
Files old/vacuum-im-plugins-dbusnotifications/.hg/store/00manifest.i and new/vacuum-im-plugins-dbusnotifications/.hg/store/00manifest.i differ
Files old/vacuum-im-plugins-dbusnotifications/.hg/store/data/_c_make_lists.txt.i and new/vacuum-im-plugins-dbusnotifications/.hg/store/data/_c_make_lists.txt.i differ
Files old/vacuum-im-plugins-dbusnotifications/.hg/store/data/config.inc.i and new/vacuum-im-plugins-dbusnotifications/.hg/store/data/config.inc.i differ
Files old/vacuum-im-plugins-dbusnotifications/.hg/store/data/dbusnotifications.pri.i and new/vacuum-im-plugins-dbusnotifications/.hg/store/data/dbusnotifications.pri.i differ
Files old/vacuum-im-plugins-dbusnotifications/.hg/store/data/dbusnotifications.pro.i and new/vacuum-im-plugins-dbusnotifications/.hg/store/data/dbusnotifications.pro.i differ
Files old/vacuum-im-plugins-dbusnotifications/.hg/store/data/dbuspopuphandler.cpp.i and new/vacuum-im-plugins-dbusnotifications/.hg/store/data/dbuspopuphandler.cpp.i differ
Files old/vacuum-im-plugins-dbusnotifications/.hg/store/data/dbuspopuphandler.h.i and new/vacuum-im-plugins-dbusnotifications/.hg/store/data/dbuspopuphandler.h.i differ
Files old/vacuum-im-plugins-dbusnotifications/.hg/store/data/doc/_a_u_t_h_o_r_s.i and new/vacuum-im-plugins-dbusnotifications/.hg/store/data/doc/_a_u_t_h_o_r_s.i differ
Files old/vacuum-im-plugins-dbusnotifications/.hg/store/data/doc/_c_o_p_y_i_n_g.i and new/vacuum-im-plugins-dbusnotifications/.hg/store/data/doc/_c_o_p_y_i_n_g.i differ
Files old/vacuum-im-plugins-dbusnotifications/.hg/store/data/doc/_i_n_s_t_a_l_l.i and new/vacuum-im-plugins-dbusnotifications/.hg/store/data/doc/_i_n_s_t_a_l_l.i differ
Files old/vacuum-im-plugins-dbusnotifications/.hg/store/data/doc/_r_e_a_d_m_e.i and new/vacuum-im-plugins-dbusnotifications/.hg/store/data/doc/_r_e_a_d_m_e.i differ
Files old/vacuum-im-plugins-dbusnotifications/.hg/store/data/doc/_t_r_a_n_s_l_a_t_o_r_s.i and new/vacuum-im-plugins-dbusnotifications/.hg/store/data/doc/_t_r_a_n_s_l_a_t_o_r_s.i differ
Files old/vacuum-im-plugins-dbusnotifications/.hg/store/data/install.cmake.i and new/vacuum-im-plugins-dbusnotifications/.hg/store/data/install.cmake.i differ
Files old/vacuum-im-plugins-dbusnotifications/.hg/store/data/translations/bin/ru___r_u/dbusnotifications.qm.i and new/vacuum-im-plugins-dbusnotifications/.hg/store/data/translations/bin/ru___r_u/dbusnotifications.qm.i differ
Files old/vacuum-im-plugins-dbusnotifications/.hg/store/data/translations/de/dbusnotifications.ts.i and new/vacuum-im-plugins-dbusnotifications/.hg/store/data/translations/de/dbusnotifications.ts.i differ
Files old/vacuum-im-plugins-dbusnotifications/.hg/store/data/translations/pl/dbusnotifications.ts.i and new/vacuum-im-plugins-dbusnotifications/.hg/store/data/translations/pl/dbusnotifications.ts.i differ
Files old/vacuum-im-plugins-dbusnotifications/.hg/store/data/translations/ru/dbusnotifications.ts.i and new/vacuum-im-plugins-dbusnotifications/.hg/store/data/translations/ru/dbusnotifications.ts.i differ
Files old/vacuum-im-plugins-dbusnotifications/.hg/store/data/translations/src/ru___r_u/dbusnotifications.ts.i and new/vacuum-im-plugins-dbusnotifications/.hg/store/data/translations/src/ru___r_u/dbusnotifications.ts.i differ
Files old/vacuum-im-plugins-dbusnotifications/.hg/store/data/translations/uk/dbusnotifications.ts.i and new/vacuum-im-plugins-dbusnotifications/.hg/store/data/translations/uk/dbusnotifications.ts.i differ
Files old/vacuum-im-plugins-dbusnotifications/.hg/store/data/translations.cmake.i and new/vacuum-im-plugins-dbusnotifications/.hg/store/data/translations.cmake.i differ
Files old/vacuum-im-plugins-dbusnotifications/.hg/store/data/tsrelease.bat.i and new/vacuum-im-plugins-dbusnotifications/.hg/store/data/tsrelease.bat.i differ
Files old/vacuum-im-plugins-dbusnotifications/.hg/store/data/tsrelease.sh.i and new/vacuum-im-plugins-dbusnotifications/.hg/store/data/tsrelease.sh.i differ
Files old/vacuum-im-plugins-dbusnotifications/.hg/store/data/tsupdate.bat.i and new/vacuum-im-plugins-dbusnotifications/.hg/store/data/tsupdate.bat.i differ
Files old/vacuum-im-plugins-dbusnotifications/.hg/store/data/tsupdate.sh.i and new/vacuum-im-plugins-dbusnotifications/.hg/store/data/tsupdate.sh.i differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vacuum-im-plugins-dbusnotifications/.hg/store/fncache new/vacuum-im-plugins-dbusnotifications/.hg/store/fncache
--- old/vacuum-im-plugins-dbusnotifications/.hg/store/fncache 2011-07-29 17:56:58.000000000 +0200
+++ new/vacuum-im-plugins-dbusnotifications/.hg/store/fncache 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-data/tsupdate.sh.i
-data/doc/INSTALL.i
-data/tsrelease.sh.i
-data/dbusnotifications.pro.i
-data/doc/TRANSLATORS.i
-data/translations/pl/dbusnotifications.ts.i
-data/translations/src/ru_RU/dbusnotifications.ts.i
-data/doc/COPYING.i
-data/doc/AUTHORS.i
-data/tsupdate.bat.i
-data/translations/de/dbusnotifications.ts.i
-data/dbusnotifications.pri.i
-data/translations.cmake.i
-data/CMakeLists.txt.i
-data/translations/bin/ru_RU/dbusnotifications.qm.i
-data/config.inc.i
-data/tsrelease.bat.i
-data/doc/README.i
-data/translations/ru/dbusnotifications.ts.i
-data/translations/uk/dbusnotifications.ts.i
-data/dbuspopuphandler.cpp.i
-data/dbuspopuphandler.h.i
-data/install.cmake.i
Files old/vacuum-im-plugins-dbusnotifications/.hg/store/undo and new/vacuum-im-plugins-dbusnotifications/.hg/store/undo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vacuum-im-plugins-dbusnotifications/.hg/undo.branch new/vacuum-im-plugins-dbusnotifications/.hg/undo.branch
--- old/vacuum-im-plugins-dbusnotifications/.hg/undo.branch 2011-07-29 17:56:58.000000000 +0200
+++ new/vacuum-im-plugins-dbusnotifications/.hg/undo.branch 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-default
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vacuum-im-plugins-dbusnotifications/.hg/undo.desc new/vacuum-im-plugins-dbusnotifications/.hg/undo.desc
--- old/vacuum-im-plugins-dbusnotifications/.hg/undo.desc 2011-07-29 17:56:58.000000000 +0200
+++ new/vacuum-im-plugins-dbusnotifications/.hg/undo.desc 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-0
-pull
-https://code.google.com/p/vacuum-plugins.dbusnotifications/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vacuum-im-plugins-dbusnotifications/.hgignore new/vacuum-im-plugins-dbusnotifications/.hgignore
--- old/vacuum-im-plugins-dbusnotifications/.hgignore 1970-01-01 01:00:00.000000000 +0100
+++ new/vacuum-im-plugins-dbusnotifications/.hgignore 2012-04-01 08:54:34.000000000 +0200
@@ -0,0 +1,5 @@
+syntax: glob
+
+usertune.pro*
+CMakeLists.txt.user
+build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vacuum-im-plugins-dbusnotifications/CMakeLists.txt.orig new/vacuum-im-plugins-dbusnotifications/CMakeLists.txt.orig
--- old/vacuum-im-plugins-dbusnotifications/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
+++ new/vacuum-im-plugins-dbusnotifications/CMakeLists.txt.orig 2012-03-09 15:04:02.000000000 +0100
@@ -0,0 +1,62 @@
+cmake_minimum_required(VERSION 2.8)
+
+project(dbusnotification-plugin)
+set(PLUGIN_NAME "dbusnotifications")
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNO_QT_DEBUG")
+
+add_custom_target(updatets)
+
+include("translations.cmake")
+include("install.cmake")
+
+find_package(Qt4 REQUIRED)
+
+set(LANGS "" CACHE STRING "List of languages to build localization for (this variable overrides any of LANG_*)")
+set(USED_LANGS "" CACHE INTERNAL "List of languages actually used for generating targets")
+add_lang_options()
+
+if ("${LANGS}" STREQUAL "")
+ process_lang_options()
+else ("${LANGS}" STREQUAL "")
+ set_enabled_langs("${LANGS}")
+endif ("${LANGS}" STREQUAL "")
+
+set(QT_USE_QTXML TRUE)
+set(QT_USE_QTDBUS TRUE)
+
+if (WIN32)
+ set(CMAKE_SHARED_LIBRARY_PREFIX "")
+endif (WIN32)
+
+include(${QT_USE_FILE})
+
+add_definitions(-DQT_PLUGIN -DQT_SHARED)
+
+if (WIN32)
+ include_directories("${CMAKE_INSTALL_PREFIX}/sdk")
+elseif (UNIX)
+ include_directories("${CMAKE_INSTALL_PREFIX}/include/vacuum")
+endif (WIN32)
+
+set(SOURCES dbuspopuphandler.cpp )
+set(HEADERS dbuspopuphandler.h )
+
+qt4_wrap_cpp(MOC_SOURCES ${HEADERS})
+qt4_add_resources(RCC_SOURCES ${RCCS})
+
+add_translations(TRANSLATIONS ${PLUGIN_NAME} ${HEADERS} ${SOURCES})
+
+add_library(${PLUGIN_NAME} SHARED ${SOURCES} ${MOC_SOURCES} ${RCC_SOURCES} ${TRANSLATIONS} )
+
+find_library(TARGET_UTILS vacuumutils ${CMAKE_INSTALL_PREFIX})
+target_link_libraries(${PLUGIN_NAME} ${TARGET_UTILS} ${QT_LIBRARIES})
+if (WIN32)
+ install(TARGETS ${PLUGIN_NAME}
+ RUNTIME DESTINATION "${INSTALL_PLUGINS}"
+ COMPONENT ${PLUGIN_NAME})
+else (WIN32)
+ install(TARGETS ${PLUGIN_NAME}
+ LIBRARY DESTINATION "${INSTALL_PLUGINS}"
+ COMPONENT ${PLUGIN_NAME})
+endif (WIN32)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vacuum-im-plugins-dbusnotifications/dbusnotifications.pro.user new/vacuum-im-plugins-dbusnotifications/dbusnotifications.pro.user
--- old/vacuum-im-plugins-dbusnotifications/dbusnotifications.pro.user 1970-01-01 01:00:00.000000000 +0100
+++ new/vacuum-im-plugins-dbusnotifications/dbusnotifications.pro.user 2012-04-07 10:58:48.000000000 +0200
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorProject>
+<!-- Written by Qt Creator 2.4.1, 2012-04-07T12:58:48. -->
+<qtcreator>
+ <data>
+ <variable>ProjectExplorer.Project.ActiveTarget</variable>
+ <value type="int">0</value>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.EditorSettings</variable>
+ <valuemap type="QVariantMap">
+ <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
+ <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
+ <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
+ <value type="QString" key="language">Cpp</value>
+ <valuemap type="QVariantMap" key="value">
+ <value type="QString" key="CurrentPreferences">CppGlobal</value>
+ </valuemap>
+ </valuemap>
+ <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
+ <value type="QString" key="language">QmlJS</value>
+ <valuemap type="QVariantMap" key="value">
+ <value type="QString" key="CurrentPreferences">QmlJSGlobal</value>
+ </valuemap>
+ </valuemap>
+ <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
+ <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
+ <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
+ <value type="int" key="EditorConfiguration.IndentSize">4</value>
+ <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
+ <value type="int" key="EditorConfiguration.PaddingMode">1</value>
+ <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
+ <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
+ <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
+ <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
+ <value type="int" key="EditorConfiguration.TabSize">8</value>
+ <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
+ <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
+ <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
+ <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
+ <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
+ <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
+ </valuemap>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.PluginSettings</variable>
+ <valuemap type="QVariantMap"/>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.Target.0</variable>
+ <valuemap type="QVariantMap">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.DesktopTarget</value>
+ <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+ <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+ <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
+ <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
+ <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments">VACUUM_SOURCE_PATH=../vacuum-im/ VACUUM_BUILD_PATH=../vacuum-build-desktop-Qt___PATH______/src/libs/</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Сборка</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Сборка</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Сборка</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Очистка</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+ <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+ <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt в PATH Релиз</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+ <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/egd/Documents/projects/Vacuum-IM/dbusnotifications-build-desktop-Qt___PATH______</value>
+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">2</value>
+ <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
+ <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./usr/bin/gdb</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
+ <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Сборка</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Сборка</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Сборка</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Очистка</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+ <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+ <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt в PATH Отладка</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
+ <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/home/egd/Documents/projects/Vacuum-IM/dbusnotifications-build-desktop-Qt___PATH________</value>
+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">2</value>
+ <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Установка</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Без установки</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+ <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
+ <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+ <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+ <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+ <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+ <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+ <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+ <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+ <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+ <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+ <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+ <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+ <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+ <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+ <value type="int">0</value>
+ <value type="int">1</value>
+ <value type="int">2</value>
+ <value type="int">3</value>
+ <value type="int">4</value>
+ <value type="int">5</value>
+ <value type="int">6</value>
+ <value type="int">7</value>
+ <value type="int">8</value>
+ <value type="int">9</value>
+ <value type="int">10</value>
+ <value type="int">11</value>
+ <value type="int">12</value>
+ <value type="int">13</value>
+ <value type="int">14</value>
+ </valuelist>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+ <value type="int">0</value>
+ <value type="int">1</value>
+ <value type="int">2</value>
+ <value type="int">3</value>
+ <value type="int">4</value>
+ <value type="int">5</value>
+ <value type="int">6</value>
+ <value type="int">7</value>
+ <value type="int">8</value>
+ <value type="int">9</value>
+ <value type="int">10</value>
+ <value type="int">11</value>
+ <value type="int">12</value>
+ <value type="int">13</value>
+ <value type="int">14</value>
+ </valuelist>
+ <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments"></value>
+ <value type="int" key="ProjectExplorer.CustomExecutableRunConfiguration.BaseEnvironmentBase">2</value>
+ <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable"></value>
+ <value type="bool" key="ProjectExplorer.CustomExecutableRunConfiguration.UseTerminal">false</value>
+ <valuelist type="QVariantList" key="ProjectExplorer.CustomExecutableRunConfiguration.UserEnvironmentChanges"/>
+ <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.WorkingDirectory">%{buildDir}</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Особая программа</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
+ <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
+ <value type="bool" key="RunConfiguration.UseCppDebugger">true</value>
+ <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+ <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+ </valuemap>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.TargetCount</variable>
+ <value type="int">1</value>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
+ <value type="QString">{d3572fd9-34d8-4e8c-8732-1b2e06741676}</value>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
+ <value type="int">10</value>
+ </data>
+</qtcreator>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vacuum-im-plugins-dbusnotifications/dbuspopuphandler.cpp new/vacuum-im-plugins-dbusnotifications/dbuspopuphandler.cpp
--- old/vacuum-im-plugins-dbusnotifications/dbuspopuphandler.cpp 2011-08-04 18:54:43.000000000 +0200
+++ new/vacuum-im-plugins-dbusnotifications/dbuspopuphandler.cpp 2012-04-07 09:24:02.000000000 +0200
@@ -1,112 +1,185 @@
+#ifndef QT_NO_DEBUG
+# include <QDebug>
+#endif
+
+#include
+#include
+#include
+
#include "dbuspopuphandler.h"
DbusPopupHandler::DbusPopupHandler()
{
- FAvatars = NULL;
- FNotifications = NULL;
- FNotify = NULL;
+ FAvatars = NULL;
+ FNotifications = NULL;
+ FOptionsManager = NULL;
+ FNotify = NULL;
}
DbusPopupHandler::~DbusPopupHandler()
{
- delete FNotify;
+ delete FNotify;
}
void DbusPopupHandler::pluginInfo(IPluginInfo *APluginInfo)
{
- APluginInfo->name = tr("Dbus Popup Notifications Handler");
- APluginInfo->description = tr("Allows other modules use DBus to show notifications");
- APluginInfo->version = "1.0."SVN_REVISION;
- APluginInfo->author = "Crying Angel";
- APluginInfo->homePage = "http://www.vacuum-im.org";
- APluginInfo->dependences.append(NOTIFICATIONS_UUID);
- APluginInfo->dependences.append(AVATARTS_UUID);
+ APluginInfo->name = tr("Dbus Popup Notifications Handler");
+ APluginInfo->description = tr("Allows other modules use DBus to show notifications");
+ APluginInfo->version = "1.0.2";
+ APluginInfo->author = "Crying Angel";
+ APluginInfo->homePage = "http://www.vacuum-im.org";
+ APluginInfo->dependences.append(NOTIFICATIONS_UUID);
+ APluginInfo->dependences.append(AVATARTS_UUID);
+ APluginInfo->dependences.append(OPTIONSMANAGER_UUID);
}
bool DbusPopupHandler::initConnections(IPluginManager *APluginManager, int &/*AInitOrder*/)
{
- IPlugin *plugin;
+ IPlugin *plugin;
+
+ plugin = APluginManager->pluginInterface("IAvatars").value(0,NULL);
+ if (!plugin) return false;
+ FAvatars = qobject_cast(plugin->instance());
+
+ plugin = APluginManager->pluginInterface("INotifications").value(0,NULL);
+ if (!plugin) return false;
+ FNotifications = qobject_cast(plugin->instance());
- plugin = APluginManager->pluginInterface("IAvatars").value(0,NULL);
- if (!plugin) return false;
- FAvatars = qobject_cast(plugin->instance());
+ plugin = APluginManager->pluginInterface("IOptionsManager").value(0,NULL);
+ if (!plugin) return false;
+ FOptionsManager = qobject_cast(plugin->instance());
- plugin = APluginManager->pluginInterface("INotifications").value(0,NULL);
- if (!plugin) return false;
- FNotifications = qobject_cast(plugin->instance());
+ connect(Options::instance(),SIGNAL(optionsOpened()),SLOT(onOptionsOpened()));
+ connect(Options::instance(),SIGNAL(optionsChanged(const OptionsNode &)),SLOT(onOptionsChanged(const OptionsNode &)));
- connect (APluginManager->instance(), SIGNAL(aboutToQuit()), this, SLOT(onApplicationQuit()));
-// connect (FNotifications->instance(), SIGNAL(notificationRemoved(int)),this,SLOT(onWindowNotifyRemoved(int)));
+ connect (APluginManager->instance(), SIGNAL(aboutToQuit()), this, SLOT(onApplicationQuit()));
+ // connect (FNotifications->instance(), SIGNAL(notificationRemoved(int)),this,SLOT(onWindowNotifyRemoved(int)));
- return true;
+ return true;
+}
+
+QMultiMap DbusPopupHandler::optionsWidgets(const QString &ANodeId, QWidget *AParent)
+{
+ QMultiMap widgets;
+ if (FOptionsManager && ANodeId==OPN_DBUSPOPUP)
+ {
+ widgets.insertMulti(OWO_DBUSPOPUP, FOptionsManager->optionsHeaderWidget(tr("Notifications provider: %1").arg(FServerName+" "+FServerVendor+" "+FServerVersion),AParent));
+ widgets.insertMulti(OWO_DBUSPOPUP, FOptionsManager->optionsNodeWidget(Options::node(OPV_DP_ALLOW_ACTIONS),tr("Allow actions in notifications"),AParent));
+ widgets.insertMulti(OWO_DBUSPOPUP, FOptionsManager->optionsNodeWidget(Options::node(OPV_DP_REMOVE_TAGS),tr("Remove html tags"),AParent));
+ }
+ return widgets;
+}
+
+void DbusPopupHandler::onOptionsOpened()
+{
+ Options::node(OPV_DP_ALLOW_ACTIONS).setValue(FAllowActions);
+ Options::node(OPV_DP_REMOVE_TAGS).setValue(FRemoveTags);
+}
+
+void DbusPopupHandler::onOptionsChanged(const OptionsNode &ANode)
+{
+ if (ANode.path() == OPV_DP_ALLOW_ACTIONS) {
+ FAllowActions = Options::node(OPV_DP_ALLOW_ACTIONS).value().toBool();
+ } else if (ANode.path() == OPV_DP_REMOVE_TAGS) {
+ FRemoveTags = Options::node(OPV_DP_REMOVE_TAGS).value().toBool();
+ }
}
bool DbusPopupHandler::initObjects()
{
- FNotify = new QDBusInterface("org.freedesktop.Notifications",
- "/org/freedesktop/Notifications","org.freedesktop.Notifications",
- QDBusConnection::sessionBus()/*, this*/);
- if(FNotify->lastError().type() != QDBusError::NoError)
+ FNotify = new QDBusInterface("org.freedesktop.Notifications",
+ "/org/freedesktop/Notifications","org.freedesktop.Notifications",
+ QDBusConnection::sessionBus()/*, this*/);
+ if(FNotify->lastError().type() != QDBusError::NoError)
+ {
+#ifndef QT_NO_DEBUG
+ qWarning() << "DBus Notifys: Unable to create interface.";
+#endif
+ return false;
+ }
+ FUseFreedesktopSpec = true;
+ FRemoveTags = false;
+ FAllowActions = true;
+#ifndef QT_NO_DEBUG
+ qDebug() << "DBus Notifys: DBus interface created successfully.";
+#endif
+
+ QDBusMessage reply = FNotify->call(QDBus::Block,"GetServerInformation");
+ if(QDBusMessage::ErrorMessage != reply.type())
+ {
+#ifndef QT_NO_DEBUG
+ for (int i=0;icall(QDBus::Block,"GetServerInformation");
- if(reply.type() == QDBusMessage::ErrorMessage)
+ if (FServerVendor == "GNOME")
{
- qWarning() << "DBus Error: " << reply.errorMessage();
+ FRemoveTags = true;
}
- else
+ else if (FServerName == "naughty")
{
- for (int i=0;iinsertNotificationHandler(NHO_DBUSPOPUP, this);
+ // connect(FNotify,SIGNAL(NotificationClosed(uint,uint)),this,SLOT(onNotifyClosed(uint,uint)));
+ connect(FNotify,SIGNAL(ActionInvoked(uint,QString)),this,SLOT(onActionInvoked(uint,QString)));
- return true;
+ FNotifications->insertNotificationHandler(NHO_DBUSPOPUP, this);
+
+ return true;
}
bool DbusPopupHandler::initSettings()
{
- FTimeout = 6000;
- FUpdateNotify = false;
- return true;
+ FTimeout = 6000;
+ FUpdateNotify = false;
+
+ if (FOptionsManager)
+ {
+ IOptionsDialogNode dnode = { ONO_DBUSPOPUP, OPN_DBUSPOPUP, tr("DBus Popup"), MNI_DBUSPOPUP };
+ FOptionsManager->insertOptionsDialogNode(dnode);
+ FOptionsManager->insertOptionsHolder(this);
+ }
+ return true;
}
-bool DbusPopupHandler::showNotification(int AOrder, uchar AKind, int ANotifyId, const INotification &ANotification)
+bool DbusPopupHandler::showNotification(int AOrder, ushort AKind, int ANotifyId, const INotification &ANotification)
{
- qDebug() << "DBus Notifys: showNotification requested.";
if (AOrder!=NHO_DBUSPOPUP||!(AKind&INotification::PopupWindow)) return false;
+
+#ifndef QT_NO_DEBUG
qDebug() << "DBus Notifys: showNotification request accepted.";
+#endif
Jid contactJid = ANotification.data.value(NDR_CONTACT_JID).toString();
- QString toolTip = ANotification.data.value(NDR_POPUP_HTML).toString();
QString imgPath;
QString iconPath;
FTimeout = Options::node(OPV_NOTIFICATIONS_POPUPTIMEOUT).value().toInt()*1000;
+#ifndef QT_NO_DEBUG
qDebug() << "NDR_TOOLTIP" << ANotification.data.value(NDR_TOOLTIP).toString();
qDebug() << "NDR_POPUP_CAPTION" << ANotification.data.value(NDR_POPUP_CAPTION).toString();
qDebug() << "NDR_POPUP_TITLE" << ANotification.data.value(NDR_POPUP_TITLE).toString();
qDebug() << "NDR_POPUP_HTML" << ANotification.data.value(NDR_POPUP_HTML).toString();
- toolTip = toolTip.replace("<br />", "\n");
- qDebug() << "NDR_POPUP_HTML trimed 1" << toolTip;
- toolTip = toolTip.replace(QRegExp("<[^>]*>"), "");
- qDebug() << "NDR_POPUP_HTML trimed 2" << toolTip;
+#endif
if (FAvatars)
{
@@ -116,23 +189,35 @@
QList<QVariant> notifyArgs;
notifyArgs.append("Vacuum IM"); //app-name
notifyArgs.append((uint)ANotifyId); //id;
-// if(!FUseFreedesktopSpec)
-// notifyArgs.append(""); //event-id
+ // if(!FUseFreedesktopSpec)
+ // notifyArgs.append(""); //event-id
notifyArgs.append(iconPath); //app-icon(path to icon on disk)
- notifyArgs.append(ANotification.data.value(NDR_POPUP_CAPTION).toString()); //summary (notification title)
-// if(FUseFreedesktopSpec)
- if (FGnomeDaemon)
+ notifyArgs.append(ANotification.data.value(NDR_TOOLTIP).toString()); //summary (notification title)
+ // if(FUseFreedesktopSpec)
+ if (FRemoveTags)
{
- notifyArgs.append(ANotification.data.value(NDR_TOOLTIP).toString()+":\n"+toolTip/*ANotification.data.value(NDR_POPUP_HTML).toString()*/);
+ QString popupBody = ANotification.data.value(NDR_POPUP_HTML).toString();
+ popupBody = popupBody.replace("<br />", "\n");
+#ifndef QT_NO_DEBUG
+ qDebug() << "NDR_POPUP_HTML trimed 1" << popupBody;
+#endif
+ popupBody = popupBody.replace(QRegExp("<[^>]*>"), "");
+#ifndef QT_NO_DEBUG
+ qDebug() << "NDR_POPUP_HTML trimed 2" << popupBody;
+#endif
+ notifyArgs.append(popupBody);
}
else
{
- notifyArgs.append(ANotification.data.value(NDR_TOOLTIP).toString()+":\n"+ANotification.data.value(NDR_POPUP_HTML).toString());
+ notifyArgs.append(/*ANotification.data.value(NDR_TOOLTIP).toString()+":\n"+*/ANotification.data.value(NDR_POPUP_HTML).toString());
}
- //body
+ //body
QStringList acts;
- acts << "actOne" << tr("Show");
- acts << "actTwo" << tr("Ignore");
+ if (FAllowActions)
+ {
+ acts << "actOne" << tr("Show");
+ acts << "actTwo" << tr("Ignore");
+ }
notifyArgs.append(acts); //actions
QVariantMap hints;
if (!imgPath.isEmpty())
@@ -150,23 +235,26 @@
ANotifyId = reply.value();
}
}
+#ifndef QT_NO_DEBUG
else
{
qWarning() << "DBus Notifys Error: " << reply.error();
- };
-
+ }
+#endif
return true;
}
void DbusPopupHandler::onActionInvoked(unsigned int notifyId, QString action)
{
- qDebug() << "DBus Notifys: action "<activateNotification(notifyId);
- else
- FNotifications->removeNotification(notifyId);
+#ifndef QT_NO_DEBUG
+ qDebug() << "DBus Notifys: action "<activateNotification(notifyId);
+ else
+ FNotifications->removeNotification(notifyId);
- FNotify->call("CloseNotification",notifyId);
+ FNotify->call("CloseNotification",notifyId);
}
void DbusPopupHandler::onWindowNotifyRemoved(/*int ANotifyId*/)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vacuum-im-plugins-dbusnotifications/dbuspopuphandler.h new/vacuum-im-plugins-dbusnotifications/dbuspopuphandler.h
--- old/vacuum-im-plugins-dbusnotifications/dbuspopuphandler.h 2011-08-04 18:54:43.000000000 +0200
+++ new/vacuum-im-plugins-dbusnotifications/dbuspopuphandler.h 2012-04-01 08:54:34.000000000 +0200
@@ -18,32 +18,40 @@
#ifndef DBUSPOPUPHANDLER_H
#define DBUSPOPUPHANDLER_H
-#include <QDebug>
#include
#include
-#include
#include
#include
+#include
#include
-#include
-#include
-
-#ifdef SVNINFO
-# include "svninfo.h"
-#else
-# define SVN_REVISION "0"
-#endif
#define DBUSPOPUPHANDLER_UUID "{63685fbc-5a2d-4e8c-b9d5-d69ea8fbdb4e}"
-#define NHO_DBUSPOPUP 3000
+#define NHO_DBUSPOPUP 3000
+
+//Menu Icons
+#define MNI_DBUSPOPUP "dbuspopup"
+
+//Option Nodes
+#define OPN_DBUSPOPUP "DBus popups"
+
+//Option Node Order
+#define ONO_DBUSPOPUP 900
+
+//Option Widget Order
+#define OWO_DBUSPOPUP 500
+
+//Options
+#define OPV_DP_ALLOW_ACTIONS "dbuspopup.allow-actions"
+#define OPV_DP_REMOVE_TAGS "dbuspopup.remove-tags"
class DbusPopupHandler :
public QObject,
public IPlugin,
- public INotificationHandler
+ public INotificationHandler,
+ public IOptionsHolder
{
Q_OBJECT;
- Q_INTERFACES(IPlugin INotificationHandler);
+ Q_INTERFACES(IPlugin INotificationHandler IOptionsHolder);
public:
DbusPopupHandler();
~DbusPopupHandler();
@@ -55,10 +63,14 @@
virtual bool initObjects();
virtual bool initSettings();
virtual bool startPlugin() { return true; }
+ //IOptionsHolder
+ virtual QMultiMap optionsWidgets(const QString &ANodeId, QWidget *AParent);
//INotificationHandler
- virtual bool showNotification(int AOrder, uchar AKind, int ANotifyId, const INotification &ANotification);
+ virtual bool showNotification(int AOrder, ushort AKind, int ANotifyId, const INotification &ANotification);
protected slots:
+ void onOptionsOpened();
+ void onOptionsChanged(const OptionsNode &ANode);
void onActionInvoked(unsigned int notifyId, QString action);
void onWindowNotifyRemoved(/*int ANotifyId*/);
void onApplicationQuit ();
@@ -66,12 +78,18 @@
private:
IAvatars *FAvatars;
INotifications *FNotifications;
+ IOptionsManager *FOptionsManager;
QDBusInterface *FNotify;
+ QString FServerName;
+ QString FServerVendor;
+ QString FServerVersion;
+
int FTimeout;
bool FUpdateNotify;
bool FUseFreedesktopSpec;
- bool FGnomeDaemon;
+ bool FRemoveTags;
+ bool FAllowActions;
};
#endif // DBUSPOPUPHANDLER_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vacuum-im-plugins-dbusnotifications/doc/AUTHORS new/vacuum-im-plugins-dbusnotifications/doc/AUTHORS
--- old/vacuum-im-plugins-dbusnotifications/doc/AUTHORS 2011-07-29 17:56:58.000000000 +0200
+++ new/vacuum-im-plugins-dbusnotifications/doc/AUTHORS 2012-03-08 07:58:21.000000000 +0100
@@ -1 +1,2 @@
-Crying Angel - cangel@inbox.ru
+Crying Angel
+Andrey Karepin
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vacuum-im-plugins-dbusnotifications/svninfo.h new/vacuum-im-plugins-dbusnotifications/svninfo.h
--- old/vacuum-im-plugins-dbusnotifications/svninfo.h 1970-01-01 01:00:00.000000000 +0100
+++ new/vacuum-im-plugins-dbusnotifications/svninfo.h 2012-04-02 19:54:22.000000000 +0200
@@ -0,0 +1 @@
+#define SVN_REVISION "exported"
Files old/vacuum-im-plugins-dbusnotifications/translations/bin/ru_RU/dbusnotifications.qm and new/vacuum-im-plugins-dbusnotifications/translations/bin/ru_RU/dbusnotifications.qm differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vacuum-im-plugins-dbusnotifications/translations/ru/dbusnotifications.ts new/vacuum-im-plugins-dbusnotifications/translations/ru/dbusnotifications.ts
--- old/vacuum-im-plugins-dbusnotifications/translations/ru/dbusnotifications.ts 2011-07-29 17:56:58.000000000 +0200
+++ new/vacuum-im-plugins-dbusnotifications/translations/ru/dbusnotifications.ts 2012-04-02 19:55:56.000000000 +0200
@@ -5,11 +5,7 @@
<name>DbusPopupHandler</name>
<message>
<source>Dbus Popup Notifications Handler</source>
- <translation>DBus уведомления</translation>
- </message>
- <message>
- <source>Allows other modules use DBus to show notifications</source>
- <translation>Позволяет использовать DBus для вывода уведомлений</translation>
+ <translation>Модуль DBus уведомлений</translation>
</message>
<message>
<source>Show</source>
@@ -19,5 +15,25 @@
<source>Ignore</source>
<translation>Игнорировать</translation>
</message>
+ <message>
+ <source>Allows other modules use DBus to show notifications</source>
+ <translation>Позволяет использовать DBus для вывода уведомлений</translation>
+ </message>
+ <message>
+ <source>Allow actions in notifications</source>
+ <translation>Предоставлять дополнительные дейсвия в уведомлениях</translation>
+ </message>
+ <message>
+ <source>Remove html tags</source>
+ <translation>Не использовать HTML для форматирования оповещений</translation>
+ </message>
+ <message>
+ <source>DBus Popup</source>
+ <translation>DBus уведомления</translation>
+ </message>
+ <message>
+ <source>Notifications provider: %1</source>
+ <translation>Источник уведомлений: %1</translation>
+ </message>
</context>
</TS>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vacuum-im-plugins-dbusnotifications/translations/src/ru_RU/dbusnotifications.ts.orig new/vacuum-im-plugins-dbusnotifications/translations/src/ru_RU/dbusnotifications.ts.orig
--- old/vacuum-im-plugins-dbusnotifications/translations/src/ru_RU/dbusnotifications.ts.orig 1970-01-01 01:00:00.000000000 +0100
+++ new/vacuum-im-plugins-dbusnotifications/translations/src/ru_RU/dbusnotifications.ts.orig 2012-04-02 19:55:56.000000000 +0200
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="ru_RU" sourcelanguage="en">
+<context>
+ <name>DbusPopupHandler</name>
+ <message>
+ <source>Dbus Popup Notifications Handler</source>
+ <translation>Модуль DBus уведомлений</translation>
+ </message>
+ <message>
+ <source>Show</source>
+ <translation>Показать</translation>
+ </message>
+ <message>
+ <source>Ignore</source>
+ <translation>Игнорировать</translation>
+ </message>
+ <message>
+ <source>Allows other modules use DBus to show notifications</source>
+ <translation>Позволяет использовать DBus для вывода уведомлений</translation>
+ </message>
+ <message>
+ <source>Allow actions in notifications</source>
+ <translation>Предоставлять дополнительные дейсвия в уведомлениях</translation>
+ </message>
+ <message>
+ <source>Remove html tags</source>
+ <translation>Не использовать HTML для форматирования оповещений</translation>
+ </message>
+ <message>
+ <source>DBus Popup</source>
+ <translation>DBus уведомления</translation>
+ </message>
+ <message>
+ <source>Notifications provider: %1</source>
+ <translation>Источник уведомлений: %1</translation>
+ </message>
+</context>
+</TS>
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org