Hello community,
here is the log from the commit of package bluedevil for openSUSE:Factory
checked in at Thu Apr 21 12:30:50 CEST 2011.
--------
--- KDE/bluedevil/bluedevil.changes 2011-03-29 13:25:28.000000000 +0200
+++ /mounts/work_src_done/STABLE/bluedevil/bluedevil.changes 2011-04-18 23:44:16.000000000 +0200
@@ -1,0 +2,15 @@
+Mon Apr 18 21:43:34 UTC 2011 - asterios.dramis@gmail.com
+
+- Update to 1.0.4:
+ * Unregister the agent correctly (important)
+ * Don’t launch the wizard if the input device doesn’t require pairing
+- Spec file updates:
+ * Changes based on rpmdevtools templates and spec-cleaner run.
+ * Removed kde4-filesystem and libpolkit-qt-devel from Buildrequires:.
+ * Changed Group: to Hardware/Other.
+ * Added obex-data-server and obexd-client in Requires:.
+ * Install preferences-system-bluetooth.png icon in KDE icondir.
+ * Updates in %files section.
+ * Minor other updates.
+
+-------------------------------------------------------------------
@@ -38 +53 @@
--------------------------------------------------------------------
+--------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
bluedevil-1.0.3.tar.bz2
New:
----
bluedevil-1.0.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bluedevil.spec ++++++
--- /var/tmp/diff_new_pack.oj8uGc/_old 2011-04-21 12:28:54.000000000 +0200
+++ /var/tmp/diff_new_pack.oj8uGc/_new 2011-04-21 12:28:54.000000000 +0200
@@ -20,49 +20,60 @@
Name: bluedevil
-BuildRequires: kde4-filesystem libbluedevil-devel
-BuildRequires: libkde4-devel shared-mime-info
-BuildRequires: libpolkit-qt-devel update-desktop-files
-License: GPLv2+
-Url: http://www.kde.org
-Summary: A new bluetooth manager for KDE 4
-Group: System/GUI/KDE
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Summary: A new bluetooth manager for KDE 4
-Version: 1.0.3
+Version: 1.0.4
Release: 1
-Source0: %{name}-%version.tar.bz2
+Summary: Bluetooth Manager for KDE 4
+
+License: GPLv2+
+Url: http://www.kde.org/
+Group: Hardware/Other
+Source0: ftp://ftp.kde.org/pub/kde/stable/bluedevil/%{version}/src/%{name}-%{version}.tar.bz2
Source1: preferences-system-bluetooth.png
-Requires(post): shared-mime-info
-Requires(postun): shared-mime-info
-Recommends: %{name}-lang
-Provides: kbluetooth = 0.4.2
-Obsoletes: kbluetooth <= 0.4.2
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: libbluedevil-devel
+BuildRequires: libkde4-devel
+BuildRequires: shared-mime-info
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+Requires: obex-data-server
+Requires: obexd-client
%kde4_runtime_requires
+Requires(post): shared-mime-info
+Requires(postun): shared-mime-info
+Recommends: %{name}-lang = %{version}
+Provides: kbluetooth = %{version}
+Obsoletes: kbluetooth < %{version}
%description
-Bluetooth daemon for KDE, handling connections
+Bluetooth daemon for KDE, handling connections.
%lang_package
%prep
-%setup -q -n bluedevil-%version
+%setup -q
%build
- %cmake_kde4 -d build -- -DCONFIG_INSTALL_DIR=/etc
- %make_jobs
+%cmake_kde4 -d build
+%make_jobs
%install
- cd build
- %makeinstall
- install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/pixmaps/preferences-system-bluetooth.png
- %suse_update_desktop_file -r bluedevil-monolithic Utility DesktopUtility
- %kde_post_install
- cd ..
- %find_lang %{name}
+cd build
+%kde4_makeinstall
+cd ..
+
+install -D -pm 0644 %{SOURCE1} %{buildroot}%{_kde4_iconsdir}/hicolor/64x64/apps/preferences-system-bluetooth.png
+
+%if 0%{?suse_version}
+%suse_update_desktop_file -r bluedevil-monolithic Qt KDE Utility DesktopUtility
+%endif
+
+%find_lang %{name}
+
+%kde_post_install
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%post
/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -70,39 +81,33 @@
%postun
/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
-%files lang -f %{name}.lang
-
%files
-%defattr(-,root,root)
-%dir %_kde4_appsdir/bluedevil
-%dir %_kde4_appsdir/bluedevilwizard
-%{_libdir}/libbluedevilaction.so
-%{_kde4_modulesdir}/kded_bluedevil.so
+%defattr(-,root,root,-)
+%doc README
+%{_kde4_bindir}/bluedevil-*
%{_kde4_modulesdir}/bluedevil*.so
-%{_kde4_modulesdir}/kcm_bluedeviladapters.so
-%{_kde4_modulesdir}/kcm_bluedevildevices.so
-%{_kde4_modulesdir}/kcm_bluedeviltransfer.so
+%{_kde4_modulesdir}/kcm_bluedevil*.so
+%{_kde4_modulesdir}/kded_bluedevil.so
+%{_kde4_modulesdir}/kded_obexftpdaemon.so
%{_kde4_modulesdir}/kio_bluetooth.so
%{_kde4_modulesdir}/kio_obexftp.so
-%{_kde4_modulesdir}/kded_obexftpdaemon.so
-%{_kde4_servicesdir}/kded/bluedevil.desktop
-%{_kde4_servicesdir}/bluedevil-audio.desktop
-%{_kde4_servicesdir}/bluedevil-input.desktop
-%{_kde4_servicesdir}/bluedeviladapters.desktop
-%{_kde4_servicesdir}/bluedevildevices.desktop
-%{_kde4_servicesdir}/bluedeviltransfer.desktop
+%{_kde4_libdir}/libbluedevilaction.so
+%{_kde4_applicationsdir}/bluedevil-*.desktop
+%{_kde4_iconsdir}/hicolor/64x64/apps/preferences-system-bluetooth.png
+%{_kde4_appsdir}/bluedevil/
+%{_kde4_appsdir}/bluedevilwizard/
+%{_kde4_servicesdir}/bluedevil*.desktop
%{_kde4_servicesdir}/bluetooth.protocol
%{_kde4_servicesdir}/obexftp.protocol
%{_kde4_servicesdir}/sendfile.desktop
+%{_kde4_servicesdir}/kded/bluedevil.desktop
%{_kde4_servicesdir}/kded/obexftpdaemon.desktop
%{_kde4_servicetypesdir}/actionplugin.desktop
-%{_kde4_bindir}/bluedevil-*
-%{_kde4_appsdir}/bluedevil/bluedevil.notifyrc
-%{_kde4_appsdir}/bluedevilwizard/pin-code-database.xml
-/usr/share/dbus-1/services/org.kde.BlueDevil.Service.service
-/usr/share/pixmaps/preferences-system-bluetooth.png
-/usr/share/mime/packages/bluedevil-mime.xml
-/usr/include/actionplugin.h
-/usr/share/applications/kde4/bluedevil*desktop
+%{_datadir}/dbus-1/services/org.kde.BlueDevil.Service.service
+%{_datadir}/mime/packages/bluedevil-mime.xml
+%{_kde4_includedir}/actionplugin.h
+
+%files lang -f %{name}.lang
+%defattr(-,root,root,-)
%changelog
++++++ bluedevil-1.0.3.tar.bz2 -> bluedevil-1.0.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluedevil-1.0.3/po/pt_BR/bluedevil.po new/bluedevil-1.0.4/po/pt_BR/bluedevil.po
--- old/bluedevil-1.0.3/po/pt_BR/bluedevil.po 2011-03-21 18:27:43.000000000 +0100
+++ new/bluedevil-1.0.4/po/pt_BR/bluedevil.po 2011-04-03 23:10:19.000000000 +0200
@@ -10,7 +10,7 @@
"Project-Id-Version: bluedevil\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2011-02-09 11:44+0100\n"
-"PO-Revision-Date: 2011-02-26 13:23-0300\n"
+"PO-Revision-Date: 2011-04-02 00:47-0300\n"
"Last-Translator: André Marcelo Alvarenga \n"
"Language-Team: Brazilian Portuguese \n"
"MIME-Version: 1.0\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluedevil-1.0.3/src/actionplugins/actionplugin.desktop new/bluedevil-1.0.4/src/actionplugins/actionplugin.desktop
--- old/bluedevil-1.0.3/src/actionplugins/actionplugin.desktop 2011-03-21 18:27:06.000000000 +0100
+++ new/bluedevil-1.0.4/src/actionplugins/actionplugin.desktop 2011-04-03 23:09:21.000000000 +0200
@@ -16,7 +16,7 @@
Name[hu]=BlueDevil szolgáltatás bővítmény
Name[it]=Estensione di servizio di BlueDevil
Name[km]=កម្មវិធីជំនួយសេវា BlueDevil
-Name[nb]=BlueDevil tjeneste-programtillegg
+Name[nb]=Programtillegg for BlueDevil-tjeneste
Name[nds]=Moduul för BlueDevil-Deensten
Name[nl]=Plugin voor BlueDevil-service
Name[pa]=BlueDevil ਸਰਵਿਸ ਪਲੱਗਇਨ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluedevil-1.0.3/src/actionplugins/input/helper/CMakeLists.txt new/bluedevil-1.0.4/src/actionplugins/input/helper/CMakeLists.txt
--- old/bluedevil-1.0.3/src/actionplugins/input/helper/CMakeLists.txt 2011-03-21 18:27:06.000000000 +0100
+++ new/bluedevil-1.0.4/src/actionplugins/input/helper/CMakeLists.txt 2011-04-03 23:09:21.000000000 +0200
@@ -7,6 +7,7 @@
set(inputhelper_SRCS
main.cpp
inputhelper.cpp
+ ../../../wizard/wizardagent.cpp
)
kde4_add_executable(bluedevil-input ${inputhelper_SRCS})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluedevil-1.0.3/src/actionplugins/input/helper/inputhelper.cpp new/bluedevil-1.0.4/src/actionplugins/input/helper/inputhelper.cpp
--- old/bluedevil-1.0.3/src/actionplugins/input/helper/inputhelper.cpp 2011-03-21 18:27:06.000000000 +0100
+++ new/bluedevil-1.0.4/src/actionplugins/input/helper/inputhelper.cpp 2011-04-03 23:09:21.000000000 +0200
@@ -17,6 +17,7 @@
#include "inputhelper.h"
#include "../../actionplugin.h"
+#include "../../../wizard/wizardagent.h"
#include <QApplication>
#include <QDebug>
@@ -37,8 +38,11 @@
}
Device *device = Manager::self()->defaultAdapter()->deviceForAddress(address.host().replace("-", ":"));
+ device->UUIDs();
+ WizardAgent *agent = new WizardAgent(qApp);
- if(device->isPaired()) {
+ QString pin = agent->getPin(device);
+ if(pin == "NULL" || device->isPaired()) {
kDebug() << "Device paired, getting the service";
QString constraint("'00001124-0000-1000-8000-00805F9B34FB' in [X-BlueDevil-UUIDS]");
@@ -55,4 +59,6 @@
kDebug() << "Device not paired, launched wizard: " << device->friendlyName();
KToolInvocation::kdeinitExec("bluedevil-wizard", QStringList() << address.url());
}
+
+ delete agent;
}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluedevil-1.0.3/src/actionplugins/sendfile/helper/discoverwidget.cpp new/bluedevil-1.0.4/src/actionplugins/sendfile/helper/discoverwidget.cpp
--- old/bluedevil-1.0.3/src/actionplugins/sendfile/helper/discoverwidget.cpp 2011-03-21 18:27:06.000000000 +0100
+++ new/bluedevil-1.0.4/src/actionplugins/sendfile/helper/discoverwidget.cpp 2011-04-03 23:09:21.000000000 +0200
@@ -40,8 +40,8 @@
connect(deviceList, SIGNAL(itemActivated(QListWidgetItem*)), this,
SLOT(itemSelected(QListWidgetItem*)));
- connect(Manager::self()->defaultAdapter(), SIGNAL(deviceFound(Device*)), this,
- SLOT(deviceFound(Device*)));
+ connect(Manager::self()->defaultAdapter(), SIGNAL(deviceFound(QVariantMap)), this,
+ SLOT(deviceFound(QVariantMap)));
startScan();
}
@@ -65,34 +65,58 @@
}
}
-void DiscoverWidget::deviceFound(Device* device)
+void DiscoverWidget::deviceFound(const QVariantMap& deviceInfo)
{
- if (m_itemRelation.contains(device->address()) && !device->name().isEmpty()) {
- m_itemRelation[device->address()]->setText(device->friendlyName());
- if (m_itemRelation[device->address()]->isSelected()) {
- emit deviceSelected(device);
- }
- return;
+ QString address = deviceInfo["Address"].toString();
+ QString name = deviceInfo["Name"].toString();
+ QString icon = deviceInfo["Icon"].toString();
+ QString alias = deviceInfo["Alias"].toString();
+
+ qDebug() << "========================";
+ qDebug() << "Address: " << address;
+ qDebug() << "Name: " << name;
+ qDebug() << "Alias: " << alias;
+ qDebug() << "Icon: " << icon;
+ qDebug() << "\n";
+
+
+ bool origName = false;
+ if (!name.isEmpty()) {
+ origName = true;
}
- QString name = device->alias();
- if (device->alias() != device->name() && !device->name().isEmpty()) {
- name.append(" ("+device->name()+")");
+ if (!alias.isEmpty() && alias != name && !name.isEmpty()) {
+ name = QString("%1 (%2)").arg(alias).arg(name);
+ }
+
+ if (name.isEmpty()) {
+ name = address;
}
- QString icon = device->icon();
if (icon.isEmpty()) {
icon.append("preferences-system-bluetooth");
}
+ if (m_itemRelation.contains(address)) {
+ m_itemRelation[address]->setText(name);
+ m_itemRelation[address]->setIcon(KIcon(icon));
+ m_itemRelation[address]->setData(Qt::UserRole+1, origName);
+
+ if (deviceList->currentItem() == m_itemRelation[address]) {
+ emit deviceSelected(Manager::self()->defaultAdapter()->deviceForAddress(address));
+ }
+ return;
+ }
+
QListWidgetItem *item = new QListWidgetItem(KIcon(icon), name, deviceList);
- item->setData(Qt::UserRole, qVariantFromValue(device));
- m_itemRelation.insert(device->address(), item);
+ item->setData(Qt::UserRole, address);
+ item->setData(Qt::UserRole+1, origName);
+
+ m_itemRelation.insert(address, item);
}
void DiscoverWidget::itemSelected(QListWidgetItem* item)
{
- Device *device = qobject_cast(item->data(Qt::UserRole).value());
- emit deviceSelected(device);
+ emit deviceSelected(Manager::self()->defaultAdapter()->deviceForAddress(item->data(Qt::UserRole).toString()));
}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluedevil-1.0.3/src/actionplugins/sendfile/helper/discoverwidget.h new/bluedevil-1.0.4/src/actionplugins/sendfile/helper/discoverwidget.h
--- old/bluedevil-1.0.3/src/actionplugins/sendfile/helper/discoverwidget.h 2011-03-21 18:27:06.000000000 +0100
+++ new/bluedevil-1.0.4/src/actionplugins/sendfile/helper/discoverwidget.h 2011-04-03 23:09:21.000000000 +0200
@@ -48,7 +48,7 @@
void startScan();
private Q_SLOTS:
- void deviceFound(Device *device);
+ void deviceFound(const QVariantMap &deviceInfo);
void itemSelected(QListWidgetItem* item);
private:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluedevil-1.0.3/src/actionplugins/sendfile/helper/pages/connectingpage.cpp new/bluedevil-1.0.4/src/actionplugins/sendfile/helper/pages/connectingpage.cpp
--- old/bluedevil-1.0.3/src/actionplugins/sendfile/helper/pages/connectingpage.cpp 2011-03-21 18:27:06.000000000 +0100
+++ new/bluedevil-1.0.4/src/actionplugins/sendfile/helper/pages/connectingpage.cpp 2011-04-03 23:09:21.000000000 +0200
@@ -44,6 +44,7 @@
Device *device = static_cast(wizard())->device();
connLabel->setText(i18nc("Connecting to a bluetooth device", "Connecting to %1 ...", device->name()));
+ Manager::self()->defaultAdapter()->stopDiscovery();
static_cast(wizard())->startTransfer();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluedevil-1.0.3/src/daemon/kded/agentlistenerworker.cpp new/bluedevil-1.0.4/src/daemon/kded/agentlistenerworker.cpp
--- old/bluedevil-1.0.3/src/daemon/kded/agentlistenerworker.cpp 2011-03-21 18:27:06.000000000 +0100
+++ new/bluedevil-1.0.4/src/daemon/kded/agentlistenerworker.cpp 2011-04-03 23:09:21.000000000 +0200
@@ -50,6 +50,7 @@
if (defaultAdapter) {
defaultAdapter->unregisterAgent(AGENT_PATH);
}
+ QDBusConnection::systemBus().unregisterObject(AGENT_PATH);
}
void AgentListenerWorker::Release()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bluedevil-1.0.3/src/wizard/wizardagent.cpp new/bluedevil-1.0.4/src/wizard/wizardagent.cpp
--- old/bluedevil-1.0.3/src/wizard/wizardagent.cpp 2011-03-21 18:27:06.000000000 +0100
+++ new/bluedevil-1.0.4/src/wizard/wizardagent.cpp 2011-04-03 23:09:21.000000000 +0200
@@ -23,8 +23,11 @@
#include <QDBusMessage>
#include
#include <KDebug>
+#include <KAboutData>
#include
#include
+#include
+#include <KComponentData>
using namespace BlueDevil;
@@ -107,7 +110,8 @@
m_pin = QString::number(KRandom::random());
m_pin = m_pin.left(6);
- QString xmlPath = KStandardDirs::locate("appdata", "pin-code-database.xml");
+ KComponentData data("bluedevilwizard");
+ QString xmlPath = KStandardDirs::locate("appdata", "pin-code-database.xml", data);
QFile *file = new QFile(xmlPath);
if(!file->open(QIODevice::ReadOnly)) {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org