rev 6609 - in kde-extras/kdebluetooth/trunk/debian: . patches
Achim Bohnet
ach-guest at alioth.debian.org
Wed Jun 27 00:09:17 UTC 2007
Author: ach-guest
Date: 2007-06-27 00:09:17 +0000 (Wed, 27 Jun 2007)
New Revision: 6609
Added:
kde-extras/kdebluetooth/trunk/debian/patches/
kde-extras/kdebluetooth/trunk/debian/patches/10_update-1.0-beta3_to_kdesvn_r680708.diff
Modified:
kde-extras/kdebluetooth/trunk/debian/changelog
Log:
+ * add debian/patches/10_update-1.0-beta3_to_kdesvn_r680708.diff: pull in
+ fixes from upstream KDE SVN up to revision r680708.
Modified: kde-extras/kdebluetooth/trunk/debian/changelog
===================================================================
--- kde-extras/kdebluetooth/trunk/debian/changelog 2007-06-26 23:36:45 UTC (rev 6608)
+++ kde-extras/kdebluetooth/trunk/debian/changelog 2007-06-27 00:09:17 UTC (rev 6609)
@@ -39,6 +39,8 @@
* libkdebluetooth-dev depends on ${binary:Version} of the runtime library
package.
* Bump standard-version to 3.7.2
+ * add debian/patches/10_update-1.0-beta3_to_kdesvn_r680708.diff: pull in
+ fixes from upstream KDE SVN up to revision r680708.
-- Mark Purcell <msp at debian.org> Tue, 26 Jun 2007 09:30:53 +0100
Added: kde-extras/kdebluetooth/trunk/debian/patches/10_update-1.0-beta3_to_kdesvn_r680708.diff
===================================================================
--- kde-extras/kdebluetooth/trunk/debian/patches/10_update-1.0-beta3_to_kdesvn_r680708.diff (rev 0)
+++ kde-extras/kdebluetooth/trunk/debian/patches/10_update-1.0-beta3_to_kdesvn_r680708.diff 2007-06-27 00:09:17 UTC (rev 6609)
@@ -0,0 +1,1550 @@
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/AUTHORS branch-kde35/kdebluetooth/AUTHORS
+--- kdebluetooth-1.0-beta3/kdebluetooth/AUTHORS 1970-01-01 01:00:00.000000000 +0100
++++ branch-kde35/kdebluetooth/AUTHORS 2007-06-20 00:47:37.000000000 +0200
+@@ -0,0 +1,41 @@
++Authors of kdebluetooth in order of appearance
++----------------------------------------------
++
++Mattia Merzi <merzi at itc.it>
++ khciconfig
++ kbluelock
++
++Fred Schaettgen <kdebluetooth at schaettgen.de>
++ kbluetoothd
++ kbtobexsrv
++ kio_sdp
++ kio_bluetooth
++ kbtserialchat
++ khandsfree
++ kbemusedsrv
++ likbluetooth
++ kioclient
++ kbtsearch
++
++Simone Gotti <simone.gotti at email.it>
++ kbtobexclient
++ IrMCSync Konnector
++ libkobex
++ Service Discovery
++ Autotools Scripts
++
++Alex Ibrado <alex at kdex.org>
++ kbemusedsrv
++
++Mathias Froehlich <Mathias.Froehlich at web.de>
++ libqobex
++ kio_obex
++
++Daniel Gollub <dgollub at suse.de>
++ BlueZ D-Bus API rewrite
++
++Tom Patzig <tpatzig at suse.de>
++ kbluemon
++ kbluelock (rewrite)
++ kinputwizard
++
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/COPYING branch-kde35/kdebluetooth/COPYING
+--- kdebluetooth-1.0-beta3/kdebluetooth/COPYING 1970-01-01 01:00:00.000000000 +0100
++++ branch-kde35/kdebluetooth/COPYING 2007-06-20 00:47:37.000000000 +0200
+@@ -0,0 +1,340 @@
++ GNU GENERAL PUBLIC LICENSE
++ Version 2, June 1991
++
++ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
++ 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
++ Everyone is permitted to copy and distribute verbatim copies
++ of this license document, but changing it is not allowed.
++
++ Preamble
++
++ The licenses for most software are designed to take away your
++freedom to share and change it. By contrast, the GNU General Public
++License is intended to guarantee your freedom to share and change free
++software--to make sure the software is free for all its users. This
++General Public License applies to most of the Free Software
++Foundation's software and to any other program whose authors commit to
++using it. (Some other Free Software Foundation software is covered by
++the GNU Library General Public License instead.) You can apply it to
++your programs, too.
++
++ When we speak of free software, we are referring to freedom, not
++price. Our General Public Licenses are designed to make sure that you
++have the freedom to distribute copies of free software (and charge for
++this service if you wish), that you receive source code or can get it
++if you want it, that you can change the software or use pieces of it
++in new free programs; and that you know you can do these things.
++
++ To protect your rights, we need to make restrictions that forbid
++anyone to deny you these rights or to ask you to surrender the rights.
++These restrictions translate to certain responsibilities for you if you
++distribute copies of the software, or if you modify it.
++
++ For example, if you distribute copies of such a program, whether
++gratis or for a fee, you must give the recipients all the rights that
++you have. You must make sure that they, too, receive or can get the
++source code. And you must show them these terms so they know their
++rights.
++
++ We protect your rights with two steps: (1) copyright the software, and
++(2) offer you this license which gives you legal permission to copy,
++distribute and/or modify the software.
++
++ Also, for each author's protection and ours, we want to make certain
++that everyone understands that there is no warranty for this free
++software. If the software is modified by someone else and passed on, we
++want its recipients to know that what they have is not the original, so
++that any problems introduced by others will not reflect on the original
++authors' reputations.
++
++ Finally, any free program is threatened constantly by software
++patents. We wish to avoid the danger that redistributors of a free
++program will individually obtain patent licenses, in effect making the
++program proprietary. To prevent this, we have made it clear that any
++patent must be licensed for everyone's free use or not licensed at all.
++
++ The precise terms and conditions for copying, distribution and
++modification follow.
++
++ GNU GENERAL PUBLIC LICENSE
++ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
++
++ 0. This License applies to any program or other work which contains
++a notice placed by the copyright holder saying it may be distributed
++under the terms of this General Public License. The "Program", below,
++refers to any such program or work, and a "work based on the Program"
++means either the Program or any derivative work under copyright law:
++that is to say, a work containing the Program or a portion of it,
++either verbatim or with modifications and/or translated into another
++language. (Hereinafter, translation is included without limitation in
++the term "modification".) Each licensee is addressed as "you".
++
++Activities other than copying, distribution and modification are not
++covered by this License; they are outside its scope. The act of
++running the Program is not restricted, and the output from the Program
++is covered only if its contents constitute a work based on the
++Program (independent of having been made by running the Program).
++Whether that is true depends on what the Program does.
++
++ 1. You may copy and distribute verbatim copies of the Program's
++source code as you receive it, in any medium, provided that you
++conspicuously and appropriately publish on each copy an appropriate
++copyright notice and disclaimer of warranty; keep intact all the
++notices that refer to this License and to the absence of any warranty;
++and give any other recipients of the Program a copy of this License
++along with the Program.
++
++You may charge a fee for the physical act of transferring a copy, and
++you may at your option offer warranty protection in exchange for a fee.
++
++ 2. You may modify your copy or copies of the Program or any portion
++of it, thus forming a work based on the Program, and copy and
++distribute such modifications or work under the terms of Section 1
++above, provided that you also meet all of these conditions:
++
++ a) You must cause the modified files to carry prominent notices
++ stating that you changed the files and the date of any change.
++
++ b) You must cause any work that you distribute or publish, that in
++ whole or in part contains or is derived from the Program or any
++ part thereof, to be licensed as a whole at no charge to all third
++ parties under the terms of this License.
++
++ c) If the modified program normally reads commands interactively
++ when run, you must cause it, when started running for such
++ interactive use in the most ordinary way, to print or display an
++ announcement including an appropriate copyright notice and a
++ notice that there is no warranty (or else, saying that you provide
++ a warranty) and that users may redistribute the program under
++ these conditions, and telling the user how to view a copy of this
++ License. (Exception: if the Program itself is interactive but
++ does not normally print such an announcement, your work based on
++ the Program is not required to print an announcement.)
++
++These requirements apply to the modified work as a whole. If
++identifiable sections of that work are not derived from the Program,
++and can be reasonably considered independent and separate works in
++themselves, then this License, and its terms, do not apply to those
++sections when you distribute them as separate works. But when you
++distribute the same sections as part of a whole which is a work based
++on the Program, the distribution of the whole must be on the terms of
++this License, whose permissions for other licensees extend to the
++entire whole, and thus to each and every part regardless of who wrote it.
++
++Thus, it is not the intent of this section to claim rights or contest
++your rights to work written entirely by you; rather, the intent is to
++exercise the right to control the distribution of derivative or
++collective works based on the Program.
++
++In addition, mere aggregation of another work not based on the Program
++with the Program (or with a work based on the Program) on a volume of
++a storage or distribution medium does not bring the other work under
++the scope of this License.
++
++ 3. You may copy and distribute the Program (or a work based on it,
++under Section 2) in object code or executable form under the terms of
++Sections 1 and 2 above provided that you also do one of the following:
++
++ a) Accompany it with the complete corresponding machine-readable
++ source code, which must be distributed under the terms of Sections
++ 1 and 2 above on a medium customarily used for software interchange; or,
++
++ b) Accompany it with a written offer, valid for at least three
++ years, to give any third party, for a charge no more than your
++ cost of physically performing source distribution, a complete
++ machine-readable copy of the corresponding source code, to be
++ distributed under the terms of Sections 1 and 2 above on a medium
++ customarily used for software interchange; or,
++
++ c) Accompany it with the information you received as to the offer
++ to distribute corresponding source code. (This alternative is
++ allowed only for noncommercial distribution and only if you
++ received the program in object code or executable form with such
++ an offer, in accord with Subsection b above.)
++
++The source code for a work means the preferred form of the work for
++making modifications to it. For an executable work, complete source
++code means all the source code for all modules it contains, plus any
++associated interface definition files, plus the scripts used to
++control compilation and installation of the executable. However, as a
++special exception, the source code distributed need not include
++anything that is normally distributed (in either source or binary
++form) with the major components (compiler, kernel, and so on) of the
++operating system on which the executable runs, unless that component
++itself accompanies the executable.
++
++If distribution of executable or object code is made by offering
++access to copy from a designated place, then offering equivalent
++access to copy the source code from the same place counts as
++distribution of the source code, even though third parties are not
++compelled to copy the source along with the object code.
++
++ 4. You may not copy, modify, sublicense, or distribute the Program
++except as expressly provided under this License. Any attempt
++otherwise to copy, modify, sublicense or distribute the Program is
++void, and will automatically terminate your rights under this License.
++However, parties who have received copies, or rights, from you under
++this License will not have their licenses terminated so long as such
++parties remain in full compliance.
++
++ 5. You are not required to accept this License, since you have not
++signed it. However, nothing else grants you permission to modify or
++distribute the Program or its derivative works. These actions are
++prohibited by law if you do not accept this License. Therefore, by
++modifying or distributing the Program (or any work based on the
++Program), you indicate your acceptance of this License to do so, and
++all its terms and conditions for copying, distributing or modifying
++the Program or works based on it.
++
++ 6. Each time you redistribute the Program (or any work based on the
++Program), the recipient automatically receives a license from the
++original licensor to copy, distribute or modify the Program subject to
++these terms and conditions. You may not impose any further
++restrictions on the recipients' exercise of the rights granted herein.
++You are not responsible for enforcing compliance by third parties to
++this License.
++
++ 7. If, as a consequence of a court judgment or allegation of patent
++infringement or for any other reason (not limited to patent issues),
++conditions are imposed on you (whether by court order, agreement or
++otherwise) that contradict the conditions of this License, they do not
++excuse you from the conditions of this License. If you cannot
++distribute so as to satisfy simultaneously your obligations under this
++License and any other pertinent obligations, then as a consequence you
++may not distribute the Program at all. For example, if a patent
++license would not permit royalty-free redistribution of the Program by
++all those who receive copies directly or indirectly through you, then
++the only way you could satisfy both it and this License would be to
++refrain entirely from distribution of the Program.
++
++If any portion of this section is held invalid or unenforceable under
++any particular circumstance, the balance of the section is intended to
++apply and the section as a whole is intended to apply in other
++circumstances.
++
++It is not the purpose of this section to induce you to infringe any
++patents or other property right claims or to contest validity of any
++such claims; this section has the sole purpose of protecting the
++integrity of the free software distribution system, which is
++implemented by public license practices. Many people have made
++generous contributions to the wide range of software distributed
++through that system in reliance on consistent application of that
++system; it is up to the author/donor to decide if he or she is willing
++to distribute software through any other system and a licensee cannot
++impose that choice.
++
++This section is intended to make thoroughly clear what is believed to
++be a consequence of the rest of this License.
++
++ 8. If the distribution and/or use of the Program is restricted in
++certain countries either by patents or by copyrighted interfaces, the
++original copyright holder who places the Program under this License
++may add an explicit geographical distribution limitation excluding
++those countries, so that distribution is permitted only in or among
++countries not thus excluded. In such case, this License incorporates
++the limitation as if written in the body of this License.
++
++ 9. The Free Software Foundation may publish revised and/or new versions
++of the General Public License from time to time. Such new versions will
++be similar in spirit to the present version, but may differ in detail to
++address new problems or concerns.
++
++Each version is given a distinguishing version number. If the Program
++specifies a version number of this License which applies to it and "any
++later version", you have the option of following the terms and conditions
++either of that version or of any later version published by the Free
++Software Foundation. If the Program does not specify a version number of
++this License, you may choose any version ever published by the Free Software
++Foundation.
++
++ 10. If you wish to incorporate parts of the Program into other free
++programs whose distribution conditions are different, write to the author
++to ask for permission. For software which is copyrighted by the Free
++Software Foundation, write to the Free Software Foundation; we sometimes
++make exceptions for this. Our decision will be guided by the two goals
++of preserving the free status of all derivatives of our free software and
++of promoting the sharing and reuse of software generally.
++
++ NO WARRANTY
++
++ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
++FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
++OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
++PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
++OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
++MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
++TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
++PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
++REPAIR OR CORRECTION.
++
++ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
++WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
++REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
++INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
++OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
++TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
++YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
++PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
++POSSIBILITY OF SUCH DAMAGES.
++
++ END OF TERMS AND CONDITIONS
++
++ How to Apply These Terms to Your New Programs
++
++ If you develop a new program, and you want it to be of the greatest
++possible use to the public, the best way to achieve this is to make it
++free software which everyone can redistribute and change under these terms.
++
++ To do so, attach the following notices to the program. It is safest
++to attach them to the start of each source file to most effectively
++convey the exclusion of warranty; and each file should have at least
++the "copyright" line and a pointer to where the full notice is found.
++
++ <one line to give the program's name and a brief idea of what it does.>
++ Copyright (C) <year> <name of author>
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2 of the License, or
++ (at your option) any later version.
++
++ This program 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 General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
++
++
++Also add information on how to contact you by electronic and paper mail.
++
++If the program is interactive, make it output a short notice like this
++when it starts in an interactive mode:
++
++ Gnomovision version 69, Copyright (C) year name of author
++ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
++ This is free software, and you are welcome to redistribute it
++ under certain conditions; type `show c' for details.
++
++The hypothetical commands `show w' and `show c' should show the appropriate
++parts of the General Public License. Of course, the commands you use may
++be called something other than `show w' and `show c'; they could even be
++mouse-clicks or menu items--whatever suits your program.
++
++You should also get your employer (if you work as a programmer) or your
++school, if any, to sign a "copyright disclaimer" for the program, if
++necessary. Here is a sample; alter the names:
++
++ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
++ `Gnomovision' (which makes passes at compilers) written by James Hacker.
++
++ <signature of Ty Coon>, 1 April 1989
++ Ty Coon, President of Vice
++
++This General Public License does not permit incorporating your program into
++proprietary programs. If your program is a subroutine library, you may
++consider it more useful to permit linking proprietary applications with the
++library. If this is what you want to do, use the GNU Library General
++Public License instead of this License.
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/ChangeLog branch-kde35/kdebluetooth/ChangeLog
+--- kdebluetooth-1.0-beta3/kdebluetooth/ChangeLog 1970-01-01 01:00:00.000000000 +0100
++++ branch-kde35/kdebluetooth/ChangeLog 2007-06-20 00:47:37.000000000 +0200
+@@ -0,0 +1,7 @@
++kdebluetooth ChangeLog
++================
++(C) 2003-2005 The KDE Bluetooth team.
++
++
++VERSION 0.99-beta1 (2005-02-16):
++ First beta release after ages of CVS snapshots.
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/INSTALL branch-kde35/kdebluetooth/INSTALL
+--- kdebluetooth-1.0-beta3/kdebluetooth/INSTALL 1970-01-01 01:00:00.000000000 +0100
++++ branch-kde35/kdebluetooth/INSTALL 2007-06-20 00:47:37.000000000 +0200
+@@ -0,0 +1 @@
++
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/Makefile.in branch-kde35/kdebluetooth/Makefile.in
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/README branch-kde35/kdebluetooth/README
+--- kdebluetooth-1.0-beta3/kdebluetooth/README 1970-01-01 01:00:00.000000000 +0100
++++ branch-kde35/kdebluetooth/README 2007-06-20 00:47:37.000000000 +0200
+@@ -0,0 +1,32 @@
++kdebluetooth
++============
++Requires at least bluez-utils 3.11 and for some services it is
++recommended to start the hcid with "-x" for experimental features
++of bluez-utils.
++
++
++libkbluetooth
++=============
++Full rewrite for BlueZ D-Bus API.
++Latest version of bluez-utils recommended/required!
++
++kbluetooth
++==========
++Tray icon application which acts as BlueZ
++Passkey Agent and Authorization Agent.
++Allows to configure bluetooth adapters.
++
++kcm_btpaired
++============
++Manage pairings/bondings of (active!) bluetooth adapters.
++(Adapted to D-Bus as well...)
++
++kio_bluetooth and kio_sdp
++=========================
++Rewrite for new libkbluetooth API
++
++Replacing kio_obex with kio_obex2
++==================================
++Requires openobex-devel and obexftp-devel
++USB support!
++
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluelock/.svn/all-wcprops branch-kde35/kdebluetooth/kbluelock/.svn/all-wcprops
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluelock/.svn/entries branch-kde35/kdebluetooth/kbluelock/.svn/entries
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluelock/.svn/format branch-kde35/kdebluetooth/kbluelock/.svn/format
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluelock/.svn/text-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kbluelock/.svn/text-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluelock/.svn/text-base/kbluelock.cpp.svn-base branch-kde35/kdebluetooth/kbluelock/.svn/text-base/kbluelock.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluelock/.svn/text-base/kbluelock.desktop.svn-base branch-kde35/kdebluetooth/kbluelock/.svn/text-base/kbluelock.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluelock/.svn/text-base/kbluelock.h.svn-base branch-kde35/kdebluetooth/kbluelock/.svn/text-base/kbluelock.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluelock/.svn/text-base/lockdialog.ui.svn-base branch-kde35/kdebluetooth/kbluelock/.svn/text-base/lockdialog.ui.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluelock/.svn/text-base/main.cpp.svn-base branch-kde35/kdebluetooth/kbluelock/.svn/text-base/main.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluelock/Makefile.in branch-kde35/kdebluetooth/kbluelock/Makefile.in
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluelock/kbluelock.desktop branch-kde35/kdebluetooth/kbluelock/kbluelock.desktop
+--- kdebluetooth-1.0-beta3/kdebluetooth/kbluelock/kbluelock.desktop 2007-06-12 12:29:42.000000000 +0200
++++ branch-kde35/kdebluetooth/kbluelock/kbluelock.desktop 2007-06-27 01:47:44.000000000 +0200
+@@ -4,10 +4,27 @@
+ Icon=kdebluetooth
+ Type=Application
+ Name=Kbluelock
++Name[es]=kbluelock
+ Name[xx]=xxKbluelockxx
+ GenericName=Bluetooth Monitor
++GenericName[es]=Monitor de bluetooth
++GenericName[it]=Monitor Bluetooth
++GenericName[ja]=Bluetooth モニタ
++GenericName[nl]=Bluetooth-monitor
++GenericName[pt]=Monitor de Bluetooth
++GenericName[pt_BR]=Monitor de Bluetooth
++GenericName[sv]=Blåtandsövervakare
++GenericName[tr]=Bluetooth İzleyici
+ GenericName[xx]=xxBluetooth Monitorxx
+ Categories=Qt;KDE;System;Monitor;
+ Comment=KDE Bluetooth Monitor
++Comment[es]=Monitor de bluetooth para KDE
++Comment[it]=Monitor Bluetooth di KDE
++Comment[ja]=KDE Bluetooth モニタ
++Comment[nl]=KDE Bluetooth-monitor
++Comment[pt]=Monitor de Bluetooth do KDE
++Comment[pt_BR]=Monitor de Bluetooth do KDE
++Comment[sv]=KDE:s blåtandsövervakare
++Comment[tr]=KDE Bluetooth İzleyici
+ Comment[xx]=xxKDE Bluetooth Monitorxx
+
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluemon/.svn/all-wcprops branch-kde35/kdebluetooth/kbluemon/.svn/all-wcprops
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluemon/.svn/entries branch-kde35/kdebluetooth/kbluemon/.svn/entries
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluemon/.svn/format branch-kde35/kdebluetooth/kbluemon/.svn/format
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluemon/.svn/text-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kbluemon/.svn/text-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluemon/.svn/text-base/kbluemon.desktop.svn-base branch-kde35/kdebluetooth/kbluemon/.svn/text-base/kbluemon.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluemon/.svn/text-base/main.cpp.svn-base branch-kde35/kdebluetooth/kbluemon/.svn/text-base/main.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluemon/.svn/text-base/mondialog.ui.svn-base branch-kde35/kdebluetooth/kbluemon/.svn/text-base/mondialog.ui.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluemon/.svn/text-base/monitor.cpp.svn-base branch-kde35/kdebluetooth/kbluemon/.svn/text-base/monitor.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluemon/.svn/text-base/monitor.h.svn-base branch-kde35/kdebluetooth/kbluemon/.svn/text-base/monitor.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluemon/.svn/text-base/remotedevice.h.svn-base branch-kde35/kdebluetooth/kbluemon/.svn/text-base/remotedevice.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluemon/Makefile.in branch-kde35/kdebluetooth/kbluemon/Makefile.in
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluemon/kbluemon.desktop branch-kde35/kdebluetooth/kbluemon/kbluemon.desktop
+--- kdebluetooth-1.0-beta3/kdebluetooth/kbluemon/kbluemon.desktop 2007-06-12 12:29:42.000000000 +0200
++++ branch-kde35/kdebluetooth/kbluemon/kbluemon.desktop 2007-06-27 01:47:44.000000000 +0200
+@@ -6,8 +6,24 @@
+ Name=kbluemon
+ Name[xx]=xxkbluemonxx
+ GenericName=Bluetooth Monitor
++GenericName[es]=Monitor de bluetooth
++GenericName[it]=Monitor Bluetooth
++GenericName[ja]=Bluetooth モニタ
++GenericName[nl]=Bluetooth-monitor
++GenericName[pt]=Monitor de Bluetooth
++GenericName[pt_BR]=Monitor de Bluetooth
++GenericName[sv]=Blåtandsövervakare
++GenericName[tr]=Bluetooth İzleyici
+ GenericName[xx]=xxBluetooth Monitorxx
+ Categories=Qt;KDE;System;Monitor;
+ Comment=KDE Bluetooth Monitor
++Comment[es]=Monitor de bluetooth para KDE
++Comment[it]=Monitor Bluetooth di KDE
++Comment[ja]=KDE Bluetooth モニタ
++Comment[nl]=KDE Bluetooth-monitor
++Comment[pt]=Monitor de Bluetooth do KDE
++Comment[pt_BR]=Monitor de Bluetooth do KDE
++Comment[sv]=KDE:s blåtandsövervakare
++Comment[tr]=KDE Bluetooth İzleyici
+ Comment[xx]=xxKDE Bluetooth Monitorxx
+
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluemon/main.cpp branch-kde35/kdebluetooth/kbluemon/main.cpp
+--- kdebluetooth-1.0-beta3/kdebluetooth/kbluemon/main.cpp 2007-06-12 12:29:42.000000000 +0200
++++ branch-kde35/kdebluetooth/kbluemon/main.cpp 2007-06-20 00:47:37.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include <klocale.h>
+ #include <kdebug.h>
+ #include <qapplication.h>
++#include <kapp.h>
+
+
+ #include "monitor.h"
+@@ -52,10 +53,12 @@
+ KCmdLineArgs::init( argc, argv, &aboutData );
+ KCmdLineArgs::addCmdLineOptions( options );
+
+- QApplication a(argc, argv);
++// QApplication a(argc, argv);
++ KApplication a(argc, argv);
+
+ Monitor mon;
+
++
+ return mon.exec();
+
+ }
+Binary files kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/.Makefile.am.swp and branch-kde35/kdebluetooth/kbluetooth/.Makefile.am.swp differ
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/.svn/all-wcprops branch-kde35/kdebluetooth/kbluetooth/.svn/all-wcprops
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/.svn/entries branch-kde35/kdebluetooth/kbluetooth/.svn/entries
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/.svn/format branch-kde35/kdebluetooth/kbluetooth/.svn/format
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/.svn/text-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kbluetooth/.svn/text-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/.svn/text-base/adapterconfig.cpp.svn-base branch-kde35/kdebluetooth/kbluetooth/.svn/text-base/adapterconfig.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/.svn/text-base/adapterconfig.h.svn-base branch-kde35/kdebluetooth/kbluetooth/.svn/text-base/adapterconfig.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/.svn/text-base/adapterdialog.ui.svn-base branch-kde35/kdebluetooth/kbluetooth/.svn/text-base/adapterdialog.ui.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/.svn/text-base/application.cpp.svn-base branch-kde35/kdebluetooth/kbluetooth/.svn/text-base/application.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/.svn/text-base/application.h.svn-base branch-kde35/kdebluetooth/kbluetooth/.svn/text-base/application.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/.svn/text-base/authdialog.ui.svn-base branch-kde35/kdebluetooth/kbluetooth/.svn/text-base/authdialog.ui.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/.svn/text-base/authorize.cpp.svn-base branch-kde35/kdebluetooth/kbluetooth/.svn/text-base/authorize.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/.svn/text-base/authorize.h.svn-base branch-kde35/kdebluetooth/kbluetooth/.svn/text-base/authorize.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/.svn/text-base/deviceconfig.cpp.svn-base branch-kde35/kdebluetooth/kbluetooth/.svn/text-base/deviceconfig.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/.svn/text-base/deviceconfig.h.svn-base branch-kde35/kdebluetooth/kbluetooth/.svn/text-base/deviceconfig.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/.svn/text-base/kbluetooth.autostart.desktop.svn-base branch-kde35/kdebluetooth/kbluetooth/.svn/text-base/kbluetooth.autostart.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/.svn/text-base/kbluetooth.desktop.svn-base branch-kde35/kdebluetooth/kbluetooth/.svn/text-base/kbluetooth.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/.svn/text-base/main.cpp.svn-base branch-kde35/kdebluetooth/kbluetooth/.svn/text-base/main.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/.svn/text-base/pindefdialog.ui.svn-base branch-kde35/kdebluetooth/kbluetooth/.svn/text-base/pindefdialog.ui.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/.svn/text-base/pindialog.cpp.svn-base branch-kde35/kdebluetooth/kbluetooth/.svn/text-base/pindialog.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/.svn/text-base/pindialog.h.svn-base branch-kde35/kdebluetooth/kbluetooth/.svn/text-base/pindialog.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/.svn/text-base/trayicon.cpp.svn-base branch-kde35/kdebluetooth/kbluetooth/.svn/text-base/trayicon.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/.svn/text-base/trayicon.h.svn-base branch-kde35/kdebluetooth/kbluetooth/.svn/text-base/trayicon.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/Makefile.in branch-kde35/kdebluetooth/kbluetooth/Makefile.in
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/kbluetooth.autostart.desktop branch-kde35/kdebluetooth/kbluetooth/kbluetooth.autostart.desktop
+--- kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/kbluetooth.autostart.desktop 2007-06-12 12:29:42.000000000 +0200
++++ branch-kde35/kdebluetooth/kbluetooth/kbluetooth.autostart.desktop 2007-06-20 00:47:32.000000000 +0200
+@@ -30,7 +30,7 @@
+ GenericName[sr at Latn]=Bluetooth demon za KDE
+ GenericName[sv]=KDE-Blåtandsdemon
+ GenericName[ta]=KDE புலுடுத் டேமொன்
+-GenericName[tr]=KDE Bluetooth Hizmeti
++GenericName[tr]=KDE Bluetooth Servisi
+ GenericName[xx]=xxKDE Bluetooth Daemonxx
+ Exec=kbluetooth --dontforceshow
+ Icon=kdebluetooth
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/trayicon.cpp branch-kde35/kdebluetooth/kbluetooth/trayicon.cpp
+--- kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/trayicon.cpp 2007-06-12 12:29:42.000000000 +0200
++++ branch-kde35/kdebluetooth/kbluetooth/trayicon.cpp 2007-06-20 00:47:32.000000000 +0200
+@@ -20,6 +20,9 @@
+ iconConnectingBlinkState = false;
+ this->helpMenu = new KHelpMenu(this, KApplication::kApplication()->aboutData());
+ this->app = app;
++
++ manager = app->manager;
++
+ //iconState = IDLE;
+ KConfig *config = KGlobal::config();
+ config->setGroup("UI");
+@@ -129,10 +132,19 @@
+ connect(this, SIGNAL(quitSelected()),
+ this, SLOT(slotQuitSelected()));
+
++ // Connection state
++ adapter = new Adapter(manager->defaultAdapter(), app->conn);
++ connect(adapter, SIGNAL(remoteDeviceConnected(const QString&)), SLOT(slotIconConnected(const QString&)));
++ connect(adapter, SIGNAL(remoteDeviceDisconnected(const QString&)), SLOT(slotIconDisconnected(const QString&)));
++
++ connect(manager, SIGNAL(adapterRemoved(const QString&)), SLOT(slotIconAdapterChanged(const QString&)));
++ connect(manager, SIGNAL(adapterAdded(const QString&)), SLOT(slotIconAdapterChanged(const QString&)));
++
+ }
+
+ TrayIcon::~TrayIcon()
+ {
++ delete adapter;
+ }
+
+ void TrayIcon::setAlwaysShowIcon(bool state) {
+@@ -160,7 +172,6 @@
+ {
+ QString oldText = QToolTip::textFor(this);
+ QString newText = "";
+- manager = app->manager;
+ Adapter::ConnectionList connList;
+ if (alwaysVisible) {
+ if (manager->listAdapters().count() > 0) {
+@@ -179,13 +190,8 @@
+ Manager::AdapterList list = manager->listAdapters();
+ Manager::AdapterList::iterator it;
+ for (it = list.begin(); it != list.end(); ++it) {
+- if (*it == manager->defaultAdapter()) {
+- adapter = new Adapter((*it), app->conn);
+- connList = adapter->listConnections();
+- } else {
+- Adapter a((*it), app->conn);
+- connList = a.listConnections();
+- }
++ Adapter a((*it), app->conn);
++ connList = a.listConnections();
+
+ if (connList.size()) {
+ setPixmap(iconConnected);
+@@ -385,6 +391,30 @@
+ }
+ }
+
++void TrayIcon::slotIconConnected(const QString& /*address*/)
++{
++ if (alwaysVisible)
++ setPixmap(iconConnected);
++
++}
++
++void TrayIcon::slotIconDisconnected(const QString& /*address*/)
++{
++ if (alwaysVisible)
++ setPixmap(iconIdle);
++}
++
++void TrayIcon::slotIconAdapterChanged(const QString& /*address*/)
++{
++ if (!alwaysVisible)
++ return;
++
++ if (!manager->listAdapters().size())
++ setPixmap(iconNoAdapter);
++ else
++ setPixmap(iconIdle);
++}
++
+ #if 0
+ // TODO : make use of KNofityClient
+ void TrayIcon::slotConnectionComplete(int status, QString addr)
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/trayicon.h branch-kde35/kdebluetooth/kbluetooth/trayicon.h
+--- kdebluetooth-1.0-beta3/kdebluetooth/kbluetooth/trayicon.h 2007-06-12 12:29:42.000000000 +0200
++++ branch-kde35/kdebluetooth/kbluetooth/trayicon.h 2007-06-20 00:47:32.000000000 +0200
+@@ -84,6 +84,10 @@
+ void slotAbout() { helpMenu->aboutApplication(); };
+ void slotShowHelp();
+ void updateIcon();
++ void slotIconConnected(const QString&);
++ void slotIconDisconnected(const QString&);
++ void slotIconAdapterChanged(const QString&);
++
+
+ protected:
+ void mousePressEvent(QMouseEvent *e);
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/all-wcprops branch-kde35/kdebluetooth/kbtobexclient/.svn/all-wcprops
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/dir-prop-base branch-kde35/kdebluetooth/kbtobexclient/.svn/dir-prop-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/entries branch-kde35/kdebluetooth/kbtobexclient/.svn/entries
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/format branch-kde35/kdebluetooth/kbtobexclient/.svn/format
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/prop-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/prop-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/prop-base/diroperator.cpp.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/prop-base/diroperator.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/prop-base/diroperator.h.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/prop-base/diroperator.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/prop-base/dndfileview.cpp.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/prop-base/dndfileview.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/prop-base/dndfileview.h.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/prop-base/dndfileview.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/prop-base/fileiconview.cpp.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/prop-base/fileiconview.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/prop-base/fileiconview.h.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/prop-base/fileiconview.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/prop-base/fileview.cpp.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/prop-base/fileview.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/prop-base/fileview.h.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/prop-base/fileview.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/prop-base/kbtobexclient.desktop.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/prop-base/kbtobexclient.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/prop-base/kbtobexclient_sendfile.desktop.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/prop-base/kbtobexclient_sendfile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/prop-base/kbtobexclientui.rc.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/prop-base/kbtobexclientui.rc.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/prop-base/main.cpp.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/prop-base/main.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/prop-base/mainwindow.cpp.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/prop-base/mainwindow.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/prop-base/mainwindow.h.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/prop-base/mainwindow.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/prop-base/sender.cpp.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/prop-base/sender.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/prop-base/sender.h.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/prop-base/sender.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/text-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/text-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/text-base/diroperator.cpp.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/text-base/diroperator.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/text-base/diroperator.h.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/text-base/diroperator.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/text-base/dndfileview.cpp.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/text-base/dndfileview.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/text-base/dndfileview.h.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/text-base/dndfileview.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/text-base/fileiconview.cpp.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/text-base/fileiconview.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/text-base/fileiconview.h.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/text-base/fileiconview.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/text-base/fileview.cpp.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/text-base/fileview.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/text-base/fileview.h.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/text-base/fileview.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/text-base/kbtobexclient.desktop.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/text-base/kbtobexclient.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/text-base/kbtobexclient_sendfile.desktop.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/text-base/kbtobexclient_sendfile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/text-base/kbtobexclientui.rc.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/text-base/kbtobexclientui.rc.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/text-base/main.cpp.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/text-base/main.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/text-base/mainwindow.cpp.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/text-base/mainwindow.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/text-base/mainwindow.h.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/text-base/mainwindow.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/text-base/sender.cpp.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/text-base/sender.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/.svn/text-base/sender.h.svn-base branch-kde35/kdebluetooth/kbtobexclient/.svn/text-base/sender.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/Makefile.in branch-kde35/kdebluetooth/kbtobexclient/Makefile.in
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/kbtobexclient.desktop branch-kde35/kdebluetooth/kbtobexclient/kbtobexclient.desktop
+--- kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/kbtobexclient.desktop 2007-06-12 12:29:42.000000000 +0200
++++ branch-kde35/kdebluetooth/kbtobexclient/kbtobexclient.desktop 2007-06-20 00:47:34.000000000 +0200
+@@ -32,7 +32,7 @@
+ GenericName[sv]=Blåtand OBEX-klient
+ GenericName[tr]=Bluetooth OBEX İstemcisi
+ GenericName[xx]=xxBluetooth OBEX Clientxx
+-Categories=Qt;KDE;Network;FileTransfer
++Categories=Qt;KDE;Network;FileTransfer;
+ Comment=An OBEX Object Push client for the KDEBluetooth Framework
+ Comment[bg]=Клиент OBEX Object Push за KDEBluetooth Framework
+ Comment[bs]=OBEX Object push klijent za KDEBluetooth framework
+@@ -54,5 +54,5 @@
+ Comment[sr at Latn]=Klijent za OBEX guranje objekata za bluetooth okvir KDE-a
+ Comment[sv]=En OBEX-objektsändningsklient för KDE:s Blåtandsramverk
+ Comment[ta]=KDE புலுடுத் சட்டவேலைக்கான OBEX பொருள் கிளைஞ்சன்
+-Comment[tr]=KDEBluetooth Ortamı için OBEX Push istemcisi
++Comment[tr]=KDEBluetooth Ortamı için OBEX Nesneleri Destek istemcisi
+ Comment[xx]=xxAn OBEX Object Push client for the KDEBluetooth Frameworkxx
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/kbtobexclient_sendfile.desktop branch-kde35/kdebluetooth/kbtobexclient/kbtobexclient_sendfile.desktop
+--- kdebluetooth-1.0-beta3/kdebluetooth/kbtobexclient/kbtobexclient_sendfile.desktop 2007-06-12 12:29:42.000000000 +0200
++++ branch-kde35/kdebluetooth/kbtobexclient/kbtobexclient_sendfile.desktop 2007-06-20 00:47:34.000000000 +0200
+@@ -26,7 +26,7 @@
+ Name[sr at Latn]=Pošalji bluetooth-om...
+ Name[sv]=Skicka med Blåtand...
+ Name[ta]=புலுடுத்துடன் அனுப்பு...
+-Name[tr]=Bluetooth'la gönder...
++Name[tr]=Bluetooth ile gönder...
+ Name[xx]=xxSend with Bluetooth...xx
+
+ [Desktop Entry]
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtobexsrv/kbtobexsrv.desktop branch-kde35/kdebluetooth/kbtobexsrv/kbtobexsrv.desktop
+--- kdebluetooth-1.0-beta3/kdebluetooth/kbtobexsrv/kbtobexsrv.desktop 2007-06-12 12:29:42.000000000 +0200
++++ branch-kde35/kdebluetooth/kbtobexsrv/kbtobexsrv.desktop 1970-01-01 01:00:00.000000000 +0100
+@@ -1,11 +0,0 @@
+-[Desktop Entry]
+-Type=Application
+-Name=Bluetooth Obex Server
+-Name[et]=Bluetooth OBEX server
+-Exec=/usr/kde/3.5/lib/kdebluetooth/servers/kbtobexsrv -caption "%c" %i %m %u
+-Categories=Qt;KDE;Network;FileTransfer
+-Comment=
+-Icon=kdebluetooth
+-MimeTypes=
+-Terminal=false
+-Hidden=true
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/.svn/all-wcprops branch-kde35/kdebluetooth/kbtserialchat/.svn/all-wcprops
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/.svn/dir-prop-base branch-kde35/kdebluetooth/kbtserialchat/.svn/dir-prop-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/.svn/entries branch-kde35/kdebluetooth/kbtserialchat/.svn/entries
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/.svn/format branch-kde35/kdebluetooth/kbtserialchat/.svn/format
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/.svn/prop-base/AUTHORS.svn-base branch-kde35/kdebluetooth/kbtserialchat/.svn/prop-base/AUTHORS.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/.svn/prop-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kbtserialchat/.svn/prop-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/.svn/prop-base/README.svn-base branch-kde35/kdebluetooth/kbtserialchat/.svn/prop-base/README.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/.svn/prop-base/kbluetoothd_kbtserialchat.desktop.svn-base branch-kde35/kdebluetooth/kbtserialchat/.svn/prop-base/kbluetoothd_kbtserialchat.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/.svn/prop-base/kbluetoothd_kbtserialchat.sdp.xml.svn-base branch-kde35/kdebluetooth/kbtserialchat/.svn/prop-base/kbluetoothd_kbtserialchat.sdp.xml.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/.svn/prop-base/kbtserialchat.cpp.svn-base branch-kde35/kdebluetooth/kbtserialchat/.svn/prop-base/kbtserialchat.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/.svn/prop-base/kbtserialchat.desktop.svn-base branch-kde35/kdebluetooth/kbtserialchat/.svn/prop-base/kbtserialchat.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/.svn/prop-base/kbtserialchat.h.svn-base branch-kde35/kdebluetooth/kbtserialchat/.svn/prop-base/kbtserialchat.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/.svn/prop-base/main.cpp.svn-base branch-kde35/kdebluetooth/kbtserialchat/.svn/prop-base/main.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/.svn/prop-base/maindialogbase.ui.svn-base branch-kde35/kdebluetooth/kbtserialchat/.svn/prop-base/maindialogbase.ui.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/.svn/text-base/AUTHORS.svn-base branch-kde35/kdebluetooth/kbtserialchat/.svn/text-base/AUTHORS.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/.svn/text-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kbtserialchat/.svn/text-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/.svn/text-base/README.svn-base branch-kde35/kdebluetooth/kbtserialchat/.svn/text-base/README.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/.svn/text-base/kbluetoothd_kbtserialchat.desktop.svn-base branch-kde35/kdebluetooth/kbtserialchat/.svn/text-base/kbluetoothd_kbtserialchat.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/.svn/text-base/kbluetoothd_kbtserialchat.sdp.xml.svn-base branch-kde35/kdebluetooth/kbtserialchat/.svn/text-base/kbluetoothd_kbtserialchat.sdp.xml.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/.svn/text-base/kbtserialchat.cpp.svn-base branch-kde35/kdebluetooth/kbtserialchat/.svn/text-base/kbtserialchat.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/.svn/text-base/kbtserialchat.desktop.svn-base branch-kde35/kdebluetooth/kbtserialchat/.svn/text-base/kbtserialchat.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/.svn/text-base/kbtserialchat.h.svn-base branch-kde35/kdebluetooth/kbtserialchat/.svn/text-base/kbtserialchat.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/.svn/text-base/main.cpp.svn-base branch-kde35/kdebluetooth/kbtserialchat/.svn/text-base/main.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/.svn/text-base/maindialogbase.ui.svn-base branch-kde35/kdebluetooth/kbtserialchat/.svn/text-base/maindialogbase.ui.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/Makefile.in branch-kde35/kdebluetooth/kbtserialchat/Makefile.in
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/kbluetoothd_kbtserialchat.desktop branch-kde35/kdebluetooth/kbtserialchat/kbluetoothd_kbtserialchat.desktop
+--- kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/kbluetoothd_kbtserialchat.desktop 2007-06-12 12:29:42.000000000 +0200
++++ branch-kde35/kdebluetooth/kbtserialchat/kbluetoothd_kbtserialchat.desktop 2007-06-20 00:47:32.000000000 +0200
+@@ -25,7 +25,7 @@
+ Name[pa]=ਸੀਰੀਅਲ ਚੈਟ
+ Name[pl]=Rozmowy przez port szeregowy
+ Name[sv]=Serialchat
+-Name[tr]=SeriSohbet
++Name[tr]=Seriport İletişimi
+ Name[xx]=xxSerialChatxx
+ Comment=Simple application to talk to a modem with AT-commands or actually chat with other people.
+ Comment[ar]=برنامج بسيط لمكالمة المرمز الهاتفي modem مستخدما اوامر AT او للثرثرة مع اشخاص آخرين.
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/kbtserialchat.desktop branch-kde35/kdebluetooth/kbtserialchat/kbtserialchat.desktop
+--- kdebluetooth-1.0-beta3/kdebluetooth/kbtserialchat/kbtserialchat.desktop 2007-06-12 12:29:42.000000000 +0200
++++ branch-kde35/kdebluetooth/kbtserialchat/kbtserialchat.desktop 2007-06-20 00:47:32.000000000 +0200
+@@ -6,7 +6,6 @@
+ MimeType=bluetooth/serial-port-profile
+ Name=kbtserialchat
+ Name[sv]=Kbtserialchat
+-Name[tr]=KbtChat
+ Name[xx]=xxkbtserialchatxx
+ GenericName=Bluetooth Chat
+ GenericName[ar]=ثرثرة Bluetooth
+@@ -31,7 +30,7 @@
+ GenericName[sv]=Blåtandchatt
+ GenericName[tr]=Bluetooth Sohbeti
+ GenericName[xx]=xxBluetooth Chatxx
+-Categories=Qt;KDE;Network;InstantMessaging
++Categories=Qt;KDE;Network;InstantMessaging;
+ Comment=Small serial terminal application for Bluetooth
+ Comment[bg]=Програма за сериен терминал за Bluetooth
+ Comment[bs]=Mala aplikacija serijski terminal za Bluetooth
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kcm_btpaired/.svn/all-wcprops branch-kde35/kdebluetooth/kcm_btpaired/.svn/all-wcprops
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kcm_btpaired/.svn/entries branch-kde35/kdebluetooth/kcm_btpaired/.svn/entries
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kcm_btpaired/.svn/format branch-kde35/kdebluetooth/kcm_btpaired/.svn/format
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kcm_btpaired/.svn/text-base/AUTHORS.svn-base branch-kde35/kdebluetooth/kcm_btpaired/.svn/text-base/AUTHORS.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kcm_btpaired/.svn/text-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kcm_btpaired/.svn/text-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kcm_btpaired/.svn/text-base/exportdialog.ui.svn-base branch-kde35/kdebluetooth/kcm_btpaired/.svn/text-base/exportdialog.ui.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kcm_btpaired/.svn/text-base/kcm_btpaired.cpp.svn-base branch-kde35/kdebluetooth/kcm_btpaired/.svn/text-base/kcm_btpaired.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kcm_btpaired/.svn/text-base/kcm_btpaired.desktop.svn-base branch-kde35/kdebluetooth/kcm_btpaired/.svn/text-base/kcm_btpaired.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kcm_btpaired/.svn/text-base/kcm_btpaired.h.svn-base branch-kde35/kdebluetooth/kcm_btpaired/.svn/text-base/kcm_btpaired.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kcm_btpaired/.svn/text-base/pairedtab.cpp.svn-base branch-kde35/kdebluetooth/kcm_btpaired/.svn/text-base/pairedtab.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kcm_btpaired/.svn/text-base/pairedtab.h.svn-base branch-kde35/kdebluetooth/kcm_btpaired/.svn/text-base/pairedtab.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kcm_btpaired/.svn/text-base/pairedtabbase.ui.svn-base branch-kde35/kdebluetooth/kcm_btpaired/.svn/text-base/pairedtabbase.ui.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kcm_btpaired/Makefile.in branch-kde35/kdebluetooth/kcm_btpaired/Makefile.in
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kcm_btpaired/kcm_btpaired.desktop branch-kde35/kdebluetooth/kcm_btpaired/kcm_btpaired.desktop
+--- kdebluetooth-1.0-beta3/kdebluetooth/kcm_btpaired/kcm_btpaired.desktop 2007-06-12 12:29:42.000000000 +0200
++++ branch-kde35/kdebluetooth/kcm_btpaired/kcm_btpaired.desktop 2007-06-27 01:47:44.000000000 +0200
+@@ -30,6 +30,14 @@
+ Keywords[ta]=புலுடுத்
+ Keywords[xx]=xxBluetoothxx
+ GenericName=Paired Bluetooth Devices
++GenericName[es]=Dispositivos bluetooth emparejados
++GenericName[it]=Dispositivi Bluetooth accoppiati
++GenericName[ja]=ペアリング済みの Bluetooth デバイス
++GenericName[nl]=Gepaarde Bluetooth-diensten
++GenericName[pt]=Dispositivos Bluetooth Emparelhados
++GenericName[pt_BR]=Dispositivos Bluetooth Emparelhados
++GenericName[sv]=Ihopparade Blåtandsenheter
++GenericName[tr]=Eşlenmiş Bluetooth Aygıtları
+ GenericName[xx]=xxPaired Bluetooth Devicesxx
+ Name=Paired Bluetooth Devices
+ Name[ar]=اجهزة Bluetooth المتزاوجة
+@@ -43,7 +51,7 @@
+ Name[fr]=Périphériques Bluetooth couplés
+ Name[gl]=Dispositivos Bluetooth Emparellados
+ Name[it]=Dispositivi Bluetooth accoppiati
+-Name[ja]=ペアリング済みの Bluethooth デバイス
++Name[ja]=ペアリング済みの Bluetooth デバイス
+ Name[nl]=Gepaarde Bluetooth-diensten
+ Name[pl]=Sparowane urządzenia Bluetooth
+ Name[pt]=Dispositivos Bluetooth Emparelhados
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kcm_btpaired/pairedtab.cpp branch-kde35/kdebluetooth/kcm_btpaired/pairedtab.cpp
+--- kdebluetooth-1.0-beta3/kdebluetooth/kcm_btpaired/pairedtab.cpp 2007-06-12 12:29:42.000000000 +0200
++++ branch-kde35/kdebluetooth/kcm_btpaired/pairedtab.cpp 2007-06-27 01:47:44.000000000 +0200
+@@ -74,10 +74,13 @@
+ updateGUI();
+
+ removePairingButton->setEnabled(false);
++ removeTrustButton->setEnabled(false);
+ exportButton->setEnabled(false);
+
+ connect(removePairingButton, SIGNAL(clicked()),
+ this, SLOT(slotRemovePairing()));
++ connect(removeTrustButton, SIGNAL(clicked()),
++ this, SLOT(slotRemoveTrust()));
+ connect(exportButton, SIGNAL(clicked()),
+ this, SLOT(slotExportBonding()));
+ connect(pairingListView, SIGNAL(selectionChanged()),
+@@ -104,6 +107,7 @@
+ PairedTab::~PairedTab()
+ {
+ delete filter;
++ delete service;
+ }
+
+ DBusHandlerResult PairedTab::filterFunction(DBusConnection * /*conn*/, DBusMessage *msg, void * /*data*/)
+@@ -180,8 +184,11 @@
+
+ void PairedTab::updateGUI()
+ {
++
++
+ kdDebug() << __func__ << "() >>>>>>>" << endl;
+
++
+ vector<PairingInfo>::iterator pairIt, remotIt;
+ QString prevLocalAddr = QString::null;
+ pairingListView->clear();
+@@ -214,15 +221,42 @@
+ remoteAddrItem->setPixmap(0, KGlobal::iconLoader()->loadIcon(
+ "pda_blue", KIcon::Small, 16));
+ remoteAddrItem->setSelectable(true);
++
++ service = new Service(conn, "/org/bluez/service_input");
++ if (service->isTrusted(pairIt->remoteAddr)) {
++ truststring = i18n("- trusted input device");
++ remoteAddrItem->setText(2, "input");
++ } else {
++ service = new Service(conn, "/org/bluez/service_audio");
++ if (service->isTrusted(pairIt->remoteAddr)) {
++ truststring = i18n("- trusted audio device");
++ remoteAddrItem->setText(2, "audio");
++ } else {
++ service = new Service(conn, "/org/bluez/service_network");
++ if (service->isTrusted(pairIt->remoteAddr)) {
++ truststring = i18n("- trusted network device");
++ remoteAddrItem->setText(2, "network");
++ } else {
++ service = new Service(conn, "/org/bluez/service_serial");
++ if (service->isTrusted(pairIt->remoteAddr)) {
++ truststring = i18n("- trusted serial device");
++ remoteAddrItem->setText(2, "serial");
++ } else
++
++ truststring = i18n("");
++ }
++ }
++ }
++
++
+ if (pairIt->remoteName == QString::null) {
+ remoteName = QString(pairIt->remoteAddr);
+ } else {
+- remoteName = QString("%1 (%2)").arg(pairIt->remoteName).arg(pairIt->remoteAddr);
++ remoteName = i18n("%1 (%2) %3").arg(pairIt->remoteName).arg(pairIt->remoteAddr).arg(truststring);
+ }
+ remoteAddrItem->setText(0, remoteName);
+ remoteAddrItem->setText(1, pairIt->remoteAddr);
+-
+-
++
+
+
+ if (pairIt->lastSeenTime != QString::null) {
+@@ -279,6 +313,31 @@
+
+ }
+
++void PairedTab::slotRemoveTrust() {
++
++ kdDebug() << "slotRemoveTrust" << endl;
++
++ for (QListViewItem* i=pairingListView->firstChild(); i != NULL; i = i->nextSibling()) {
++ for (QListViewItem* j=i->firstChild(); j != NULL; j = j->nextSibling()) {
++ if (j->isSelected()) {
++ kdDebug() << "Going to remove Trust: " << j->text(1) << endl;
++
++ if (!(j->text(2) == "")) {
++ QString path = "/org/bluez/service_" + j->text(2);
++ service = new Service(conn, path);
++ service->removeTrust(j->text(1));
++ slotListChanged();
++ }
++
++
++ return;
++ }
++ }
++ }
++
++
++}
++
+ void PairedTab::slotSelectionChanged()
+ {
+ kdDebug() << __func__ << endl;
+@@ -287,6 +346,11 @@
+
+ if (j->isSelected()) {
+ removePairingButton->setEnabled(true);
++ if (!(j->text(2) == ""))
++ removeTrustButton->setEnabled(true);
++ else
++ removeTrustButton->setEnabled(false);
++
+ // TODO: Dialog is not ready.
+ // exportButton->setEnabled(true);
+ return;
+@@ -294,6 +358,7 @@
+ }
+ }
+ removePairingButton->setEnabled(false);
++ removeTrustButton->setEnabled(false);
+ exportButton->setEnabled(false);
+
+ }
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kcm_btpaired/pairedtab.h branch-kde35/kdebluetooth/kcm_btpaired/pairedtab.h
+--- kdebluetooth-1.0-beta3/kdebluetooth/kcm_btpaired/pairedtab.h 2007-06-12 12:29:42.000000000 +0200
++++ branch-kde35/kdebluetooth/kcm_btpaired/pairedtab.h 2007-06-20 00:47:33.000000000 +0200
+@@ -41,6 +41,7 @@
+ #include <libkbluetooth/dbusfilter.h>
+ #include <libkbluetooth/adapter.h>
+ #include <libkbluetooth/manager.h>
++#include <libkbluetooth/service.h>
+
+ class DCOPClient;
+ class KDirWatch;
+@@ -84,10 +85,13 @@
+ static PairedTab *_ctx;
+
+ ExportDialog *exportBondingDialog;
++ Service* service;
++ QString truststring;
+
+ private slots:
+ void slotListChanged();
+ void slotRemovePairing();
++ void slotRemoveTrust();
+ void slotSelectionChanged();
+ void slotExportBonding();
+
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kcm_btpaired/pairedtabbase.ui branch-kde35/kdebluetooth/kcm_btpaired/pairedtabbase.ui
+--- kdebluetooth-1.0-beta3/kdebluetooth/kcm_btpaired/pairedtabbase.ui 2007-06-12 12:29:42.000000000 +0200
++++ branch-kde35/kdebluetooth/kcm_btpaired/pairedtabbase.ui 2007-06-20 00:47:33.000000000 +0200
+@@ -8,8 +8,8 @@
+ <rect>
+ <x>0</x>
+ <y>0</y>
+- <width>512</width>
+- <height>352</height>
++ <width>735</width>
++ <height>447</height>
+ </rect>
+ </property>
+ <property name="caption">
+@@ -60,7 +60,7 @@
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+- <cstring>layout2</cstring>
++ <cstring>layout3</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+@@ -73,6 +73,20 @@
+ <property name="text">
+ <string>&Remove Pairing...</string>
+ </property>
++ <property name="accel">
++ <string>Alt+R</string>
++ </property>
++ </widget>
++ <widget class="QPushButton">
++ <property name="name">
++ <cstring>removeTrustButton</cstring>
++ </property>
++ <property name="text">
++ <string>Remove Trust...</string>
++ </property>
++ <property name="accel">
++ <string></string>
++ </property>
+ </widget>
+ <spacer>
+ <property name="name">
+@@ -86,7 +100,7 @@
+ </property>
+ <property name="sizeHint">
+ <size>
+- <width>130</width>
++ <width>518</width>
+ <height>20</height>
+ </size>
+ </property>
+@@ -149,6 +163,6 @@
+ </widget>
+ <layoutdefaults spacing="6" margin="11"/>
+ <includehints>
+-
++ <includehint>klistview.h</includehint>
+ </includehints>
+ </UI>
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/.svn/all-wcprops branch-kde35/kdebluetooth/kdebluetooth-common/.svn/all-wcprops
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/.svn/dir-prop-base branch-kde35/kdebluetooth/kdebluetooth-common/.svn/dir-prop-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/.svn/entries branch-kde35/kdebluetooth/kdebluetooth-common/.svn/entries
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/.svn/format branch-kde35/kdebluetooth/kdebluetooth-common/.svn/format
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/.svn/prop-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/.svn/prop-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/.svn/prop-base/README.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/.svn/prop-base/README.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/.svn/prop-base/kde-settings-network-bluetooth.directory.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/.svn/prop-base/kde-settings-network-bluetooth.directory.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/.svn/prop-base/sdpservicehandler.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/.svn/prop-base/sdpservicehandler.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/.svn/text-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/.svn/text-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/.svn/text-base/README.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/.svn/text-base/README.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/.svn/text-base/kde-settings-network-bluetooth.directory.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/.svn/text-base/kde-settings-network-bluetooth.directory.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/.svn/text-base/sdpservicehandler.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/.svn/text-base/sdpservicehandler.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/Makefile.in branch-kde35/kdebluetooth/kdebluetooth-common/Makefile.in
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/dunhandler/.svn/all-wcprops branch-kde35/kdebluetooth/kdebluetooth-common/dunhandler/.svn/all-wcprops
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/dunhandler/.svn/dir-prop-base branch-kde35/kdebluetooth/kdebluetooth-common/dunhandler/.svn/dir-prop-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/dunhandler/.svn/entries branch-kde35/kdebluetooth/kdebluetooth-common/dunhandler/.svn/entries
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/dunhandler/.svn/format branch-kde35/kdebluetooth/kdebluetooth-common/dunhandler/.svn/format
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/dunhandler/.svn/prop-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/dunhandler/.svn/prop-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/dunhandler/.svn/prop-base/configure.in.in.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/dunhandler/.svn/prop-base/configure.in.in.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/dunhandler/.svn/prop-base/dunhandler.desktop.in.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/dunhandler/.svn/prop-base/dunhandler.desktop.in.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/dunhandler/.svn/prop-base/dunhandler.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/dunhandler/.svn/prop-base/dunhandler.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/dunhandler/.svn/text-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/dunhandler/.svn/text-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/dunhandler/.svn/text-base/configure.in.in.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/dunhandler/.svn/text-base/configure.in.in.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/dunhandler/.svn/text-base/dunhandler.desktop.in.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/dunhandler/.svn/text-base/dunhandler.desktop.in.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/dunhandler/.svn/text-base/dunhandler.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/dunhandler/.svn/text-base/dunhandler.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/dunhandler/Makefile.in branch-kde35/kdebluetooth/kdebluetooth-common/dunhandler/Makefile.in
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/dunhandler/dunhandler.desktop branch-kde35/kdebluetooth/kdebluetooth-common/dunhandler/dunhandler.desktop
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/dunhandler/dunhandler.desktop.in branch-kde35/kdebluetooth/kdebluetooth-common/dunhandler/dunhandler.desktop.in
+--- kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/dunhandler/dunhandler.desktop.in 2007-06-12 12:29:42.000000000 +0200
++++ branch-kde35/kdebluetooth/kdebluetooth-common/dunhandler/dunhandler.desktop.in 2007-06-27 01:47:44.000000000 +0200
+@@ -6,5 +6,5 @@
+ Type=Application
+ Comment=An OBEX Object Push client for the KdeBluetooth Framework
+ Comment[et]=OBEX objekti saatmise klient KdeBluetooth raamistikule
+-MimeType=bluetooth/dun-profile
++MimeType=bluetooth/dun-profile;
+ Hidden=true
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/faxhandler/.svn/all-wcprops branch-kde35/kdebluetooth/kdebluetooth-common/faxhandler/.svn/all-wcprops
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/faxhandler/.svn/dir-prop-base branch-kde35/kdebluetooth/kdebluetooth-common/faxhandler/.svn/dir-prop-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/faxhandler/.svn/entries branch-kde35/kdebluetooth/kdebluetooth-common/faxhandler/.svn/entries
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/faxhandler/.svn/format branch-kde35/kdebluetooth/kdebluetooth-common/faxhandler/.svn/format
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/faxhandler/.svn/prop-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/faxhandler/.svn/prop-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/faxhandler/.svn/prop-base/configure.in.in.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/faxhandler/.svn/prop-base/configure.in.in.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/faxhandler/.svn/prop-base/faxhandler.desktop.in.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/faxhandler/.svn/prop-base/faxhandler.desktop.in.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/faxhandler/.svn/prop-base/faxhandler.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/faxhandler/.svn/prop-base/faxhandler.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/faxhandler/.svn/prop-base/kbtfax.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/faxhandler/.svn/prop-base/kbtfax.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/faxhandler/.svn/text-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/faxhandler/.svn/text-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/faxhandler/.svn/text-base/configure.in.in.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/faxhandler/.svn/text-base/configure.in.in.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/faxhandler/.svn/text-base/faxhandler.desktop.in.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/faxhandler/.svn/text-base/faxhandler.desktop.in.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/faxhandler/.svn/text-base/faxhandler.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/faxhandler/.svn/text-base/faxhandler.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/faxhandler/.svn/text-base/kbtfax.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/faxhandler/.svn/text-base/kbtfax.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/faxhandler/Makefile.in branch-kde35/kdebluetooth/kdebluetooth-common/faxhandler/Makefile.in
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/faxhandler/faxhandler.desktop branch-kde35/kdebluetooth/kdebluetooth-common/faxhandler/faxhandler.desktop
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/faxhandler/faxhandler.desktop.in branch-kde35/kdebluetooth/kdebluetooth-common/faxhandler/faxhandler.desktop.in
+--- kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/faxhandler/faxhandler.desktop.in 2007-06-12 12:29:42.000000000 +0200
++++ branch-kde35/kdebluetooth/kdebluetooth-common/faxhandler/faxhandler.desktop.in 2007-06-27 01:47:44.000000000 +0200
+@@ -5,5 +5,5 @@
+ Icon=network_local
+ Type=Application
+ Comment=A handler for the fax profile
+-MimeType=bluetooth/fax-profile
++MimeType=bluetooth/fax-profile;
+ Hidden=true
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/icons/.svn/all-wcprops branch-kde35/kdebluetooth/kdebluetooth-common/icons/.svn/all-wcprops
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/icons/.svn/dir-prop-base branch-kde35/kdebluetooth/kdebluetooth-common/icons/.svn/dir-prop-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/icons/.svn/entries branch-kde35/kdebluetooth/kdebluetooth-common/icons/.svn/entries
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/icons/.svn/format branch-kde35/kdebluetooth/kdebluetooth-common/icons/.svn/format
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/icons/.svn/prop-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/icons/.svn/prop-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/icons/.svn/prop-base/hi128-app-kdebluetooth.png.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/icons/.svn/prop-base/hi128-app-kdebluetooth.png.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/icons/.svn/prop-base/hi16-app-kdebluetooth.png.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/icons/.svn/prop-base/hi16-app-kdebluetooth.png.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/icons/.svn/prop-base/hi22-app-kdebluetooth.png.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/icons/.svn/prop-base/hi22-app-kdebluetooth.png.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/icons/.svn/prop-base/hi32-app-kdebluetooth.png.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/icons/.svn/prop-base/hi32-app-kdebluetooth.png.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/icons/.svn/prop-base/hi48-app-kdebluetooth.png.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/icons/.svn/prop-base/hi48-app-kdebluetooth.png.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/icons/.svn/prop-base/hi64-app-kdebluetooth.png.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/icons/.svn/prop-base/hi64-app-kdebluetooth.png.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/icons/.svn/prop-base/hisc-app-kdebluetooth.svgz.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/icons/.svn/prop-base/hisc-app-kdebluetooth.svgz.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/icons/.svn/text-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/icons/.svn/text-base/Makefile.am.svn-base
+Binary files kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/icons/.svn/text-base/hi128-app-kdebluetooth.png.svn-base and branch-kde35/kdebluetooth/kdebluetooth-common/icons/.svn/text-base/hi128-app-kdebluetooth.png.svn-base differ
+Binary files kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/icons/.svn/text-base/hi16-app-kdebluetooth.png.svn-base and branch-kde35/kdebluetooth/kdebluetooth-common/icons/.svn/text-base/hi16-app-kdebluetooth.png.svn-base differ
+Binary files kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/icons/.svn/text-base/hi22-app-kdebluetooth.png.svn-base and branch-kde35/kdebluetooth/kdebluetooth-common/icons/.svn/text-base/hi22-app-kdebluetooth.png.svn-base differ
+Binary files kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/icons/.svn/text-base/hi32-app-kdebluetooth.png.svn-base and branch-kde35/kdebluetooth/kdebluetooth-common/icons/.svn/text-base/hi32-app-kdebluetooth.png.svn-base differ
+Binary files kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/icons/.svn/text-base/hi48-app-kdebluetooth.png.svn-base and branch-kde35/kdebluetooth/kdebluetooth-common/icons/.svn/text-base/hi48-app-kdebluetooth.png.svn-base differ
+Binary files kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/icons/.svn/text-base/hi64-app-kdebluetooth.png.svn-base and branch-kde35/kdebluetooth/kdebluetooth-common/icons/.svn/text-base/hi64-app-kdebluetooth.png.svn-base differ
+Binary files kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/icons/.svn/text-base/hisc-app-kdebluetooth.svgz.svn-base and branch-kde35/kdebluetooth/kdebluetooth-common/icons/.svn/text-base/hisc-app-kdebluetooth.svgz.svn-base differ
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/icons/Makefile.in branch-kde35/kdebluetooth/kdebluetooth-common/icons/Makefile.in
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/all-wcprops branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/all-wcprops
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/dir-prop-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/dir-prop-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/entries branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/entries
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/format branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/format
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/av-device-class.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/av-device-class.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/computer-device-class.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/computer-device-class.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/dun-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/dun-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/fax-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/fax-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/handsfree-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/handsfree-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/headset-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/headset-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/imaging-device-class.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/imaging-device-class.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/lan-device-class.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/lan-device-class.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/misc-device-class.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/misc-device-class.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/obex-ftp-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/obex-ftp-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/obexobjectpush-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/obexobjectpush-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/peripheral-device-class.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/peripheral-device-class.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/phone-device-class.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/phone-device-class.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/serial-port-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/serial-port-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/synchronization-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/synchronization-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/unknown-device-class.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/unknown-device-class.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/unknown-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/prop-base/unknown-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/av-device-class.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/av-device-class.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/computer-device-class.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/computer-device-class.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/dun-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/dun-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/fax-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/fax-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/handsfree-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/handsfree-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/headset-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/headset-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/imaging-device-class.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/imaging-device-class.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/lan-device-class.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/lan-device-class.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/misc-device-class.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/misc-device-class.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/obex-ftp-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/obex-ftp-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/obexobjectpush-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/obexobjectpush-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/peripheral-device-class.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/peripheral-device-class.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/phone-device-class.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/phone-device-class.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/serial-port-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/serial-port-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/synchronization-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/synchronization-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/unknown-device-class.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/unknown-device-class.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/unknown-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/.svn/text-base/unknown-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/mimetypes/Makefile.in branch-kde35/kdebluetooth/kdebluetooth-common/mimetypes/Makefile.in
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/all-wcprops branch-kde35/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/all-wcprops
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/dir-prop-base branch-kde35/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/dir-prop-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/entries branch-kde35/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/entries
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/format branch-kde35/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/format
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/prop-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/prop-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/prop-base/sdpmime-dun-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/prop-base/sdpmime-dun-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/prop-base/sdpmime-fax-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/prop-base/sdpmime-fax-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/prop-base/sdpmime-handsfree-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/prop-base/sdpmime-handsfree-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/prop-base/sdpmime-headset-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/prop-base/sdpmime-headset-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/prop-base/sdpmime-obex-client-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/prop-base/sdpmime-obex-client-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/prop-base/sdpmime-obex-ftp-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/prop-base/sdpmime-obex-ftp-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/prop-base/sdpmime-serial-port-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/prop-base/sdpmime-serial-port-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/prop-base/sdpmime-synchronization-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/prop-base/sdpmime-synchronization-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/text-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/text-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/text-base/sdpmime-dun-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/text-base/sdpmime-dun-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/text-base/sdpmime-fax-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/text-base/sdpmime-fax-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/text-base/sdpmime-handsfree-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/text-base/sdpmime-handsfree-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/text-base/sdpmime-headset-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/text-base/sdpmime-headset-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/text-base/sdpmime-obex-client-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/text-base/sdpmime-obex-client-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/text-base/sdpmime-obex-ftp-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/text-base/sdpmime-obex-ftp-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/text-base/sdpmime-serial-port-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/text-base/sdpmime-serial-port-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/text-base/sdpmime-synchronization-profile.desktop.svn-base branch-kde35/kdebluetooth/kdebluetooth-common/sdpmimemappings/.svn/text-base/sdpmime-synchronization-profile.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/sdpmimemappings/Makefile.in branch-kde35/kdebluetooth/kdebluetooth-common/sdpmimemappings/Makefile.in
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kdebluetooth-common/sdpservicehandler.desktop branch-kde35/kdebluetooth/kdebluetooth-common/sdpservicehandler.desktop
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kinputwizard/.svn/all-wcprops branch-kde35/kdebluetooth/kinputwizard/.svn/all-wcprops
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kinputwizard/.svn/entries branch-kde35/kdebluetooth/kinputwizard/.svn/entries
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kinputwizard/.svn/format branch-kde35/kdebluetooth/kinputwizard/.svn/format
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kinputwizard/.svn/text-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kinputwizard/.svn/text-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kinputwizard/.svn/text-base/inputdialog.ui.svn-base branch-kde35/kdebluetooth/kinputwizard/.svn/text-base/inputdialog.ui.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kinputwizard/.svn/text-base/inputdialog_ext.ui.svn-base branch-kde35/kdebluetooth/kinputwizard/.svn/text-base/inputdialog_ext.ui.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kinputwizard/.svn/text-base/inputwizard.cpp.svn-base branch-kde35/kdebluetooth/kinputwizard/.svn/text-base/inputwizard.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kinputwizard/.svn/text-base/inputwizard.h.svn-base branch-kde35/kdebluetooth/kinputwizard/.svn/text-base/inputwizard.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kinputwizard/.svn/text-base/kinputwizard.desktop.svn-base branch-kde35/kdebluetooth/kinputwizard/.svn/text-base/kinputwizard.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kinputwizard/.svn/text-base/main.cpp.svn-base branch-kde35/kdebluetooth/kinputwizard/.svn/text-base/main.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kinputwizard/Makefile.in branch-kde35/kdebluetooth/kinputwizard/Makefile.in
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kinputwizard/inputwizard.cpp branch-kde35/kdebluetooth/kinputwizard/inputwizard.cpp
+--- kdebluetooth-1.0-beta3/kdebluetooth/kinputwizard/inputwizard.cpp 2007-06-12 12:29:42.000000000 +0200
++++ branch-kde35/kdebluetooth/kinputwizard/inputwizard.cpp 2007-06-27 01:47:44.000000000 +0200
+@@ -56,8 +56,9 @@
+ kdDebug() << newdev->getAddress() << endl;
+ kdDebug() << adapter->getPath() << endl;
+ inputdlg->deviceBox->insertItem(adapter->getRemoteName(newdev->getAddress()));
++ kdDebug() << adapter->getRemoteName(newdev->getAddress()) << endl;
+ }
+-
++
+
+ connect(inputdlg->addButton, SIGNAL(toggled(bool)), inputdlg, SLOT(showExtension(bool)));
+ connect(inputdlg->addButton, SIGNAL(clicked()), SLOT(configNew()));
+@@ -69,6 +70,9 @@
+ connect(inputdlg->okButton, SIGNAL(clicked()), this, SLOT(closeDialog()));
+ connect(inputdlg->deleteButton, SIGNAL(clicked()), this, SLOT(deleteDev()));
+
++ Service service(conn, "/org/bluez/service_input");
++ kdDebug() << service.isTrusted("00:50:F2:E9:E9:49") << endl;
++// kdDebug() << service.listUsers() << endl;
+
+
+ }
+@@ -89,17 +93,23 @@
+ return;
+ }
+
++ busid = manager->activateService("input");
++ InputDevice *tmp;
+ QListBoxItem *sel = inputdlg->deviceBox->selectedItem();
+ QString selName = sel->text();
+ inputList = inman->listDevices();
+ for (it = inputList.begin();it != inputList.end(); ++it) {
+- InputDevice *tmp = new InputDevice(conn,busid,*it);
++ tmp = new InputDevice(conn,busid,*it);
+ QString name = adapter->getRemoteName(tmp->getAddress());
+- kdDebug() << "Devicename" << name << endl;
++ kdDebug() << "Devicename: " << name << endl;
++ kdDebug() << "Selname: " << selName << endl;
++ kdDebug() << "IT: " << *it << endl;
++
+ if (name == selName) {
+- tmp->connectBlock();
+- connectMsg(tmp->isConnected(),name);
+- return;
++// tmp->connectBlock();
++ tmp->connect();
++// connectMsg(tmp->isConnected(),name);
++// return;
+ } else
+ continue;
+ }
+@@ -286,22 +296,25 @@
+ adapter->createBondingBlock(SelectAddr);
+ }
+ // connect(inman, SIGNAL(deviceCreated(const QString&)), this, SLOT(setupNewDevCallback(const QString&)));
+-
+ QString remoteConn = inman->createDeviceBlock(SelectAddr);
++
++ kdDebug() << "remoteConn: _____________" << remoteConn << endl;
+
+- if (remoteConn == "/org/bluez/input") {
++ if (remoteConn == "") {
+
+ QMessageBox::information(inputdlg, i18n("Creating Input Device failed"), i18n("Failed to create the input device for %1!").arg(adapter->getRemoteName(SelectAddr)), QMessageBox::Ok|QMessageBox::Default, QMessageBox::NoButton, QMessageBox::NoButton);
++ return;
+
+- }
++ } else {
+
+- inputdlg->deviceBox->insertItem(confSel->text(0));
+- inputdlg_ext->newdevList->takeItem(confSel);
+- inputdlg->addButton->setOn(0);
++ inputdlg->deviceBox->insertItem(confSel->text(0));
++ inputdlg_ext->newdevList->takeItem(confSel);
++ inputdlg->addButton->setOn(0);
+
+- configNew();
++ configNew();
+
+- setupNewDevCallback(remoteConn);
++ setupNewDevCallback(remoteConn);
++ }
+
+ }
+
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kinputwizard/kinputwizard.desktop branch-kde35/kdebluetooth/kinputwizard/kinputwizard.desktop
+--- kdebluetooth-1.0-beta3/kdebluetooth/kinputwizard/kinputwizard.desktop 2007-06-12 12:29:42.000000000 +0200
++++ branch-kde35/kdebluetooth/kinputwizard/kinputwizard.desktop 2007-06-27 01:47:44.000000000 +0200
+@@ -6,8 +6,24 @@
+ Name=Kinputwizard
+ Name[xx]=xxKinputwizardxx
+ GenericName=Bluetooth Wizard
++GenericName[es]=Asistente de bluetooth
++GenericName[it]=Assistente per Bluetooth
++GenericName[ja]=Bluetooth ウィザード
++GenericName[nl]=Bluetooth-assistent
++GenericName[pt]=Assistente de Bluetooth
++GenericName[pt_BR]=Assistente de Bluetooth
++GenericName[sv]=Blåtandsguide
++GenericName[tr]=Bluetooth Sihirbazı
+ GenericName[xx]=xxBluetooth Wizardxx
+ Categories=Qt;KDE;System;Monitor;
+ Comment=KDE Bluetooth Wizard
++Comment[es]=Asistente de bluetooth para KDE
++Comment[it]=Assistente per Bluetooth di KDE
++Comment[ja]=KDE Bluetooth ウィザード
++Comment[nl]=KDE Bluetooth-assistent
++Comment[pt]=Assistente de Bluetooth do KDE
++Comment[pt_BR]=Assistente de Bluetooth do KDE
++Comment[sv]=KDE:s Blåtandsguide
++Comment[tr]=KDE Bluetooth Sihirbazı
+ Comment[xx]=xxKDE Bluetooth Wizardxx
+
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioclient/.svn/all-wcprops branch-kde35/kdebluetooth/kioclient/.svn/all-wcprops
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioclient/.svn/dir-prop-base branch-kde35/kdebluetooth/kioclient/.svn/dir-prop-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioclient/.svn/entries branch-kde35/kdebluetooth/kioclient/.svn/entries
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioclient/.svn/format branch-kde35/kdebluetooth/kioclient/.svn/format
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioclient/.svn/prop-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kioclient/.svn/prop-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioclient/.svn/prop-base/commandhandler.cpp.svn-base branch-kde35/kdebluetooth/kioclient/.svn/prop-base/commandhandler.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioclient/.svn/prop-base/commandhandler.h.svn-base branch-kde35/kdebluetooth/kioclient/.svn/prop-base/commandhandler.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioclient/.svn/prop-base/main.cpp.svn-base branch-kde35/kdebluetooth/kioclient/.svn/prop-base/main.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioclient/.svn/text-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kioclient/.svn/text-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioclient/.svn/text-base/commandhandler.cpp.svn-base branch-kde35/kdebluetooth/kioclient/.svn/text-base/commandhandler.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioclient/.svn/text-base/commandhandler.h.svn-base branch-kde35/kdebluetooth/kioclient/.svn/text-base/commandhandler.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioclient/.svn/text-base/main.cpp.svn-base branch-kde35/kdebluetooth/kioclient/.svn/text-base/main.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioclient/Makefile.in branch-kde35/kdebluetooth/kioclient/Makefile.in
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/.svn/all-wcprops branch-kde35/kdebluetooth/kioslave/.svn/all-wcprops
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/.svn/dir-prop-base branch-kde35/kdebluetooth/kioslave/.svn/dir-prop-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/.svn/entries branch-kde35/kdebluetooth/kioslave/.svn/entries
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/.svn/format branch-kde35/kdebluetooth/kioslave/.svn/format
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/.svn/prop-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kioslave/.svn/prop-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/.svn/text-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kioslave/.svn/text-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/Makefile.in branch-kde35/kdebluetooth/kioslave/Makefile.in
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/bluetooth/.svn/all-wcprops branch-kde35/kdebluetooth/kioslave/bluetooth/.svn/all-wcprops
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/bluetooth/.svn/dir-prop-base branch-kde35/kdebluetooth/kioslave/bluetooth/.svn/dir-prop-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/bluetooth/.svn/entries branch-kde35/kdebluetooth/kioslave/bluetooth/.svn/entries
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/bluetooth/.svn/format branch-kde35/kdebluetooth/kioslave/bluetooth/.svn/format
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/bluetooth/.svn/prop-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kioslave/bluetooth/.svn/prop-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/bluetooth/.svn/prop-base/bluetooth.protocol.svn-base branch-kde35/kdebluetooth/kioslave/bluetooth/.svn/prop-base/bluetooth.protocol.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/bluetooth/.svn/prop-base/bluetooth_sidebarentry.desktop.svn-base branch-kde35/kdebluetooth/kioslave/bluetooth/.svn/prop-base/bluetooth_sidebarentry.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/bluetooth/.svn/prop-base/kiobluetooth.cpp.svn-base branch-kde35/kdebluetooth/kioslave/bluetooth/.svn/prop-base/kiobluetooth.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/bluetooth/.svn/prop-base/kiobluetooth.h.svn-base branch-kde35/kdebluetooth/kioslave/bluetooth/.svn/prop-base/kiobluetooth.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/bluetooth/.svn/text-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kioslave/bluetooth/.svn/text-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/bluetooth/.svn/text-base/bluetooth.protocol.svn-base branch-kde35/kdebluetooth/kioslave/bluetooth/.svn/text-base/bluetooth.protocol.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/bluetooth/.svn/text-base/bluetooth_sidebarentry.desktop.svn-base branch-kde35/kdebluetooth/kioslave/bluetooth/.svn/text-base/bluetooth_sidebarentry.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/bluetooth/.svn/text-base/kiobluetooth.cpp.svn-base branch-kde35/kdebluetooth/kioslave/bluetooth/.svn/text-base/kiobluetooth.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/bluetooth/.svn/text-base/kiobluetooth.h.svn-base branch-kde35/kdebluetooth/kioslave/bluetooth/.svn/text-base/kiobluetooth.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/bluetooth/Makefile.in branch-kde35/kdebluetooth/kioslave/bluetooth/Makefile.in
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/obex/.svn/all-wcprops branch-kde35/kdebluetooth/kioslave/obex/.svn/all-wcprops
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/obex/.svn/dir-prop-base branch-kde35/kdebluetooth/kioslave/obex/.svn/dir-prop-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/obex/.svn/entries branch-kde35/kdebluetooth/kioslave/obex/.svn/entries
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/obex/.svn/format branch-kde35/kdebluetooth/kioslave/obex/.svn/format
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/obex/.svn/prop-base/AUTHORS.svn-base branch-kde35/kdebluetooth/kioslave/obex/.svn/prop-base/AUTHORS.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/obex/.svn/prop-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kioslave/obex/.svn/prop-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/obex/.svn/prop-base/README.svn-base branch-kde35/kdebluetooth/kioslave/obex/.svn/prop-base/README.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/obex/.svn/prop-base/TODO.svn-base branch-kde35/kdebluetooth/kioslave/obex/.svn/prop-base/TODO.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/obex/.svn/text-base/AUTHORS.svn-base branch-kde35/kdebluetooth/kioslave/obex/.svn/text-base/AUTHORS.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/obex/.svn/text-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kioslave/obex/.svn/text-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/obex/.svn/text-base/README.svn-base branch-kde35/kdebluetooth/kioslave/obex/.svn/text-base/README.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/obex/.svn/text-base/TODO.svn-base branch-kde35/kdebluetooth/kioslave/obex/.svn/text-base/TODO.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/obex/Makefile.in branch-kde35/kdebluetooth/kioslave/obex/Makefile.in
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/obex/kio_obex2/.svn/all-wcprops branch-kde35/kdebluetooth/kioslave/obex/kio_obex2/.svn/all-wcprops
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/obex/kio_obex2/.svn/entries branch-kde35/kdebluetooth/kioslave/obex/kio_obex2/.svn/entries
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/obex/kio_obex2/.svn/format branch-kde35/kdebluetooth/kioslave/obex/kio_obex2/.svn/format
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/obex/kio_obex2/.svn/text-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kioslave/obex/kio_obex2/.svn/text-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/obex/kio_obex2/.svn/text-base/kio_obexprotocol.cpp.svn-base branch-kde35/kdebluetooth/kioslave/obex/kio_obex2/.svn/text-base/kio_obexprotocol.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/obex/kio_obex2/.svn/text-base/kio_obexprotocol.h.svn-base branch-kde35/kdebluetooth/kioslave/obex/kio_obex2/.svn/text-base/kio_obexprotocol.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/obex/kio_obex2/.svn/text-base/obex2.protocol.svn-base branch-kde35/kdebluetooth/kioslave/obex/kio_obex2/.svn/text-base/obex2.protocol.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/obex/kio_obex2/.svn/text-base/obeximpl.cpp.svn-base branch-kde35/kdebluetooth/kioslave/obex/kio_obex2/.svn/text-base/obeximpl.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/obex/kio_obex2/.svn/text-base/obeximpl.h.svn-base branch-kde35/kdebluetooth/kioslave/obex/kio_obex2/.svn/text-base/obeximpl.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/obex/kio_obex2/.svn/text-base/obexwrapper.cpp.svn-base branch-kde35/kdebluetooth/kioslave/obex/kio_obex2/.svn/text-base/obexwrapper.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/obex/kio_obex2/.svn/text-base/obexwrapper.h.svn-base branch-kde35/kdebluetooth/kioslave/obex/kio_obex2/.svn/text-base/obexwrapper.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/obex/kio_obex2/Makefile.in branch-kde35/kdebluetooth/kioslave/obex/kio_obex2/Makefile.in
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/obex/kio_obex2/obex2.protocol branch-kde35/kdebluetooth/kioslave/obex/kio_obex2/obex2.protocol
+--- kdebluetooth-1.0-beta3/kdebluetooth/kioslave/obex/kio_obex2/obex2.protocol 2007-06-12 12:29:42.000000000 +0200
++++ branch-kde35/kdebluetooth/kioslave/obex/kio_obex2/obex2.protocol 2007-06-27 01:47:44.000000000 +0200
+@@ -17,4 +17,12 @@
+ determineMimetypeFromExtension=true
+
+ Description=A kioslave for obex
++Description[es]=Un kioslave para obex
++Description[it]=Un kioslave per OBEX
++Description[ja]=OBEX のための kioslave
++Description[nl]=Een kioslave voor obex
++Description[pt]=Um 'kioslave' para ligações OBEX
++Description[pt_BR]=Um 'kioslave' para ligações OBEX
++Description[sv]=En I/O-slav för OBEX
++Description[tr]=OBEX için bir kioslave
+ Description[xx]=xxA kioslave for obexxx
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/sdp/.svn/all-wcprops branch-kde35/kdebluetooth/kioslave/sdp/.svn/all-wcprops
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/sdp/.svn/dir-prop-base branch-kde35/kdebluetooth/kioslave/sdp/.svn/dir-prop-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/sdp/.svn/entries branch-kde35/kdebluetooth/kioslave/sdp/.svn/entries
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/sdp/.svn/format branch-kde35/kdebluetooth/kioslave/sdp/.svn/format
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/sdp/.svn/prop-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kioslave/sdp/.svn/prop-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/sdp/.svn/prop-base/btsdp.cpp.svn-base branch-kde35/kdebluetooth/kioslave/sdp/.svn/prop-base/btsdp.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/sdp/.svn/prop-base/btsdp.h.svn-base branch-kde35/kdebluetooth/kioslave/sdp/.svn/prop-base/btsdp.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/sdp/.svn/prop-base/btsdp.protocol.svn-base branch-kde35/kdebluetooth/kioslave/sdp/.svn/prop-base/btsdp.protocol.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/sdp/.svn/prop-base/sdp_sidebarentry.desktop.svn-base branch-kde35/kdebluetooth/kioslave/sdp/.svn/prop-base/sdp_sidebarentry.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/sdp/.svn/text-base/Makefile.am.svn-base branch-kde35/kdebluetooth/kioslave/sdp/.svn/text-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/sdp/.svn/text-base/btsdp.cpp.svn-base branch-kde35/kdebluetooth/kioslave/sdp/.svn/text-base/btsdp.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/sdp/.svn/text-base/btsdp.h.svn-base branch-kde35/kdebluetooth/kioslave/sdp/.svn/text-base/btsdp.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/sdp/.svn/text-base/btsdp.protocol.svn-base branch-kde35/kdebluetooth/kioslave/sdp/.svn/text-base/btsdp.protocol.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/sdp/.svn/text-base/sdp_sidebarentry.desktop.svn-base branch-kde35/kdebluetooth/kioslave/sdp/.svn/text-base/sdp_sidebarentry.desktop.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/sdp/Makefile.in branch-kde35/kdebluetooth/kioslave/sdp/Makefile.in
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/kioslave/sdp/btsdp.cpp branch-kde35/kdebluetooth/kioslave/sdp/btsdp.cpp
+--- kdebluetooth-1.0-beta3/kdebluetooth/kioslave/sdp/btsdp.cpp 2007-06-12 12:29:42.000000000 +0200
++++ branch-kde35/kdebluetooth/kioslave/sdp/btsdp.cpp 2007-06-20 00:47:37.000000000 +0200
+@@ -246,7 +246,7 @@
+ // save dialog. In konqueror, kbtobexclient is started.
+ // In the file save dialog, kio_obex will be used.
+ KURL obexPushURL;
+- obexPushURL.setProtocol("obex");
++ obexPushURL.setProtocol("obex2");
+ obexPushURL.setHost(mAddress);
+ if (record.rfcommChannel() > 0) {
+ obexPushURL.setPort(record.rfcommChannel());
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/all-wcprops branch-kde35/kdebluetooth/libkbluetooth/.svn/all-wcprops
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/dir-prop-base branch-kde35/kdebluetooth/libkbluetooth/.svn/dir-prop-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/entries branch-kde35/kdebluetooth/libkbluetooth/.svn/entries
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/format branch-kde35/kdebluetooth/libkbluetooth/.svn/format
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/prop-base/AUTHORS.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/prop-base/AUTHORS.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/prop-base/COPYING.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/prop-base/COPYING.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/prop-base/ChangeLog.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/prop-base/ChangeLog.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/prop-base/Doxyfile.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/prop-base/Doxyfile.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/prop-base/INSTALL.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/prop-base/INSTALL.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/prop-base/Makefile.am.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/prop-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/prop-base/README.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/prop-base/README.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/prop-base/adapter.cpp.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/prop-base/adapter.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/prop-base/adapter.h.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/prop-base/adapter.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/AUTHORS.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/AUTHORS.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/Doxyfile.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/Doxyfile.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/Makefile.am.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/Makefile.am.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/README.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/README.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/adapter.cpp.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/adapter.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/adapter.h.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/adapter.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/authagent.cpp.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/authagent.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/authagent.h.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/authagent.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/dbusfilter.cpp.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/dbusfilter.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/dbusfilter.h.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/dbusfilter.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/dbusinit.cpp.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/dbusinit.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/dbusinit.h.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/dbusinit.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/dbussignal.cpp.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/dbussignal.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/dbussignal.h.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/dbussignal.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/devicemimeconverter.cpp.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/devicemimeconverter.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/devicemimeconverter.h.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/devicemimeconverter.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/inputdevice.cpp.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/inputdevice.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/inputdevice.h.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/inputdevice.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/inputmanager.cpp.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/inputmanager.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/inputmanager.h.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/inputmanager.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/manager.cpp.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/manager.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/manager.h.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/manager.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/passkeyagent.cpp.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/passkeyagent.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/passkeyagent.h.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/passkeyagent.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/security.h.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/security.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/service.cpp.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/service.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/service.h.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/service.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/servicerecord.cpp.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/servicerecord.cpp.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/.svn/text-base/servicerecord.h.svn-base branch-kde35/kdebluetooth/libkbluetooth/.svn/text-base/servicerecord.h.svn-base
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/Makefile.in branch-kde35/kdebluetooth/libkbluetooth/Makefile.in
+diff -i -Nur kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/servicerecord.cpp branch-kde35/kdebluetooth/libkbluetooth/servicerecord.cpp
+--- kdebluetooth-1.0-beta3/kdebluetooth/libkbluetooth/servicerecord.cpp 2007-06-12 12:29:42.000000000 +0200
++++ branch-kde35/kdebluetooth/libkbluetooth/servicerecord.cpp 2007-06-20 00:47:36.000000000 +0200
+@@ -24,6 +24,7 @@
+ */
+
+ #include "servicerecord.h"
++#include <kdebug.h>
+
+ namespace KBluetooth
+ {
+@@ -38,6 +39,8 @@
+
+ for(QDomNode n = docElement.firstChild(); !n.isNull(); n = n.nextSibling() ) {
+ QDomElement e = n.toElement();
++
++ kdDebug() << e.text() << endl;
+
+ if ( e.attribute("id") == "0x0001" ) {
+ mUuid = parseAttributeUuid(e);
+@@ -64,7 +67,20 @@
+ kdDebug() << k_funcinfo << mXml << endl;
+ QDomNodeList list = e.elementsByTagName("text");
+ QString serviceName = list.item(0).toElement().attribute("value");
++ if (list.item(0).toElement().attribute("encoding") == "hex") {
++ QString localValue = list.item(0).toElement().attribute("value");
++ QString a = localValue.mid(0, 2);
++ bool ok;
++
++ serviceName.insert(0, (char) a.toInt(&ok, 16));
++ for (uint i=2; i < localValue.length(); i = i + 2) {
++ a = localValue.mid(i, 2);
++ serviceName.insert(i/2, (char) a.toInt(&ok, 16));
++ }
++ serviceName.setLength(localValue.length()/2 - 1);
++ }
+
++ kdDebug() << "serviceName: " << serviceName << endl;
+ return serviceName;
+ }
+
Property changes on: kde-extras/kdebluetooth/trunk/debian/patches/10_update-1.0-beta3_to_kdesvn_r680708.diff
___________________________________________________________________
Name: svn:mime-type
+ text/x-patch
More information about the pkg-kde-commits
mailing list