Hello, ----------------------------------------------------------------------- I would like to ask to you to let konversation 1.1-1 into lenny because: 1) It has spent 39 days in unstable as of writing [1]. No new bugs has been reported. I deliberately didn't ask for unblock earlier so a new version would get really good testing in unstable. 2) The differences between 1.1~-rc1+svn837068 and 1.1-1 are very minor. I worked really hard back then to get a very recent snapshot into testing before the freeze so it would be an easier task for you to unblock 1.1-1. I knew 1.1 wouldn't be released in time for lenny freeze but it was very very close. Packaging diff - konversation_debian_1.1~-rc1+svn837068-1_to_1.1-1.diff. It was generated with [2]. 98_buildprep.diff patch is excluded because it is an autogenerated relibtoolization/build system patch. The other changes are addition/removal of docs/translations in the install file and readdition of the STRHACK() macro (which was removed by upstream in the final release) because I use it to put Debian package version in the Konversation About Dialog. Upstream diff - konversation_upstream_1.1~-rc1+svn837068-1_to_1.1-1.diff. It can be generated with [3]. Excluded stuff: docs, translations, pregenerated build system files. Binary changes in docs/translations only (due to differences in the process how me and upstream generated the tarball). Some translations were excluded from upstream 1.1 release because they didn't meet upstream release criteria (they were included in my 1.1~-rc1+svn837068-1). And other changes [4]: ChangeLog | 85 ++++------ VERSION | 1 konversation/src/version.h | 2 konversation/src/commit.h | 2 konversation/src/inputfilter.cpp | 5 Upstream version string related changes (1.1rc1 to 1.1). configure.files | 1 configure.in.bot | 4 configure.in.bot removed. It only had a comment in it. konversation/src/main.cpp | 5 STRHACK macro and COMMIT# in About Dialog removed. I readded STRHACK macro in the my packaging patch though (see above). konversation/images/nickicons/oxygen/index.desktop | 6 Translation update. konversation/scripts/media | 34 +++- Added Amarok 2 support but that portion of code is disabled (commented out). So effectively there is no change here. konversation/src/dcctransfer.cpp | 2 Added missing initialization of the member variables. konversation/src/dcctransferdetailedinfopanel.cpp | 1 konversation/src/dcctransferdetailedinfopanelui.ui | 3 UI usability change: replaced QLabel with KSqueezedTextLabel. subdirs | 2 Translations dir was 'translations' in my tarball and 'po' in upstream tarball. 3) Having official upstream release in Debian stable will be easier for upstream to support. Snapshot tarball was hand made by me. 1. http://packages.qa.debian.org/k/konversation.html 2. interdiff -z -p1 konversation_1.1~-rc1+svn837068-1.diff.gz konversation_1.1-1.diff.gz | filterdiff -x "*98_buildprep*" > konversation_debian_1.1~-rc1+svn837068-1_to_1.1-1.diff 3. diff -uNr konversation-1.1~-rc1+svn837068 konversation-1.1 | filterdiff -x "*/Makefile.in" -x "*/translations/*" -x "*/doc/*" -x "*/configure" -x "*/configure.in" -x "*/po/*" | grep -v '^diff' > konversation_upstream_1.1~- rc1+svn837068-1_to_1.1-1.diff. 4. diffstat konversation_upstream_1.1~-rc1+svn837068-1_to_1.1-1.diff | grep -v '|binary$' ----------------------------------------------------------------------- ktorrent 3.1.2+dfsg.1-1 (from 3.1.1+dfsg.1-1) is a more difficult task. Some changes in it do not meet criteria for unblock however I still hope you will let it in given the reasons below: 1) It has spent 34 days in unstable [1]. No new bugs were filled against it. What is more, ktorrent 3.1.1+dfsg.1-1 was the first ktorrent 3 series to ever enter testing and I delayed 3.1.2 upload because 3.1.1 was held back from testing by kdebase-runtime at the time. 2) Packaging changes (ktorrent_debian_3.1.1-1_to_3.1.2-1.diff): wildcards in the install file for versioned private libraries because upstream likes to bump private library versions each new minor release. 01_arm_qreal_fixes.diff patch was removed because I pushed it upstream. Upstream changelog for 3.1.2: - Fix crash when clicking on clear search history button twice (167580) - Fix crash at startup which started happening since KDE 4.1 Crash fixes. Important. - Improved performance of GUI updates - Backported some improvements to download thread - Fix problem causing massive memory usage (148385) I can confirm that these changes really improve performance (esp. the ones to the download thread, practically the biggest change in this release) and would be really useful for Lenny users. Also big torrent files with a huge number (5000+) of files and most of them selected as "do not download" are practically unusable in 3.1.1. Situation has been improved a bit in 3.1.2 (slow but usable). - Make sure app icon is set (mostly for windows) - Make sure cookies are not sent in http announces - Fix issue causing Timer class to stop working when day changes - Make sure toolbar settings are restored properly (Debian #495775) - Fixed some bugs in file deselection code Small but rather important bug fixes. The 2nd one made ktorrent unusable with some trackers whereas the 3rd one caused some problems when ktorrent was running 24/7. - Fix compile error on arm architecture My previous 01_arm_qreal_fixes.diff patch. Upstream diff (ktorrent_upstream_3.1.1-1_to_3.1.2-1.diff): ideal/mainwindow.cpp | 2 ktorrent-3.1.2+dfsg.1/ChangeLog | 13 + ktorrent-3.1.2+dfsg.1/ktorrent/CMakeLists.txt | 2 ktorrent-3.1.2+dfsg.1/ktorrent/app.cpp | 5 ktorrent-3.1.2+dfsg.1/ktorrent/main.cpp | 4 ktorrent-3.1.2+dfsg.1/ktorrent/recommendedsettingsdlg.cpp | 2 ktorrent-3.1.2+dfsg.1/ktorrent/recommendedsettingsdlg.ui | 99 +++++----- ktorrent-3.1.2+dfsg.1/ktorrent/viewmodel.cpp | 13 - ktorrent-3.1.2+dfsg.1/libbtcore/CMakeLists.txt | 2 ktorrent-3.1.2+dfsg.1/libbtcore/btversion.h | 2 ktorrent-3.1.2+dfsg.1/libbtcore/diskio/chunkmanager.cpp | 30 ++- ktorrent-3.1.2+dfsg.1/libbtcore/diskio/multifilecache.cpp | 6 ktorrent-3.1.2+dfsg.1/libbtcore/mse/streamsocket.cpp | 6 ktorrent-3.1.2+dfsg.1/libbtcore/mse/streamsocket.h | 3 ktorrent-3.1.2+dfsg.1/libbtcore/net/bufferedsocket.cpp | 2 ktorrent-3.1.2+dfsg.1/libbtcore/net/downloadthread.cpp | 86 +++++--- ktorrent-3.1.2+dfsg.1/libbtcore/net/downloadthread.h | 12 - ktorrent-3.1.2+dfsg.1/libbtcore/net/socket.cpp | 8 ktorrent-3.1.2+dfsg.1/libbtcore/net/uploadthread.cpp | 5 ktorrent-3.1.2+dfsg.1/libbtcore/peer/peer.cpp | 1 ktorrent-3.1.2+dfsg.1/libbtcore/torrent/torrentcontrol.h | 1 ktorrent-3.1.2+dfsg.1/libbtcore/tracker/httptracker.cpp | 2 ktorrent-3.1.2+dfsg.1/libbtcore/util/timer.cpp | 19 - ktorrent-3.1.2+dfsg.1/libbtcore/util/timer.h | 10 - ktorrent-3.1.2+dfsg.1/libktcore/CMakeLists.txt | 2 ktorrent-3.1.2+dfsg.1/libktcore/ktversion.h | 6 ktorrent-3.1.2+dfsg.1/plugins/bwscheduler/bwprefpage.ui | 2 ktorrent-3.1.2+dfsg.1/plugins/infowidget/chunkdownloadmodel.cpp | 3 ktorrent-3.1.2+dfsg.1/plugins/infowidget/peerviewmodel.cpp | 3 ktorrent-3.1.2+dfsg.1/plugins/search/searchtoolbar.cpp | 2 30 files changed, 204 insertions(+), 149 deletions(-) 3) I do not have much hope that you will unblock this however from my perspective I see no good reason why we should not include the latest upstream bugfix release into Debian stable release esp. when it had 34 days of testing in unstable without complaints. What is more, ktorrent is just a standalone application and cannot break the rest of the archive. 1. http://packages.qa.debian.org/k/ktorrent.html Thank you for your consideration. -- Modestas Vainius <modestas@vainius.eu>
--- konversation-1.1~-rc1+svn837068/ChangeLog 2008-07-23 22:28:26.000000000 +0300
+++ konversation-1.1/ChangeLog 2008-08-06 18:56:27.000000000 +0300
@@ -1,41 +1,9 @@
-Changes since 1.1rc1:
-
-DCC
-* New transfer items added to the DCC panel's transfer list are no longer auto-
- matically selected, meaning work on other items in the list occuring at the
- same time no longer gets interrupted.
-
-On Screen Display
-* Fixed on screen display occassionally reverting to the default position when
- using the settings dialog to change unrelated settings.
-
-Tree list
-* Fixed a corner case where a server status item could become a child item of
- another server status item when dragging it below an special application pane
- item such as DCC Status or Watched Nicks Online.
-* Fixed a crash when using the mouse wheel on the list within ~150ms of a drag
- and drop operation.
-
-Watched Nicknames
-* Actually honor the preference to enable/disable the Watched Nicknames Online
- system, and apply it at runtime.
-* Make sure the periodic Watched Nicknames Online check actually starts running
- within the same session after adding the first nickname to the list.
-* Fixed a crash on quit with the Watched Nicks Online tab open and there being
- an open connection to a network that nicks are being watched for.
-
-Misc
-* Fixed a crash on quit during KDE logout or when quitting by DCOP.
-* Standards compliancy fixes in the application .desktop file and the nicklist
- icon theme .desktop files.
-
-
-Changes from 1.0.1 to 1.1rc1:
-We are extremely pleased to announce the first release candidate of
-Konversation's next major release, v1.1. Konversation 1.1 is a special release
-for us in multiple ways: It's our farewell to KDE 3, by way of being the last
-major release built upon that venerable platform. It's also our biggest release
-yet, in terms of the number and magnitude of the changes.
+Changes from 1.0.1 to 1.1:
+We are extremely pleased to announce Konversation's newest major release, v1.1.
+Konversation 1.1 is a special release for us in multiple ways: It's our farewell
+to KDE 3, by way of being the last major release built upon that venerable
+platform. It's also our biggest release yet, in terms of the number and
+magnitude of the changes.
The additions and improvements in this release are both user-visible and under
the hood. Some of the highlights are rewritten connection handling (robustness
@@ -46,13 +14,12 @@
of aggressive throttling to avoid flooding while smartly reordering messages to
improve latencies, great convenience additions like a "Next Active Tab" shortcut,
and much, much more, along with a large number of bugfixes and tweaks to round
-things out.
+things out. Note: All fixes made since RC1 are marked with a "[New since RC1]"
+label in the changelog.
-Please note that while we're generally quite confident that this release
-candidate is the most robust and stable version of Konversation published so
-far, this is not a final release version, and so nasty bugs might still be
-present (if you find any, please report :-). Translation coverage is also not
-yet finalized.
+We're confident that this release is the best and most robust version of
+Konversation published so far, and upgrading comes highly recommended to all
+users. Enjoy!
Text views
@@ -152,6 +119,11 @@
scheme changes.
* Fixed a bug that could cause a crash when the view treelist would receive
keypress events during application shutdown.
+* [New since RC1] Fixed a corner case where a server status item could become a
+ child item of another server status item when dragging it below an special
+ application pane item such as DCC Status or Watched Nicks Online.
+* [New since RC1] Fixed a crash when using the mouse wheel on the list within
+ ~150ms of a drag and drop operation.
System Tray icon
* Remember and recreate minimized-to-tray state across sessions.
@@ -251,6 +223,8 @@
* Fixed actions in queries and DCC chats producing message notification events
(rather than the correct private message ones).
* Changed the OSD screensaver check logic to work in KDE 4.
+* [New since RC1] Fixed on screen display occassionally reverting to the default
+ position when using the settings dialog to change unrelated settings.
Connection handling
* Improved behavior with regard to reusing existing connections in connection
@@ -369,6 +343,14 @@
directory changes.
* Fixed bug leading to crash upon initiating DCC Chat when "Focus new tabs" was
enabled.
+* [New since RC1] New transfer items added to the DCC panel's transfer list are no
+ longer automatically selected, meaning work on other items in the list occuring
+ at the same time no longer gets interrupted.
+* [New since RC1] The "Filename:" line in the DCC panel's detailed info pane is
+ now using text squeezing to avoid an increase in minimum window width with long
+ file names.
+* [New since RC1] Failed receives now longer show 833TB/s as their transfer
+ speed.
Blowfish support
* Fixed FiSH-style +p prefix to send clear text to channel despite an encryption
@@ -406,6 +388,13 @@
* Fixed display of WHOIS spam prompted by the Watch List's WHOIS activity.
* Connections to non-config-backed targets no longer show in Watched Nicks
Online.
+* [New since RC1] Actually honor the preference to enable/disable the Watched
+ Nicknames Online system, and apply it at runtime.
+* [New since RC1] Make sure the periodic Watched Nicknames Online check actually
+ starts running within the same session after adding the first nickname to the
+ list.
+* [New since RC1] Fixed a crash on quit with the Watched Nicks Online tab open and
+ there being an open connection to a network that nicks are being watched for.
Channel List
* IRC markup is now removed from content in the Channel List view.
@@ -447,6 +436,8 @@
* Made newline handling in the DCOP interface more robust, fixing a potential
security problem (CVE-2007-4400).
* A few speed optimizations and memory leak fixes.
+* [New since RC1] Fixed a crash on quit during KDE logout or when quitting by
+ DCOP.
Included scripts
* Support for KMPlayer in the 'media' script (based on the window caption, as
@@ -462,6 +453,12 @@
* Removed broken 'qurl' script in favor of new 'tinyurl' one.
* Fixed the 'fortune' script not working properly when variable expansion is
turned off in the preferences.
+* [New since RC1] Fixed a bug in the 'media' script that caused it to break when
+ querying Audacious with audtool not being available.
+
+Packaging
+* [New since RC1] Standards compliancy fixes in the application .desktop file and
+ the nicklist icon theme .desktop files.
Build
* Fixed build with --enable-final.
--- konversation-1.1~-rc1+svn837068/configure.files 2008-07-23 22:39:54.000000000 +0300
+++ konversation-1.1/configure.files 2008-08-06 18:57:48.000000000 +0300
@@ -1,4 +1,3 @@
./admin/configure.in.min
configure.in.in
./konversation/configure.in.in
-configure.in.bot
--- konversation-1.1~-rc1+svn837068/configure.in.bot 2008-07-23 22:27:57.000000000 +0300
+++ konversation-1.1/configure.in.bot 1970-01-01 03:00:00.000000000 +0300
@@ -1,4 +0,0 @@
-dnl Put here things to be done at the very end - telling users
-dnl about additional packages to install. Better yet is giving
-dnl each project / subdr its own configure.in.bot.
-
Binary files konversation-1.1~-rc1+svn837068/doc/addchannel.png and konversation-1.1/doc/addchannel.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/addnetwork_co.png and konversation-1.1/doc/addnetwork_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/addserver_co.png and konversation-1.1/doc/addserver_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/channellist_screen_co.png and konversation-1.1/doc/channellist_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/channel_screen_co.png and konversation-1.1/doc/channel_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/channel_screen_tour_co.png and konversation-1.1/doc/channel_screen_tour_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/checkidentities.png and konversation-1.1/doc/checkidentities.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/colorchooser_screen.png and konversation-1.1/doc/colorchooser_screen.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/colorize.png and konversation-1.1/doc/colorize.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/configure.png and konversation-1.1/doc/configure.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/dccstatus_screen_co.png and konversation-1.1/doc/dccstatus_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/editserver_screen_co.png and konversation-1.1/doc/editserver_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/addchannel.png and konversation-1.1/doc/es/addchannel.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/addnetwork_co.png and konversation-1.1/doc/es/addnetwork_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/addserver_co.png and konversation-1.1/doc/es/addserver_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/channellist_screen_co.png and konversation-1.1/doc/es/channellist_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/channel_screen_tour_co.png and konversation-1.1/doc/es/channel_screen_tour_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/checkidentities.png and konversation-1.1/doc/es/checkidentities.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/colorchooser_screen.png and konversation-1.1/doc/es/colorchooser_screen.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/colorize.png and konversation-1.1/doc/es/colorize.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/common/1.png and konversation-1.1/doc/es/common/1.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/common/2.png and konversation-1.1/doc/es/common/2.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/common/3.png and konversation-1.1/doc/es/common/3.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/common/4.png and konversation-1.1/doc/es/common/4.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/common/5.png and konversation-1.1/doc/es/common/5.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/common/6.png and konversation-1.1/doc/es/common/6.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/common/7.png and konversation-1.1/doc/es/common/7.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/common/8.png and konversation-1.1/doc/es/common/8.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/common/9.png and konversation-1.1/doc/es/common/9.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/configure.png and konversation-1.1/doc/es/configure.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/dccstatus_screen_co.png and konversation-1.1/doc/es/dccstatus_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/first_channel_co.png and konversation-1.1/doc/es/first_channel_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/first_serverlist_co.png and konversation-1.1/doc/es/first_serverlist_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/highlighting_screen_co.png and konversation-1.1/doc/es/highlighting_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/identities_adv_co.png and konversation-1.1/doc/es/identities_adv_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/identities_away_co.png and konversation-1.1/doc/es/identities_away_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/identities_gen_co.png and konversation-1.1/doc/es/identities_gen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/irc_admin.png and konversation-1.1/doc/es/irc_admin.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/irc_away.png and konversation-1.1/doc/es/irc_away.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/irc_halfop.png and konversation-1.1/doc/es/irc_halfop.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/irc_normal.png and konversation-1.1/doc/es/irc_normal.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/irc_op.png and konversation-1.1/doc/es/irc_op.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/irc_owner.png and konversation-1.1/doc/es/irc_owner.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/irc_voice.png and konversation-1.1/doc/es/irc_voice.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/kaddressbook.png and konversation-1.1/doc/es/kaddressbook.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/kimproxy_create_screen2.png and konversation-1.1/doc/es/kimproxy_create_screen2.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/kimproxy_create_screen_co.png and konversation-1.1/doc/es/kimproxy_create_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/led_blue_off.png and konversation-1.1/doc/es/led_blue_off.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/led_blue_on.png and konversation-1.1/doc/es/led_blue_on.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/led_green_off.png and konversation-1.1/doc/es/led_green_off.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/led_green_on.png and konversation-1.1/doc/es/led_green_on.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/led_yellow_off.png and konversation-1.1/doc/es/led_yellow_off.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/led_yellow_on.png and konversation-1.1/doc/es/led_yellow_on.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/led_red_off.png and konversation-1.1/doc/es/led_red_off.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/led_red_on.png and konversation-1.1/doc/es/led_red_on.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/logviewer_co.png and konversation-1.1/doc/es/logviewer_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/nicksonline_co.png and konversation-1.1/doc/es/nicksonline_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/nickthemes_screen_co.png and konversation-1.1/doc/es/nickthemes_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/notification_screen_co.png and konversation-1.1/doc/es/notification_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/notifylist_screen_co.png and konversation-1.1/doc/es/notifylist_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/osd_demo.png and konversation-1.1/doc/es/osd_demo.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/osd_screen_co.png and konversation-1.1/doc/es/osd_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/quickbuttons_screen.png and konversation-1.1/doc/es/quickbuttons_screen.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/quickconnect_screen.png and konversation-1.1/doc/es/quickconnect_screen.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/serverlist_co.png and konversation-1.1/doc/es/serverlist_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/urlcatcher_screen_co.png and konversation-1.1/doc/es/urlcatcher_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/es/webbrowser_screen_co.png and konversation-1.1/doc/es/webbrowser_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/first_channel_co.png and konversation-1.1/doc/first_channel_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/first_serverlist_co.png and konversation-1.1/doc/first_serverlist_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/highlighting_screen_co.png and konversation-1.1/doc/highlighting_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/identities_adv_co.png and konversation-1.1/doc/identities_adv_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/identities_away_co.png and konversation-1.1/doc/identities_away_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/identities_gen_co.png and konversation-1.1/doc/identities_gen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/irc_admin.png and konversation-1.1/doc/irc_admin.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/irc_away.png and konversation-1.1/doc/irc_away.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/irc_halfop.png and konversation-1.1/doc/irc_halfop.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/irc_normal.png and konversation-1.1/doc/irc_normal.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/irc_op.png and konversation-1.1/doc/irc_op.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/irc_owner.png and konversation-1.1/doc/irc_owner.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/irc_voice.png and konversation-1.1/doc/irc_voice.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/it/addchannel.png and konversation-1.1/doc/it/addchannel.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/it/addnetwork_co.png and konversation-1.1/doc/it/addnetwork_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/it/addserver_co.png and konversation-1.1/doc/it/addserver_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/it/channellist_screen_co.png and konversation-1.1/doc/it/channellist_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/it/channel_screen_tour_co.png and konversation-1.1/doc/it/channel_screen_tour_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/it/checkidentities.png and konversation-1.1/doc/it/checkidentities.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/it/colorchooser_screen.png and konversation-1.1/doc/it/colorchooser_screen.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/it/first_channel_co.png and konversation-1.1/doc/it/first_channel_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/it/first_serverlist_co.png and konversation-1.1/doc/it/first_serverlist_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/it/identities_adv_co.png and konversation-1.1/doc/it/identities_adv_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/it/identities_away_co.png and konversation-1.1/doc/it/identities_away_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/it/identities_gen_co.png and konversation-1.1/doc/it/identities_gen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/it/nicksonline_co.png and konversation-1.1/doc/it/nicksonline_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/it/notification_screen_co.png and konversation-1.1/doc/it/notification_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/it/notifylist_screen_co.png and konversation-1.1/doc/it/notifylist_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/it/osd_demo.png and konversation-1.1/doc/it/osd_demo.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/it/osd_screen_co.png and konversation-1.1/doc/it/osd_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/it/quickbuttons_screen.png and konversation-1.1/doc/it/quickbuttons_screen.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/it/quickconnect_screen.png and konversation-1.1/doc/it/quickconnect_screen.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/it/serverlist_co.png and konversation-1.1/doc/it/serverlist_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/kaddressbook.png and konversation-1.1/doc/kaddressbook.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/kimproxy_create_screen2.png and konversation-1.1/doc/kimproxy_create_screen2.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/kimproxy_create_screen_co.png and konversation-1.1/doc/kimproxy_create_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/addchannel.png and konversation-1.1/doc/konversation/addchannel.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/addnetwork_co.png and konversation-1.1/doc/konversation/addnetwork_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/addserver_co.png and konversation-1.1/doc/konversation/addserver_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/channellist_screen_co.png and konversation-1.1/doc/konversation/channellist_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/channel_screen_co.png and konversation-1.1/doc/konversation/channel_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/channel_screen_tour_co.png and konversation-1.1/doc/konversation/channel_screen_tour_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/checkidentities.png and konversation-1.1/doc/konversation/checkidentities.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/colorchooser_screen.png and konversation-1.1/doc/konversation/colorchooser_screen.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/colorize.png and konversation-1.1/doc/konversation/colorize.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/configure.png and konversation-1.1/doc/konversation/configure.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/dccstatus_screen_co.png and konversation-1.1/doc/konversation/dccstatus_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/editserver_screen_co.png and konversation-1.1/doc/konversation/editserver_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/first_channel_co.png and konversation-1.1/doc/konversation/first_channel_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/first_serverlist_co.png and konversation-1.1/doc/konversation/first_serverlist_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/highlighting_screen_co.png and konversation-1.1/doc/konversation/highlighting_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/identities_adv_co.png and konversation-1.1/doc/konversation/identities_adv_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/identities_away_co.png and konversation-1.1/doc/konversation/identities_away_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/identities_gen_co.png and konversation-1.1/doc/konversation/identities_gen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/irc_admin.png and konversation-1.1/doc/konversation/irc_admin.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/irc_away.png and konversation-1.1/doc/konversation/irc_away.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/irc_halfop.png and konversation-1.1/doc/konversation/irc_halfop.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/irc_normal.png and konversation-1.1/doc/konversation/irc_normal.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/irc_op.png and konversation-1.1/doc/konversation/irc_op.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/irc_owner.png and konversation-1.1/doc/konversation/irc_owner.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/irc_voice.png and konversation-1.1/doc/konversation/irc_voice.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/kaddressbook.png and konversation-1.1/doc/konversation/kaddressbook.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/kimproxy_create_screen2.png and konversation-1.1/doc/konversation/kimproxy_create_screen2.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/kimproxy_create_screen_co.png and konversation-1.1/doc/konversation/kimproxy_create_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/led_blue_off.png and konversation-1.1/doc/konversation/led_blue_off.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/led_blue_on.png and konversation-1.1/doc/konversation/led_blue_on.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/led_green_off.png and konversation-1.1/doc/konversation/led_green_off.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/led_green_on.png and konversation-1.1/doc/konversation/led_green_on.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/led_yellow_off.png and konversation-1.1/doc/konversation/led_yellow_off.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/led_yellow_on.png and konversation-1.1/doc/konversation/led_yellow_on.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/led_red_off.png and konversation-1.1/doc/konversation/led_red_off.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/led_red_on.png and konversation-1.1/doc/konversation/led_red_on.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/logviewer_co.png and konversation-1.1/doc/konversation/logviewer_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/nicksonline_co.png and konversation-1.1/doc/konversation/nicksonline_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/nickthemes_screen_co.png and konversation-1.1/doc/konversation/nickthemes_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/notification_screen_co.png and konversation-1.1/doc/konversation/notification_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/notifylist_screen_co.png and konversation-1.1/doc/konversation/notifylist_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/osd_demo.png and konversation-1.1/doc/konversation/osd_demo.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/osd_screen_co.png and konversation-1.1/doc/konversation/osd_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/prefs_identity_screen_co.png and konversation-1.1/doc/konversation/prefs_identity_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/quickbuttons_screen.png and konversation-1.1/doc/konversation/quickbuttons_screen.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/quickconnect_screen.png and konversation-1.1/doc/konversation/quickconnect_screen.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/serverlist_co.png and konversation-1.1/doc/konversation/serverlist_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/serverlist_screen_co.png and konversation-1.1/doc/konversation/serverlist_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/urlcatcher_screen_co.png and konversation-1.1/doc/konversation/urlcatcher_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/konversation/webbrowser_screen_co.png and konversation-1.1/doc/konversation/webbrowser_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/led_blue_off.png and konversation-1.1/doc/led_blue_off.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/led_blue_on.png and konversation-1.1/doc/led_blue_on.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/led_green_off.png and konversation-1.1/doc/led_green_off.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/led_green_on.png and konversation-1.1/doc/led_green_on.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/led_yellow_off.png and konversation-1.1/doc/led_yellow_off.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/led_yellow_on.png and konversation-1.1/doc/led_yellow_on.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/led_red_off.png and konversation-1.1/doc/led_red_off.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/led_red_on.png and konversation-1.1/doc/led_red_on.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/logviewer_co.png and konversation-1.1/doc/logviewer_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/nicksonline_co.png and konversation-1.1/doc/nicksonline_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/nickthemes_screen_co.png and konversation-1.1/doc/nickthemes_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/notification_screen_co.png and konversation-1.1/doc/notification_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/notifylist_screen_co.png and konversation-1.1/doc/notifylist_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/osd_demo.png and konversation-1.1/doc/osd_demo.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/osd_screen_co.png and konversation-1.1/doc/osd_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/prefs_identity_screen_co.png and konversation-1.1/doc/prefs_identity_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/quickbuttons_screen.png and konversation-1.1/doc/quickbuttons_screen.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/quickconnect_screen.png and konversation-1.1/doc/quickconnect_screen.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/serverlist_co.png and konversation-1.1/doc/serverlist_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/serverlist_screen_co.png and konversation-1.1/doc/serverlist_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/sv/addchannel.png and konversation-1.1/doc/sv/addchannel.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/sv/addnetwork_co.png and konversation-1.1/doc/sv/addnetwork_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/sv/addserver_co.png and konversation-1.1/doc/sv/addserver_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/sv/channellist_screen_co.png and konversation-1.1/doc/sv/channellist_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/sv/channel_screen_tour_co.png and konversation-1.1/doc/sv/channel_screen_tour_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/sv/checkidentities.png and konversation-1.1/doc/sv/checkidentities.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/sv/colorchooser_screen.png and konversation-1.1/doc/sv/colorchooser_screen.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/sv/dccstatus_screen_co.png and konversation-1.1/doc/sv/dccstatus_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/sv/first_channel_co.png and konversation-1.1/doc/sv/first_channel_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/sv/first_serverlist_co.png and konversation-1.1/doc/sv/first_serverlist_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/sv/highlighting_screen_co.png and konversation-1.1/doc/sv/highlighting_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/sv/identities_adv_co.png and konversation-1.1/doc/sv/identities_adv_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/sv/identities_away_co.png and konversation-1.1/doc/sv/identities_away_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/sv/identities_gen_co.png and konversation-1.1/doc/sv/identities_gen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/sv/kimproxy_create_screen2.png and konversation-1.1/doc/sv/kimproxy_create_screen2.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/sv/kimproxy_create_screen_co.png and konversation-1.1/doc/sv/kimproxy_create_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/sv/logviewer_co.png and konversation-1.1/doc/sv/logviewer_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/sv/nicksonline_co.png and konversation-1.1/doc/sv/nicksonline_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/sv/nickthemes_screen_co.png and konversation-1.1/doc/sv/nickthemes_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/sv/notification_screen_co.png and konversation-1.1/doc/sv/notification_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/sv/notifylist_screen_co.png and konversation-1.1/doc/sv/notifylist_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/sv/osd_demo.png and konversation-1.1/doc/sv/osd_demo.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/sv/osd_screen_co.png and konversation-1.1/doc/sv/osd_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/sv/quickbuttons_screen.png and konversation-1.1/doc/sv/quickbuttons_screen.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/sv/quickconnect_screen.png and konversation-1.1/doc/sv/quickconnect_screen.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/sv/serverlist_co.png and konversation-1.1/doc/sv/serverlist_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/sv/urlcatcher_screen_co.png and konversation-1.1/doc/sv/urlcatcher_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/sv/webbrowser_screen_co.png and konversation-1.1/doc/sv/webbrowser_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/urlcatcher_screen_co.png and konversation-1.1/doc/urlcatcher_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/doc/webbrowser_screen_co.png and konversation-1.1/doc/webbrowser_screen_co.png differ
--- konversation-1.1~-rc1+svn837068/konversation/images/nickicons/oxygen/index.desktop 2008-07-23 22:28:06.000000000 +0300
+++ konversation-1.1/konversation/images/nickicons/oxygen/index.desktop 2008-08-06 18:56:27.000000000 +0300
@@ -7,7 +7,7 @@
Name[it]=Tema Oxygen
Name[ja]=Oxygen テーマ
Name[sr]=Кисеоник тема
-Name[sr@Latn]=Кисеоник тема
+Name[sr@Latn]=Kiseonik tema
Name[sv]=Oxygen-tema
Name[zh_TW]=Oxygen 主題
Comment="Oxygen" by Nuno Pinheiro
@@ -16,7 +16,7 @@
Comment[et]="Oxygen" (autor Nuno Pinheiro)
Comment[it]=«Oxygen» di Nuno Pinheiro
Comment[ja]=Nuno Pinheiro 作の Oxygen テーマ
-Comment[sr]=„Кисеоник“ од Нуња Пинеира
-Comment[sr@Latn]=„Кисеоник“ од Нуња Пинеира
+Comment[sr]=„Кисеоник“ од Нуна Пињеира
+Comment[sr@Latn]=„Kiseonik“ od Nuna Pinjeira
Comment[sv]="Oxygen" av Nuno Pinheiro
Comment[zh_TW]="Oxygen"，由 Nuno Pinheiro 提供
--- konversation-1.1~-rc1+svn837068/konversation/scripts/media 2008-07-23 22:28:09.000000000 +0300
+++ konversation-1.1/konversation/scripts/media 2008-08-06 18:56:27.000000000 +0300
@@ -244,6 +244,36 @@
return ''
return data
+#class Amarok2Player(Player):
+# def __init__(self):
+# Player.__init__(self, 'Amarok2', 'audio')
+# self.isRunning()
+#
+# def getData(self):
+# playing=os.popen("qdbus org.mpris.amarok /Player PositionGet").readline().strip() != "0"
+# if playing and self.isRunning():
+# for line in os.popen("qdbus org.mpris.amarok /Player GetMetadata").readlines():
+# if re.match("^title", line):
+# title=self.reEncodeString(line.strip().split(None,1)[1])
+# if re.match("^artist", line):
+# artist=self.reEncodeString(line.strip().split(None,1)[1])
+# if re.match("^album", line):
+# album=self.reEncodeString(line.strip().split(None,1)[1])
+# return (title, artist, album)
+# else:
+# return ''
+#
+# def isRunning(self):
+# qdbus_items=subprocess.Popen(['qdbus'], stdout=subprocess.PIPE).communicate()[0]
+# running=re.findall('^ org.mpris.amarok$', qdbus_items, re.M)
+# if type(running) is list:
+# try:
+# running=running[0]
+# except IndexError:
+# running=''
+# self.running=bool(running.strip())
+# return self.running
+
import socket
class MPD(Player):
@@ -329,7 +359,7 @@
def isRunning(self):
self.running = not os.system('audtool current-song')
- return self.running
+ return self.running
def getData(self):
if self.isRunning() and not os.system('audtool playback-playing'):
@@ -343,6 +373,8 @@
return (self.reEncodeString(data_list[-1]),data_list[0],data_list[1])
else:
return (self.reEncodeString(data),'','')
+ else:
+ return ''
def playing(playerList, mode=None):
--- konversation-1.1~-rc1+svn837068/konversation/src/commit.h 2008-07-23 22:28:26.000000000 +0300
+++ konversation-1.1/konversation/src/commit.h 2008-08-06 18:56:27.000000000 +0300
@@ -1,4 +1,4 @@
// This COMMIT number is added to version string to be used as "patch level"
#ifndef COMMIT
-#define COMMIT 3235
+#define COMMIT 3300
#endif
--- konversation-1.1~-rc1+svn837068/konversation/src/dcctransfer.cpp 2008-07-23 22:28:26.000000000 +0300
+++ konversation-1.1/konversation/src/dcctransfer.cpp 2008-08-06 18:56:27.000000000 +0300
@@ -35,6 +35,8 @@
m_timeLeft = DccTransfer::NotInTransfer;
m_transferringPosition = 0;
m_transferStartPosition = 0;
+ m_averageSpeed = 0.0;
+ m_currentSpeed = 0.0;
m_bufferSize = Preferences::dccBufferSize();
m_buffer = new char[ m_bufferSize ];
--- konversation-1.1~-rc1+svn837068/konversation/src/dcctransferdetailedinfopanel.cpp 2008-07-23 22:28:26.000000000 +0300
+++ konversation-1.1/konversation/src/dcctransferdetailedinfopanel.cpp 2008-08-06 18:56:27.000000000 +0300
@@ -27,6 +27,7 @@
#include <kprogress.h>
#include <krun.h>
#include <kurlrequester.h>
+#include <ksqueezedtextlabel.h>
DccTransferDetailedInfoPanel::DccTransferDetailedInfoPanel( QWidget* parent, const char* name )
--- konversation-1.1~-rc1+svn837068/konversation/src/dcctransferdetailedinfopanelui.ui 2008-07-23 22:28:26.000000000 +0300
+++ konversation-1.1/konversation/src/dcctransferdetailedinfopanelui.ui 2008-08-06 18:56:27.000000000 +0300
@@ -32,7 +32,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="1" column="1">
+ <widget class="KSqueezedTextLabel" row="1" column="1">
<property name="name">
<cstring>m_labelFilename</cstring>
</property>
@@ -485,6 +485,7 @@
<includehints>
<includehint>kprogress.h</includehint>
<includehint>kurlrequester.h</includehint>
+ <includehint>ksqueezedtextlabel.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
</includehints>
--- konversation-1.1~-rc1+svn837068/konversation/src/inputfilter.cpp 2008-07-23 22:28:26.000000000 +0300
+++ konversation-1.1/konversation/src/inputfilter.cpp 2008-08-06 18:56:27.000000000 +0300
@@ -243,9 +243,8 @@
else
{
// Do not internationalize the below version string
- reply = QString("Konversation %1 Build %2 (C) 2002-2008 by the Konversation team")
- .arg(QString(KONVI_VERSION))
- .arg(QString::number(COMMIT));
+ reply = QString("Konversation %1 (C) 2002-2008 by the Konversation team")
+ .arg(QString(KONVI_VERSION));
}
server->ctcpReply(sourceNick,"VERSION "+reply);
}
--- konversation-1.1~-rc1+svn837068/konversation/src/main.cpp 2008-07-23 22:28:26.000000000 +0300
+++ konversation-1.1/konversation/src/main.cpp 2008-08-06 18:56:27.000000000 +0300
@@ -24,9 +24,6 @@
#include "version.h"
#include "commit.h"
-#define HACKSTR(x) #x
-#define STRHACK(x) HACKSTR(x)
-
/*
Don't use i18n() here, use I18N_NOOP() instead!
i18n() will only work as soon as a kapplication object was made.
@@ -50,7 +47,7 @@
{
KAboutData aboutData("konversation",
I18N_NOOP("Konversation"),
- KONVI_VERSION " #" STRHACK(COMMIT),
+ KONVI_VERSION,
shortDescription,
KAboutData::License_GPL,
I18N_NOOP("(C) 2002-2008 by the Konversation team"),
--- konversation-1.1~-rc1+svn837068/konversation/src/version.h 2008-07-23 22:28:26.000000000 +0300
+++ konversation-1.1/konversation/src/version.h 2008-08-06 18:56:27.000000000 +0300
@@ -1,3 +1,3 @@
#ifndef KONVI_VERSION
-#define KONVI_VERSION "1.1rc1+"
+#define KONVI_VERSION "1.1"
#endif
--- konversation-1.1~-rc1+svn837068/subdirs 2008-07-23 22:39:35.000000000 +0300
+++ konversation-1.1/subdirs 2008-08-06 18:57:48.000000000 +0300
@@ -1,3 +1,3 @@
doc
konversation
-translations
+po
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/addchannel.png and konversation-1.1/translations/es/doc/addchannel.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/addnetwork_co.png and konversation-1.1/translations/es/doc/addnetwork_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/addserver_co.png and konversation-1.1/translations/es/doc/addserver_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/channellist_screen_co.png and konversation-1.1/translations/es/doc/channellist_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/channel_screen_tour_co.png and konversation-1.1/translations/es/doc/channel_screen_tour_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/checkidentities.png and konversation-1.1/translations/es/doc/checkidentities.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/colorchooser_screen.png and konversation-1.1/translations/es/doc/colorchooser_screen.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/colorize.png and konversation-1.1/translations/es/doc/colorize.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/common/1.png and konversation-1.1/translations/es/doc/common/1.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/common/2.png and konversation-1.1/translations/es/doc/common/2.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/common/3.png and konversation-1.1/translations/es/doc/common/3.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/common/4.png and konversation-1.1/translations/es/doc/common/4.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/common/5.png and konversation-1.1/translations/es/doc/common/5.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/common/6.png and konversation-1.1/translations/es/doc/common/6.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/common/7.png and konversation-1.1/translations/es/doc/common/7.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/common/8.png and konversation-1.1/translations/es/doc/common/8.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/common/9.png and konversation-1.1/translations/es/doc/common/9.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/configure.png and konversation-1.1/translations/es/doc/configure.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/dccstatus_screen_co.png and konversation-1.1/translations/es/doc/dccstatus_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/first_channel_co.png and konversation-1.1/translations/es/doc/first_channel_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/first_serverlist_co.png and konversation-1.1/translations/es/doc/first_serverlist_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/highlighting_screen_co.png and konversation-1.1/translations/es/doc/highlighting_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/identities_adv_co.png and konversation-1.1/translations/es/doc/identities_adv_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/identities_away_co.png and konversation-1.1/translations/es/doc/identities_away_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/identities_gen_co.png and konversation-1.1/translations/es/doc/identities_gen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/irc_admin.png and konversation-1.1/translations/es/doc/irc_admin.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/irc_away.png and konversation-1.1/translations/es/doc/irc_away.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/irc_halfop.png and konversation-1.1/translations/es/doc/irc_halfop.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/irc_normal.png and konversation-1.1/translations/es/doc/irc_normal.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/irc_op.png and konversation-1.1/translations/es/doc/irc_op.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/irc_owner.png and konversation-1.1/translations/es/doc/irc_owner.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/irc_voice.png and konversation-1.1/translations/es/doc/irc_voice.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/kaddressbook.png and konversation-1.1/translations/es/doc/kaddressbook.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/kimproxy_create_screen2.png and konversation-1.1/translations/es/doc/kimproxy_create_screen2.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/kimproxy_create_screen_co.png and konversation-1.1/translations/es/doc/kimproxy_create_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/led_blue_off.png and konversation-1.1/translations/es/doc/led_blue_off.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/led_blue_on.png and konversation-1.1/translations/es/doc/led_blue_on.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/led_green_off.png and konversation-1.1/translations/es/doc/led_green_off.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/led_green_on.png and konversation-1.1/translations/es/doc/led_green_on.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/led_yellow_off.png and konversation-1.1/translations/es/doc/led_yellow_off.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/led_yellow_on.png and konversation-1.1/translations/es/doc/led_yellow_on.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/led_red_off.png and konversation-1.1/translations/es/doc/led_red_off.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/led_red_on.png and konversation-1.1/translations/es/doc/led_red_on.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/logviewer_co.png and konversation-1.1/translations/es/doc/logviewer_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/nicksonline_co.png and konversation-1.1/translations/es/doc/nicksonline_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/nickthemes_screen_co.png and konversation-1.1/translations/es/doc/nickthemes_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/notification_screen_co.png and konversation-1.1/translations/es/doc/notification_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/notifylist_screen_co.png and konversation-1.1/translations/es/doc/notifylist_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/osd_demo.png and konversation-1.1/translations/es/doc/osd_demo.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/osd_screen_co.png and konversation-1.1/translations/es/doc/osd_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/quickbuttons_screen.png and konversation-1.1/translations/es/doc/quickbuttons_screen.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/quickconnect_screen.png and konversation-1.1/translations/es/doc/quickconnect_screen.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/serverlist_co.png and konversation-1.1/translations/es/doc/serverlist_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/urlcatcher_screen_co.png and konversation-1.1/translations/es/doc/urlcatcher_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/es/doc/webbrowser_screen_co.png and konversation-1.1/translations/es/doc/webbrowser_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/it/doc/addchannel.png and konversation-1.1/translations/it/doc/addchannel.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/it/doc/addnetwork_co.png and konversation-1.1/translations/it/doc/addnetwork_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/it/doc/addserver_co.png and konversation-1.1/translations/it/doc/addserver_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/it/doc/channellist_screen_co.png and konversation-1.1/translations/it/doc/channellist_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/it/doc/channel_screen_tour_co.png and konversation-1.1/translations/it/doc/channel_screen_tour_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/it/doc/checkidentities.png and konversation-1.1/translations/it/doc/checkidentities.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/it/doc/colorchooser_screen.png and konversation-1.1/translations/it/doc/colorchooser_screen.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/it/doc/first_channel_co.png and konversation-1.1/translations/it/doc/first_channel_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/it/doc/first_serverlist_co.png and konversation-1.1/translations/it/doc/first_serverlist_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/it/doc/identities_adv_co.png and konversation-1.1/translations/it/doc/identities_adv_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/it/doc/identities_away_co.png and konversation-1.1/translations/it/doc/identities_away_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/it/doc/identities_gen_co.png and konversation-1.1/translations/it/doc/identities_gen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/it/doc/nicksonline_co.png and konversation-1.1/translations/it/doc/nicksonline_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/it/doc/notification_screen_co.png and konversation-1.1/translations/it/doc/notification_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/it/doc/notifylist_screen_co.png and konversation-1.1/translations/it/doc/notifylist_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/it/doc/osd_demo.png and konversation-1.1/translations/it/doc/osd_demo.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/it/doc/osd_screen_co.png and konversation-1.1/translations/it/doc/osd_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/it/doc/quickbuttons_screen.png and konversation-1.1/translations/it/doc/quickbuttons_screen.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/it/doc/quickconnect_screen.png and konversation-1.1/translations/it/doc/quickconnect_screen.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/it/doc/serverlist_co.png and konversation-1.1/translations/it/doc/serverlist_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/nl/doc/addchannel.png and konversation-1.1/translations/nl/doc/addchannel.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/nl/doc/addnetwork_co.png and konversation-1.1/translations/nl/doc/addnetwork_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/nl/doc/addserver_co.png and konversation-1.1/translations/nl/doc/addserver_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/nl/doc/channellist_screen_co.png and konversation-1.1/translations/nl/doc/channellist_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/nl/doc/channel_screen_tour_co.png and konversation-1.1/translations/nl/doc/channel_screen_tour_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/nl/doc/checkidentities.png and konversation-1.1/translations/nl/doc/checkidentities.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/nl/doc/colorchooser_screen.png and konversation-1.1/translations/nl/doc/colorchooser_screen.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/nl/doc/dccstatus_screen_co.png and konversation-1.1/translations/nl/doc/dccstatus_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/nl/doc/first_channel_co.png and konversation-1.1/translations/nl/doc/first_channel_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/nl/doc/first_serverlist_co.png and konversation-1.1/translations/nl/doc/first_serverlist_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/nl/doc/identities_adv_co.png and konversation-1.1/translations/nl/doc/identities_adv_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/nl/doc/identities_away_co.png and konversation-1.1/translations/nl/doc/identities_away_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/nl/doc/identities_gen_co.png and konversation-1.1/translations/nl/doc/identities_gen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/nl/doc/kimproxy_create_screen2.png and konversation-1.1/translations/nl/doc/kimproxy_create_screen2.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/nl/doc/kimproxy_create_screen_co.png and konversation-1.1/translations/nl/doc/kimproxy_create_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/nl/doc/logviewer_co.png and konversation-1.1/translations/nl/doc/logviewer_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/nl/doc/nicksonline_co.png and konversation-1.1/translations/nl/doc/nicksonline_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/nl/doc/notification_screen_co.png and konversation-1.1/translations/nl/doc/notification_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/nl/doc/notifylist_screen_co.png and konversation-1.1/translations/nl/doc/notifylist_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/nl/doc/osd_screen_co.png and konversation-1.1/translations/nl/doc/osd_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/nl/doc/quickbuttons_screen.png and konversation-1.1/translations/nl/doc/quickbuttons_screen.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/nl/doc/quickconnect_screen.png and konversation-1.1/translations/nl/doc/quickconnect_screen.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/nl/doc/serverlist_co.png and konversation-1.1/translations/nl/doc/serverlist_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/nl/doc/urlcatcher_screen_co.png and konversation-1.1/translations/nl/doc/urlcatcher_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/nl/doc/webbrowser_screen_co.png and konversation-1.1/translations/nl/doc/webbrowser_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/sv/doc/addchannel.png and konversation-1.1/translations/sv/doc/addchannel.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/sv/doc/addnetwork_co.png and konversation-1.1/translations/sv/doc/addnetwork_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/sv/doc/addserver_co.png and konversation-1.1/translations/sv/doc/addserver_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/sv/doc/channellist_screen_co.png and konversation-1.1/translations/sv/doc/channellist_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/sv/doc/channel_screen_tour_co.png and konversation-1.1/translations/sv/doc/channel_screen_tour_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/sv/doc/checkidentities.png and konversation-1.1/translations/sv/doc/checkidentities.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/sv/doc/colorchooser_screen.png and konversation-1.1/translations/sv/doc/colorchooser_screen.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/sv/doc/dccstatus_screen_co.png and konversation-1.1/translations/sv/doc/dccstatus_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/sv/doc/first_channel_co.png and konversation-1.1/translations/sv/doc/first_channel_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/sv/doc/first_serverlist_co.png and konversation-1.1/translations/sv/doc/first_serverlist_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/sv/doc/highlighting_screen_co.png and konversation-1.1/translations/sv/doc/highlighting_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/sv/doc/identities_adv_co.png and konversation-1.1/translations/sv/doc/identities_adv_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/sv/doc/identities_away_co.png and konversation-1.1/translations/sv/doc/identities_away_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/sv/doc/identities_gen_co.png and konversation-1.1/translations/sv/doc/identities_gen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/sv/doc/kimproxy_create_screen2.png and konversation-1.1/translations/sv/doc/kimproxy_create_screen2.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/sv/doc/kimproxy_create_screen_co.png and konversation-1.1/translations/sv/doc/kimproxy_create_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/sv/doc/logviewer_co.png and konversation-1.1/translations/sv/doc/logviewer_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/sv/doc/nicksonline_co.png and konversation-1.1/translations/sv/doc/nicksonline_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/sv/doc/nickthemes_screen_co.png and konversation-1.1/translations/sv/doc/nickthemes_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/sv/doc/notification_screen_co.png and konversation-1.1/translations/sv/doc/notification_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/sv/doc/notifylist_screen_co.png and konversation-1.1/translations/sv/doc/notifylist_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/sv/doc/osd_demo.png and konversation-1.1/translations/sv/doc/osd_demo.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/sv/doc/osd_screen_co.png and konversation-1.1/translations/sv/doc/osd_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/sv/doc/quickbuttons_screen.png and konversation-1.1/translations/sv/doc/quickbuttons_screen.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/sv/doc/quickconnect_screen.png and konversation-1.1/translations/sv/doc/quickconnect_screen.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/sv/doc/serverlist_co.png and konversation-1.1/translations/sv/doc/serverlist_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/sv/doc/urlcatcher_screen_co.png and konversation-1.1/translations/sv/doc/urlcatcher_screen_co.png differ
Binary files konversation-1.1~-rc1+svn837068/translations/sv/doc/webbrowser_screen_co.png and konversation-1.1/translations/sv/doc/webbrowser_screen_co.png differ
--- konversation-1.1~-rc1+svn837068/VERSION 1970-01-01 03:00:00.000000000 +0300
+++ konversation-1.1/VERSION 2008-08-06 18:57:48.000000000 +0300
@@ -0,0 +1 @@
+konversation version 1.1
diff -u konversation-1.1~-rc1+svn837068/debian/changelog konversation-1.1/debian/changelog
--- konversation-1.1~-rc1+svn837068/debian/changelog
+++ konversation-1.1/debian/changelog
@@ -1,3 +1,13 @@
+konversation (1.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Minor updates to konversation.install file (translations).
+ * Refresh 17_add_extra_version_string.diff patch (STRHACK was removed from
+ the final 1.1 release, readd).
+ * Regenerate 98_buildprep.diff.
+
+ -- Modestas Vainius <modestas@vainius.eu> Mon, 11 Aug 2008 13:08:48 +0300
+
konversation (1.1~-rc1+svn837068-1) unstable; urgency=medium
* New upstream development snapshot (1.1rc1+ #3235):
diff -u konversation-1.1~-rc1+svn837068/debian/konversation.install konversation-1.1/debian/konversation.install
--- konversation-1.1~-rc1+svn837068/debian/konversation.install
+++ konversation-1.1/debian/konversation.install
@@ -8,10 +8,9 @@
debian/tmp/usr/share/config.kcfg/konversation.kcfg
debian/tmp/usr/share/doc/kde/HTML/da/konversation/*
debian/tmp/usr/share/doc/kde/HTML/en/konversation/*
-#debian/tmp/usr/share/doc/kde/HTML/es/konversation/*
+debian/tmp/usr/share/doc/kde/HTML/es/konversation/*
debian/tmp/usr/share/doc/kde/HTML/et/konversation/*
debian/tmp/usr/share/doc/kde/HTML/it/konversation/*
-debian/tmp/usr/share/doc/kde/HTML/nl/konversation/*
debian/tmp/usr/share/doc/kde/HTML/pt/konversation/*
debian/tmp/usr/share/doc/kde/HTML/ru/konversation/*
debian/tmp/usr/share/doc/kde/HTML/sv/konversation/*
diff -u konversation-1.1~-rc1+svn837068/debian/patches/17_add_extra_version_string.diff konversation-1.1/debian/patches/17_add_extra_version_string.diff
--- konversation-1.1~-rc1+svn837068/debian/patches/17_add_extra_version_string.diff
+++ konversation-1.1/debian/patches/17_add_extra_version_string.diff
@@ -1,27 +1,31 @@
--- a/konversation/src/main.cpp
+++ b/konversation/src/main.cpp
-@@ -28,6 +28,15 @@
- #define STRHACK(x) HACKSTR(x)
+@@ -24,6 +24,19 @@
+ #include "version.h"
+ #include "commit.h"
- /*
++#define HACKSTR(x) #x
++#define STRHACK(x) HACKSTR(x)
++
++/*
+ Add extra version string (if any) to the about dialog
+*/
++
+#ifdef EXTRA_VERSION_STRING
+# define _EXTRA_VERSION_STRING " " STRHACK(EXTRA_VERSION_STRING)
+#else
+# define _EXTRA_VERSION_STRING ""
+#endif
+
-+/*
+ /*
Don't use i18n() here, use I18N_NOOP() instead!
i18n() will only work as soon as a kapplication object was made.
- */
-@@ -50,7 +59,7 @@
+@@ -47,7 +60,7 @@
{
KAboutData aboutData("konversation",
I18N_NOOP("Konversation"),
-- KONVI_VERSION " #" STRHACK(COMMIT),
-+ KONVI_VERSION " #" STRHACK(COMMIT) _EXTRA_VERSION_STRING,
+- KONVI_VERSION,
++ KONVI_VERSION _EXTRA_VERSION_STRING,
shortDescription,
KAboutData::License_GPL,
I18N_NOOP("(C) 2002-2008 by the Konversation team"),
diff -u konversation-1.1~-rc1+svn837068/debian/patches/98_buildprep.diff konversation-1.1/debian/patches/98_buildprep.diff
diff -u ktorrent-3.1.1+dfsg.1/debian/changelog ktorrent-3.1.2+dfsg.1/debian/changelog
--- ktorrent-3.1.1+dfsg.1/debian/changelog
+++ ktorrent-3.1.2+dfsg.1/debian/changelog
@@ -1,3 +1,12 @@
+ktorrent (3.1.2+dfsg.1-1) unstable; urgency=low
+
+ * New upstream bugfix release.
+ * Remove 01_arm_qreal_fixes.diff - merged upstream.
+ * Update other patches.
+ * Update ktorrent.install file.
+
+ -- Modestas Vainius <modestas@vainius.eu> Wed, 06 Aug 2008 18:39:28 +0300
+
ktorrent (3.1.1+dfsg.1-1) unstable; urgency=medium
* New upstream bugfix release.
diff -u ktorrent-3.1.1+dfsg.1/debian/ktorrent.install ktorrent-3.1.2+dfsg.1/debian/ktorrent.install
--- ktorrent-3.1.1+dfsg.1/debian/ktorrent.install
+++ ktorrent-3.1.2+dfsg.1/debian/ktorrent.install
@@ -10,12 +10,9 @@
debian/tmp/usr/lib/kde4/ktstatsplugin.so
debian/tmp/usr/lib/kde4/ktupnpplugin.so
debian/tmp/usr/lib/kde4/ktwebinterfaceplugin.so
-debian/tmp/usr/lib/libbtcore.so.7p
-debian/tmp/usr/lib/libbtcore.so.7p.0.0
-debian/tmp/usr/lib/libktcore.so.6
-debian/tmp/usr/lib/libktcore.so.6.1.0
-debian/tmp/usr/lib/libktupnp.so.3
-debian/tmp/usr/lib/libktupnp.so.3.2.0
+debian/tmp/usr/lib/libbtcore.so.*
+debian/tmp/usr/lib/libktcore.so.*
+debian/tmp/usr/lib/libktupnp.so.*
debian/tmp/usr/share/applications/kde4/ktorrent.desktop
debian/tmp/usr/share/icons/hicolor/*
debian/tmp/usr/share/kde4/apps/ktorrent/*
diff -u ktorrent-3.1.1+dfsg.1/debian/patches/97_fix_target_link_libraries.diff ktorrent-3.1.2+dfsg.1/debian/patches/97_fix_target_link_libraries.diff
--- ktorrent-3.1.1+dfsg.1/debian/patches/97_fix_target_link_libraries.diff
+++ ktorrent-3.1.2+dfsg.1/debian/patches/97_fix_target_link_libraries.diff
@@ -6,7 +6,7 @@
-target_link_libraries(ktcore ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} btcore ${KDE4_SOLID_LIBS} ${GMP_LIBRARIES})
+target_link_libraries(ktcore btcore ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} ${QT_QTNETWORK_LIBRARY})
- set_target_properties(ktcore PROPERTIES VERSION 6.1.0 SOVERSION 6 )
+ set_target_properties(ktcore PROPERTIES VERSION 6.2.0 SOVERSION 6 )
install(TARGETS ktcore ${INSTALL_TARGETS_DEFAULT_ARGS} )
--- a/libktupnp/CMakeLists.txt
diff -u ktorrent-3.1.1+dfsg.1/debian/patches/series ktorrent-3.1.2+dfsg.1/debian/patches/series
--- ktorrent-3.1.1+dfsg.1/debian/patches/series
+++ ktorrent-3.1.2+dfsg.1/debian/patches/series
@@ -1,4 +1,3 @@
-01_arm_qreal_fixes.diff
97_fix_target_link_libraries.diff
libbtcore/97_fix_link_interface_libraries.diff -p0
libbtcore/99_libbtcore_scramble_soname.diff -p0
reverted:
--- ktorrent-3.1.1+dfsg.1/debian/patches/01_arm_qreal_fixes.diff
+++ ktorrent-3.1.1+dfsg.1.orig/debian/patches/01_arm_qreal_fixes.diff
@@ -1,11 +0,0 @@
---- a/ktorrent/recommendedsettingsdlg.cpp
-+++ b/ktorrent/recommendedsettingsdlg.cpp
-@@ -155,7 +155,7 @@
- max_downloads = 1;
-
- max_conn_glob = qRound(qMin(pow(upload_rate*8,0.8)+50,900.0));
-- max_conn_tor = qRound(qMin(max_conn_glob * 1.2 / max_torrents,(qreal)max_conn_glob));
-+ max_conn_tor = qRound(qMin((qreal)(max_conn_glob * 1.2 / max_torrents),(qreal)max_conn_glob));
-
- m_max_upload->setText(QString("<b>%1</b>").arg(KBytesPerSecToString(max_upload_speed)));
- m_max_download->setText(QString("<b>%1</b>").arg(KBytesPerSecToString(max_download_speed)));
diff -u ktorrent-3.1.1+dfsg.1/debian/patches/libbtcore/99_libbtcore_scramble_soname.diff ktorrent-3.1.2+dfsg.1/debian/patches/libbtcore/99_libbtcore_scramble_soname.diff
--- ktorrent-3.1.1+dfsg.1/debian/patches/libbtcore/99_libbtcore_scramble_soname.diff
+++ ktorrent-3.1.2+dfsg.1/debian/patches/libbtcore/99_libbtcore_scramble_soname.diff
@@ -4,8 +4,8 @@
if(WIN32)
target_link_libraries(btcore ws2_32)
endif(WIN32)
--set_target_properties(btcore PROPERTIES VERSION 7.0.0 SOVERSION 7 )
-+set_target_properties(btcore PROPERTIES VERSION 7p.0.0 SOVERSION 7p )
+-set_target_properties(btcore PROPERTIES VERSION 7.1.0 SOVERSION 7 )
++set_target_properties(btcore PROPERTIES VERSION 7p.1.0 SOVERSION 7p )
install(TARGETS btcore ${INSTALL_TARGETS_DEFAULT_ARGS} )
set(net_HDR
diff -uNr ktorrent-3.1.1+dfsg.1/ChangeLog ktorrent-3.1.2+dfsg.1/ChangeLog
--- ktorrent-3.1.1+dfsg.1/ChangeLog 2008-07-12 14:53:30.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/ChangeLog 2008-08-05 18:59:57.000000000 +0300
@@ -1,3 +1,16 @@
+Changes in 3.1.2 :
+- Improved performance of GUI updates
+- Make sure app icon is set (mostly for windows)
+- Fix crash when clicking on clear search history button twice (167580)
+- Backported some improvements to download thread
+- Make sure cookies are not sent in http announces
+- Fix crash at startup which started happening since KDE 4.1
+- Fix problem causing massive memory usage (148385)
+- Fix issue causing Timer class to stop working when day changes
+- Make sure toolbar settings are restored properly
+- Fix compile error on arm architecture
+- Fixed some bugs in file deselection code
+
Changes in 3.1.1 :
- Fix wrong icon name in PeerView for encrypted peers
- If speed is very low, don't show speed in PeerView
--- ktorrent-3.1.1+dfsg.1/ideal/mainwindow.cpp 2008-07-12 14:53:30.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/ideal/mainwindow.cpp 2008-08-05 18:59:57.000000000 +0300
@@ -54,6 +54,7 @@
void MainWindow::loadState(KSharedConfigPtr cfg)
{
+ setAutoSaveSettings("MainWindow",false);
KConfigGroup config = cfg->group("WindowStatus");
QSize size = config.readEntry("size",QSize());
QPoint pos = config.readEntry("position",QPoint());
@@ -79,6 +80,7 @@
void MainWindow::saveState(KSharedConfigPtr cfg)
{
+ saveMainWindowSettings(cfg->group("MainWindow"));
KConfigGroup config = cfg->group("WindowStatus");
config.writeEntry("size",size());
config.writeEntry("position",pos());
diff -uNr ktorrent-3.1.1+dfsg.1/ktorrent/app.cpp ktorrent-3.1.2+dfsg.1/ktorrent/app.cpp
--- ktorrent-3.1.1+dfsg.1/ktorrent/app.cpp 2008-07-12 14:53:30.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/ktorrent/app.cpp 2008-08-05 18:59:56.000000000 +0300
@@ -34,7 +34,9 @@
GUI* App::main_widget = 0;
App::App() : KUniqueApplication()
- {}
+ {
+ setQuitOnLastWindowClosed(true);
+ }
App::~App()
{}
@@ -47,7 +49,6 @@
if (!main_widget)
{
bt::InitLog(kt::DataDir() + "log",true);
- setQuitOnLastWindowClosed(false);
widget = new kt::GUI();
setTopWidget(widget);
main_widget = widget;
diff -uNr ktorrent-3.1.1+dfsg.1/ktorrent/CMakeLists.txt ktorrent-3.1.2+dfsg.1/ktorrent/CMakeLists.txt
--- ktorrent-3.1.1+dfsg.1/ktorrent/CMakeLists.txt 2008-07-12 14:53:30.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/ktorrent/CMakeLists.txt 2008-08-05 18:59:56.000000000 +0300
@@ -59,6 +59,8 @@
recommendedsettingsdlg.ui
)
+kde4_add_app_icon(ktorrent_SRC "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-app-ktorrent.png")
+
kde4_add_executable(ktorrent ${ktorrent_SRC})
target_link_libraries(ktorrent ktideal ktcore ${KDE4_KDEUI_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS})
diff -uNr ktorrent-3.1.1+dfsg.1/ktorrent/main.cpp ktorrent-3.1.2+dfsg.1/ktorrent/main.cpp
--- ktorrent-3.1.1+dfsg.1/ktorrent/main.cpp 2008-07-12 14:53:30.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/ktorrent/main.cpp 2008-08-05 18:59:56.000000000 +0300
@@ -69,10 +69,12 @@
int main(int argc, char **argv)
{
+#ifndef Q_WS_WIN
// ignore SIGPIPE and SIGXFSZ
signal(SIGPIPE,SIG_IGN);
signal(SIGXFSZ,SIG_IGN);
-
+#endif
+
bt::SetClientInfo("KTorrent",kt::MAJOR,kt::MINOR,kt::RELEASE,bt::NORMAL,"KT");
KAboutData about(
diff -uNr ktorrent-3.1.1+dfsg.1/ktorrent/recommendedsettingsdlg.cpp ktorrent-3.1.2+dfsg.1/ktorrent/recommendedsettingsdlg.cpp
--- ktorrent-3.1.1+dfsg.1/ktorrent/recommendedsettingsdlg.cpp 2008-07-12 14:53:30.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/ktorrent/recommendedsettingsdlg.cpp 2008-08-05 18:59:56.000000000 +0300
@@ -155,7 +155,7 @@
max_downloads = 1;
max_conn_glob = qRound(qMin(pow(upload_rate*8,0.8)+50,900.0));
- max_conn_tor = qRound(qMin(max_conn_glob * 1.2 / max_torrents,(qreal)max_conn_glob));
+ max_conn_tor = qRound(qMin((qreal)(max_conn_glob * 1.2 / max_torrents),(qreal)max_conn_glob));
m_max_upload->setText(QString("<b>%1</b>").arg(KBytesPerSecToString(max_upload_speed)));
m_max_download->setText(QString("<b>%1</b>").arg(KBytesPerSecToString(max_download_speed)));
diff -uNr ktorrent-3.1.1+dfsg.1/ktorrent/recommendedsettingsdlg.ui ktorrent-3.1.2+dfsg.1/ktorrent/recommendedsettingsdlg.ui
--- ktorrent-3.1.1+dfsg.1/ktorrent/recommendedsettingsdlg.ui 2008-07-12 14:53:30.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/ktorrent/recommendedsettingsdlg.ui 2008-08-05 18:59:56.000000000 +0300
@@ -265,48 +265,65 @@
<property name="title" >
<string>Queue Manager</string>
</property>
- <layout class="QFormLayout" name="formLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="label_6" >
- <property name="text" >
- <string>Number of upload slots:</string>
+ <layout class="QVBoxLayout" name="verticalLayout_3" >
+ <item>
+ <layout class="QGridLayout" name="gridLayout_4" >
+ <item row="0" column="0" >
+ <widget class="QLabel" name="label_6" >
+ <property name="text" >
+ <string>Number of upload slots:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QLabel" name="m_upload_slots" >
+ <property name="text" >
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="label_14" >
+ <property name="text" >
+ <string>Maximum downloads:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="QLabel" name="m_max_downloads" >
+ <property name="text" >
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" >
+ <widget class="QLabel" name="label_17" >
+ <property name="text" >
+ <string>Maximum seeds:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" >
+ <widget class="QLabel" name="m_max_seeds" >
+ <property name="text" >
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_2" >
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>20</width>
+ <height>12</height>
+ </size>
</property>
- </widget>
- </item>
- <item row="0" column="1" >
- <widget class="QLabel" name="m_upload_slots" >
- <property name="text" >
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0" >
- <widget class="QLabel" name="label_14" >
- <property name="text" >
- <string>Maximum downloads:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="QLabel" name="m_max_downloads" >
- <property name="text" >
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0" >
- <widget class="QLabel" name="label_17" >
- <property name="text" >
- <string>Maximum seeds:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1" >
- <widget class="QLabel" name="m_max_seeds" >
- <property name="text" >
- <string>TextLabel</string>
- </property>
- </widget>
+ </spacer>
</item>
</layout>
</widget>
diff -uNr ktorrent-3.1.1+dfsg.1/ktorrent/viewmodel.cpp ktorrent-3.1.2+dfsg.1/ktorrent/viewmodel.cpp
--- ktorrent-3.1.1+dfsg.1/ktorrent/viewmodel.cpp 2008-07-12 14:53:30.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/ktorrent/viewmodel.cpp 2008-08-05 18:59:56.000000000 +0300
@@ -72,42 +72,36 @@
{
ret = true;
status = s.status;
- mdl->emitDataChanged(row,1);
}
if (bytes_downloaded != s.bytes_downloaded)
{
ret = true;
bytes_downloaded = s.bytes_downloaded;
- mdl->emitDataChanged(row,2);
}
if (total_bytes_to_download != s.total_bytes_to_download)
{
ret = true;
total_bytes_to_download = s.total_bytes_to_download;
- mdl->emitDataChanged(row,3);
}
if (bytes_uploaded != s.bytes_uploaded)
{
ret = true;
bytes_uploaded = s.bytes_uploaded;
- mdl->emitDataChanged(row,4);
}
if (download_rate != s.download_rate)
{
ret = true;
download_rate = s.download_rate;
- mdl->emitDataChanged(row,5);
}
if (upload_rate != s.upload_rate)
{
ret = true;
upload_rate = s.upload_rate;
- mdl->emitDataChanged(row,6);
}
int neta = ETA(s,tc);
@@ -115,7 +109,6 @@
{
ret = true;
eta = neta;
- mdl->emitDataChanged(row,7);
}
if (seeders_connected_to != s.seeders_connected_to || seeders_total != s.seeders_total)
@@ -123,7 +116,6 @@
ret = true;
seeders_connected_to = s.seeders_connected_to;
seeders_total = s.seeders_total;
- mdl->emitDataChanged(row,8);
}
if (leechers_total != s.leechers_total || leechers_connected_to != s.leechers_connected_to)
@@ -131,7 +123,6 @@
ret = true;
leechers_total = s.leechers_total;
leechers_connected_to = s.leechers_connected_to;
- mdl->emitDataChanged(row,9);
}
double perc = Percentage(s);
@@ -139,7 +130,6 @@
{
ret = true;
percentage = perc;
- mdl->emitDataChanged(row,10);
}
float ratio = ShareRatio(s);
@@ -147,7 +137,6 @@
{
ret = true;
share_ratio = ratio;
- mdl->emitDataChanged(row,11);
}
Uint32 rdl = tc->getRunningTimeDL();
@@ -155,7 +144,6 @@
{
ret = true;
runtime_dl = rdl;
- mdl->emitDataChanged(row,12);
}
Uint32 rul = tc->getRunningTimeUL();
@@ -164,7 +152,6 @@
{
ret = true;
runtime_ul = rul;
- mdl->emitDataChanged(row,13);
}
return ret;
}
diff -uNr ktorrent-3.1.1+dfsg.1/libbtcore/btversion.h ktorrent-3.1.2+dfsg.1/libbtcore/btversion.h
--- ktorrent-3.1.1+dfsg.1/libbtcore/btversion.h 2008-07-12 14:53:28.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/libbtcore/btversion.h 2008-08-05 18:59:53.000000000 +0300
@@ -64,7 +64,7 @@
/// Version type of the BTCore library
const VersionType VERSION_TYPE = NORMAL;
/// Release version number of the BTCore library
- const Uint32 RELEASE = 1;
+ const Uint32 RELEASE = 2;
}
#endif
diff -uNr ktorrent-3.1.1+dfsg.1/libbtcore/CMakeLists.txt ktorrent-3.1.2+dfsg.1/libbtcore/CMakeLists.txt
--- ktorrent-3.1.1+dfsg.1/libbtcore/CMakeLists.txt 2008-07-12 14:53:28.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/libbtcore/CMakeLists.txt 2008-08-06 18:40:33.000000000 +0300
@@ -185,7 +185,7 @@
if(WIN32)
target_link_libraries(btcore ws2_32)
endif(WIN32)
-set_target_properties(btcore PROPERTIES VERSION 7.0.0 SOVERSION 7 )
+set_target_properties(btcore PROPERTIES VERSION 7.1.0 SOVERSION 7 )
install(TARGETS btcore ${INSTALL_TARGETS_DEFAULT_ARGS} )
set(net_HDR
diff -uNr ktorrent-3.1.1+dfsg.1/libbtcore/diskio/chunkmanager.cpp ktorrent-3.1.2+dfsg.1/libbtcore/diskio/chunkmanager.cpp
--- ktorrent-3.1.1+dfsg.1/libbtcore/diskio/chunkmanager.cpp 2008-07-12 14:53:27.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/libbtcore/diskio/chunkmanager.cpp 2008-08-05 18:59:50.000000000 +0300
@@ -243,6 +243,7 @@
if (check_priority)
{
+ during_load = true; // for performance reasons
for (Uint32 i = 0;i < tor.getNumFiles();i++)
{
TorrentFile & tf = tor.getFile(i);
@@ -254,6 +255,8 @@
downloadPriorityChanged(&tf,tf.getPriority(),tf.getOldPriority());
}
}
+ during_load = false;
+ savePriorityInfo();
}
}
@@ -310,7 +313,7 @@
{
// load the chunk if it is on disk
cache->load(c);
- loaded.insert(i,bt::GetCurrentTime());
+ loaded[i] = bt::GetCurrentTime();
bool check_allowed = do_data_check && (max_chunk_size_for_data_check == 0 || tor.getChunkSize() <= max_chunk_size_for_data_check);
// when no corruptions have been found, only check once every 5 chunks
@@ -339,8 +342,12 @@
recheck_counter++;
}
}
+ else
+ {
+ // update timestamp
+ loaded[i] = bt::GetCurrentTime();
+ }
- loaded.insert(i,bt::GetCurrentTime());
return c;
}
@@ -390,9 +397,7 @@
cache->save(c);
c->clear();
c->setStatus(Chunk::ON_DISK);
- QMap<Uint32,TimeStamp>::iterator j = i;
- i++;
- loaded.erase(j);
+ i = loaded.erase(i);
num_removed++;
}
else
@@ -837,10 +842,19 @@
else
{
// check for exceptional case which causes very long loops
- if (first == last && !isBorderChunk(first))
+ // check for exceptional case which causes very long loops
+ if (first == last)
{
- resetChunk(first);
- exclude(first,first);
+ if (!isBorderChunk(first))
+ {
+ resetChunk(first);
+ exclude(first,first);
+ }
+ else
+ {
+ if (resetBorderChunk(last,tf)) // try resetting it
+ exclude(first,last);
+ }
cache->downloadStatusChanged(tf,download);
savePriorityInfo();
return;
diff -uNr ktorrent-3.1.1+dfsg.1/libbtcore/diskio/multifilecache.cpp ktorrent-3.1.2+dfsg.1/libbtcore/diskio/multifilecache.cpp
--- ktorrent-3.1.1+dfsg.1/libbtcore/diskio/multifilecache.cpp 2008-07-12 14:53:27.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/libbtcore/diskio/multifilecache.cpp 2008-08-05 18:59:50.000000000 +0300
@@ -356,11 +356,7 @@
MakeFilePath(dtmp + fpath); // make DND dir
// then make the file
- if (dnd)
- {
- bt::Touch(tmpdir + "dnd" + bt::DirSeparator() + fpath);
- }
- else
+ if (!dnd)
{
MakeFilePath(tf.getPathOnDisk());
if (!bt::Exists(tf.getPathOnDisk()))
diff -uNr ktorrent-3.1.1+dfsg.1/libbtcore/mse/streamsocket.cpp ktorrent-3.1.2+dfsg.1/libbtcore/mse/streamsocket.cpp
--- ktorrent-3.1.1+dfsg.1/libbtcore/mse/streamsocket.cpp 2008-07-12 14:53:27.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/libbtcore/mse/streamsocket.cpp 2008-08-05 18:59:51.000000000 +0300
@@ -34,6 +34,7 @@
#endif
#include <netinet/tcp.h>
#include <net/socketmonitor.h>
+#include <util/functions.h>
#include "rc4encryptor.h"
using namespace bt;
@@ -331,6 +332,11 @@
{
sock->setRemoteAddress(addr);
}
+
+ void StreamSocket::updateSpeeds()
+ {
+ sock->updateSpeeds(bt::GetCurrentTime());
+ }
}
#include "streamsocket.moc"
diff -uNr ktorrent-3.1.1+dfsg.1/libbtcore/mse/streamsocket.h ktorrent-3.1.2+dfsg.1/libbtcore/mse/streamsocket.h
--- ktorrent-3.1.1+dfsg.1/libbtcore/mse/streamsocket.h 2008-07-12 14:53:27.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/libbtcore/mse/streamsocket.h 2008-08-05 18:59:51.000000000 +0300
@@ -59,6 +59,9 @@
StreamSocket(int fd,int ip_version);
virtual ~StreamSocket();
+ /// Recalculate upload and download speed
+ void updateSpeeds();
+
/**
* Send a chunk of data. (Does not encrypt the data)
* @param data The data
diff -uNr ktorrent-3.1.1+dfsg.1/libbtcore/net/bufferedsocket.cpp ktorrent-3.1.2+dfsg.1/libbtcore/net/bufferedsocket.cpp
--- ktorrent-3.1.1+dfsg.1/libbtcore/net/bufferedsocket.cpp 2008-07-12 14:53:27.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/libbtcore/net/bufferedsocket.cpp 2008-08-05 18:59:51.000000000 +0300
@@ -198,7 +198,9 @@
void BufferedSocket::updateSpeeds(bt::TimeStamp now)
{
+ mutex.lock();
up_speed->update(now);
down_speed->update(now);
+ mutex.unlock();
}
}
diff -uNr ktorrent-3.1.1+dfsg.1/libbtcore/net/downloadthread.cpp ktorrent-3.1.2+dfsg.1/libbtcore/net/downloadthread.cpp
--- ktorrent-3.1.1+dfsg.1/libbtcore/net/downloadthread.cpp 2008-07-12 14:53:27.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/libbtcore/net/downloadthread.cpp 2008-08-05 18:59:51.000000000 +0300
@@ -26,6 +26,7 @@
#include <util/mingw.h>
#endif
#include <util/functions.h>
+#include <util/log.h>
#include "socketgroup.h"
#include "socketmonitor.h"
#include "bufferedsocket.h"
@@ -35,7 +36,7 @@
namespace net
{
Uint32 DownloadThread::dcap = 0;
- Uint32 DownloadThread::sleep_time = 3;
+ Uint32 DownloadThread::sleep_time = 50;
DownloadThread::DownloadThread(SocketMonitor* sm) : NetworkThread(sm)
{
@@ -47,17 +48,9 @@
void DownloadThread::update()
{
- sm->lock();
- int num = fillPollVector();
- sm->unlock();
-
- int timeout = 10;
-#ifndef Q_WS_WIN
- if (poll(&fd_vec[0],num,timeout) > 0)
-#else
- if (mingw_poll(&fd_vec[0],num,timeout) > 0)
-#endif
+ if (waitForSocketReady(sleep_time) > 0)
{
+ bool group_limits = false;
sm->lock();
TimeStamp now = bt::Now();
Uint32 num_ready = 0;
@@ -65,36 +58,66 @@
while (itr != sm->end())
{
BufferedSocket* s = *itr;
+ if (!s->ok())
+ {
+ itr++;
+ continue;
+ }
+
int pi = s->getPollIndex();
- if (pi >= 0 && s->ok() && fd_vec[pi].revents & POLLIN)
+ bool ready = false;
+ if (pi >= 0)
+ ready = fd_vec[pi].revents & POLLIN;
+ else
+ ready = s->bytesAvailable() > 0;
+
+ if (ready)
{
// add to the correct group
Uint32 gid = s->downloadGroupID();
+ if (gid > 0)
+ group_limits = true;
+
SocketGroup* g = groups.find(gid);
if (!g)
g = groups.find(0);
-
+
g->add(s);
num_ready++;
}
itr++;
}
-
+
if (num_ready > 0)
doGroups(num_ready,now,dcap);
- prev_run_time = now;
sm->unlock();
+
+ // to prevent huge CPU usage sleep a bit if we are limited (either by a global limit or a group limit)
+ if (dcap > 0 || group_limits)
+ {
+ TimeStamp diff = now - prev_run_time;
+ if (diff < sleep_time)
+ msleep(sleep_time - diff);
+ }
+ prev_run_time = now;
}
-
- if (dcap > 0 || groups.count() > 0)
- msleep(sleep_time);
}
-
- int DownloadThread::fillPollVector()
+
+
+ void DownloadThread::setSleepTime(Uint32 stime)
+ {
+ sleep_time = stime;
+ }
+
+ bool DownloadThread::doGroup(SocketGroup* g,Uint32 & allowance,bt::TimeStamp now)
+ {
+ return g->download(allowance,now);
+ }
+
+ int DownloadThread::waitForSocketReady(int timeout)
{
- TimeStamp ts = bt::Now();
int i = 0;
-
+ sm->lock();
// fill the poll vector with all sockets
SocketMonitor::Itr itr = sm->begin();
while (itr != sm->end())
@@ -121,7 +144,6 @@
}
s->setPollIndex(i);
i++;
- s->updateSpeeds(ts);
}
else
{
@@ -129,18 +151,12 @@
}
itr++;
}
-
- return i;
- }
-
- void DownloadThread::setSleepTime(Uint32 stime)
- {
- if (stime >= 1 && stime <= 10)
- sleep_time = stime;
- }
+ sm->unlock();
- bool DownloadThread::doGroup(SocketGroup* g,Uint32 & allowance,bt::TimeStamp now)
- {
- return g->download(allowance,now);
+#ifndef Q_WS_WIN
+ return poll(&fd_vec[0],i,timeout);
+#else
+ return mingw_poll(&fd_vec[0],i,timeout);
+#endif
}
}
diff -uNr ktorrent-3.1.1+dfsg.1/libbtcore/net/downloadthread.h ktorrent-3.1.2+dfsg.1/libbtcore/net/downloadthread.h
--- ktorrent-3.1.1+dfsg.1/libbtcore/net/downloadthread.h 2008-07-12 14:53:27.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/libbtcore/net/downloadthread.h 2008-08-05 18:59:51.000000000 +0300
@@ -37,26 +37,22 @@
{
static bt::Uint32 dcap;
static bt::Uint32 sleep_time;
-
std::vector<struct pollfd> fd_vec;
-
public:
DownloadThread(SocketMonitor* sm);
virtual ~DownloadThread();
-
+
/// Set the download cap
static void setCap(bt::Uint32 cap) {dcap = cap;}
/// Set the sleep time when using download caps
static void setSleepTime(bt::Uint32 stime);
- private:
- int fillPollVector();
-
+ private:
virtual void update();
virtual bool doGroup(SocketGroup* g,Uint32 & allowance,bt::TimeStamp now);
-
-// void processIncomingData(bt::TimeStamp now);
+
+ int waitForSocketReady(int timeout);
};
}
diff -uNr ktorrent-3.1.1+dfsg.1/libbtcore/net/socket.cpp ktorrent-3.1.2+dfsg.1/libbtcore/net/socket.cpp
--- ktorrent-3.1.1+dfsg.1/libbtcore/net/socket.cpp 2008-07-12 14:53:27.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/libbtcore/net/socket.cpp 2008-08-05 18:59:51.000000000 +0300
@@ -100,7 +100,11 @@
if (m_fd >= 0)
{
shutdown(m_fd, SHUT_RDWR);
+#ifdef Q_WS_WIN
+ ::closesocket(m_fd);
+#else
::close(m_fd);
+#endif
}
}
@@ -109,7 +113,11 @@
if (m_fd >= 0)
{
shutdown(m_fd, SHUT_RDWR);
+#ifdef Q_WS_WIN
+ ::closesocket(m_fd);
+#else
::close(m_fd);
+#endif
m_fd = -1;
m_state = CLOSED;
}
diff -uNr ktorrent-3.1.1+dfsg.1/libbtcore/net/uploadthread.cpp ktorrent-3.1.2+dfsg.1/libbtcore/net/uploadthread.cpp
--- ktorrent-3.1.1+dfsg.1/libbtcore/net/uploadthread.cpp 2008-07-12 14:53:27.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/libbtcore/net/uploadthread.cpp 2008-08-05 18:59:51.000000000 +0300
@@ -29,7 +29,7 @@
namespace net
{
Uint32 UploadThread::ucap = 0;
- Uint32 UploadThread::sleep_time = 3;
+ Uint32 UploadThread::sleep_time = 50;
UploadThread::UploadThread(SocketMonitor* sm) : NetworkThread(sm)
{}
@@ -84,8 +84,7 @@
void UploadThread::setSleepTime(Uint32 stime)
{
- if (stime >= 1 && stime <= 10)
- sleep_time = stime;
+ sleep_time = stime;
}
bool UploadThread::doGroup(SocketGroup* g,Uint32 & allowance,bt::TimeStamp now)
diff -uNr ktorrent-3.1.1+dfsg.1/libbtcore/peer/peer.cpp ktorrent-3.1.2+dfsg.1/libbtcore/peer/peer.cpp
--- ktorrent-3.1.1+dfsg.1/libbtcore/peer/peer.cpp 2008-07-12 14:53:27.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/libbtcore/peer/peer.cpp 2008-08-05 18:59:52.000000000 +0300
@@ -464,6 +464,7 @@
return;
}
+ sock->updateSpeeds();
preader->update();
Uint32 data_bytes = pwriter->getUploadedDataBytes();
diff -uNr ktorrent-3.1.1+dfsg.1/libbtcore/torrent/torrentcontrol.h ktorrent-3.1.2+dfsg.1/libbtcore/torrent/torrentcontrol.h
--- ktorrent-3.1.1+dfsg.1/libbtcore/torrent/torrentcontrol.h 2008-07-12 14:53:28.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/libbtcore/torrent/torrentcontrol.h 2008-08-05 18:59:52.000000000 +0300
@@ -21,6 +21,7 @@
#ifndef BTTORRENTCONTROL_H
#define BTTORRENTCONTROL_H
+#include <qdatetime.h>
#include <qobject.h>
#include <qtimer.h>
#include <kurl.h>
diff -uNr ktorrent-3.1.1+dfsg.1/libbtcore/tracker/httptracker.cpp ktorrent-3.1.2+dfsg.1/libbtcore/tracker/httptracker.cpp
--- ktorrent-3.1.1+dfsg.1/libbtcore/tracker/httptracker.cpp 2008-07-12 14:53:27.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/libbtcore/tracker/httptracker.cpp 2008-08-05 18:59:52.000000000 +0300
@@ -453,7 +453,7 @@
{
md["UserAgent"] = bt::GetVersionString();
md["SendLanguageSettings"] = "false";
- md["Cookies"] = "none";
+ md["cookies"] = "none";
// md["accept"] = "text/plain";
md["accept"] = "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2";
if (proxy_on)
diff -uNr ktorrent-3.1.1+dfsg.1/libbtcore/util/timer.cpp ktorrent-3.1.2+dfsg.1/libbtcore/util/timer.cpp
--- ktorrent-3.1.1+dfsg.1/libbtcore/util/timer.cpp 2008-07-12 14:53:28.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/libbtcore/util/timer.cpp 2008-08-05 18:59:53.000000000 +0300
@@ -19,13 +19,14 @@
***************************************************************************/
#include "timer.h"
+#include "functions.h"
namespace bt
{
Timer::Timer() : elapsed(0)
{
- last = QTime::currentTime();
+ last = GetCurrentTime();
}
Timer::Timer(const Timer & t) : last(t.last),elapsed(t.elapsed)
@@ -37,22 +38,16 @@
void Timer::update()
{
- QTime now = QTime::currentTime();
-
- int d = last.msecsTo(now);
- if (d < 0)
- d = 0;
+ TimeStamp now = GetCurrentTime();
+ TimeStamp d = (now > last) ? now - last : 0;
elapsed = d;
last = now;
}
- Uint32 Timer::getElapsedSinceUpdate() const
+ TimeStamp Timer::getElapsedSinceUpdate() const
{
- QTime now = QTime::currentTime();
- int d = last.msecsTo(now);
- if (d < 0)
- d = 0;
- return d;
+ TimeStamp now = GetCurrentTime();
+ return (now > last) ? now - last : 0;
}
Timer & Timer::operator = (const Timer & t)
diff -uNr ktorrent-3.1.1+dfsg.1/libbtcore/util/timer.h ktorrent-3.1.2+dfsg.1/libbtcore/util/timer.h
--- ktorrent-3.1.1+dfsg.1/libbtcore/util/timer.h 2008-07-12 14:53:28.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/libbtcore/util/timer.h 2008-08-05 18:59:53.000000000 +0300
@@ -20,7 +20,7 @@
#ifndef BTTIMER_H
#define BTTIMER_H
-#include <qdatetime.h>
+#include <util/constants.h>
#include <btcore_export.h>
#include "constants.h"
@@ -32,16 +32,16 @@
*/
class BTCORE_EXPORT Timer
{
- QTime last;
- Uint32 elapsed;
+ TimeStamp last;
+ TimeStamp elapsed;
public:
Timer();
Timer(const Timer & t);
virtual ~Timer();
void update();
- Uint32 getElapsed() const {return elapsed;}
- Uint32 getElapsedSinceUpdate() const;
+ TimeStamp getElapsed() const {return elapsed;}
+ TimeStamp getElapsedSinceUpdate() const;
Timer & operator = (const Timer & t);
};
diff -uNr ktorrent-3.1.1+dfsg.1/libktcore/CMakeLists.txt ktorrent-3.1.2+dfsg.1/libktcore/CMakeLists.txt
--- ktorrent-3.1.1+dfsg.1/libktcore/CMakeLists.txt 2008-07-12 14:53:30.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/libktcore/CMakeLists.txt 2008-08-06 18:40:34.000000000 +0300
@@ -45,6 +45,6 @@
kde4_add_library(ktcore SHARED ${libktorrent_SRC})
target_link_libraries(ktcore ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} btcore ${KDE4_SOLID_LIBS} ${GMP_LIBRARIES})
-set_target_properties(ktcore PROPERTIES VERSION 6.1.0 SOVERSION 6 )
+set_target_properties(ktcore PROPERTIES VERSION 6.2.0 SOVERSION 6 )
install(TARGETS ktcore ${INSTALL_TARGETS_DEFAULT_ARGS} )
diff -uNr ktorrent-3.1.1+dfsg.1/libktcore/ktversion.h ktorrent-3.1.2+dfsg.1/libktcore/ktversion.h
--- ktorrent-3.1.1+dfsg.1/libktcore/ktversion.h 2008-07-12 14:53:30.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/libktcore/ktversion.h 2008-08-05 18:59:57.000000000 +0300
@@ -27,10 +27,10 @@
{
const bt::Uint32 MAJOR = 3;
const bt::Uint32 MINOR = 1;
- const bt::Uint32 RELEASE = 1;
- const char VERSION_STRING[] = "3.1.1";
+ const bt::Uint32 RELEASE = 2;
+ const char VERSION_STRING[] = "3.1.2";
}
-#define KT_VERSION_MACRO "3.1.1"
+#define KT_VERSION_MACRO "3.1.2"
#endif
diff -uNr ktorrent-3.1.1+dfsg.1/plugins/bwscheduler/bwprefpage.ui ktorrent-3.1.2+dfsg.1/plugins/bwscheduler/bwprefpage.ui
--- ktorrent-3.1.1+dfsg.1/plugins/bwscheduler/bwprefpage.ui 2008-07-12 14:53:25.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/plugins/bwscheduler/bwprefpage.ui 2008-08-05 18:59:47.000000000 +0300
@@ -15,7 +15,7 @@
<property name="title" >
<string>Colors</string>
</property>
- <layout class="QFormLayout" name="formLayout" >
+ <layout class="QGridLayout" name="gridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label_2" >
<property name="text" >
diff -uNr ktorrent-3.1.1+dfsg.1/plugins/infowidget/chunkdownloadmodel.cpp ktorrent-3.1.2+dfsg.1/plugins/infowidget/chunkdownloadmodel.cpp
--- ktorrent-3.1.1+dfsg.1/plugins/infowidget/chunkdownloadmodel.cpp 2008-07-12 14:53:24.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/plugins/infowidget/chunkdownloadmodel.cpp 2008-08-05 18:59:45.000000000 +0300
@@ -157,10 +157,7 @@
foreach (const Item & i,items)
{
if (i.changed())
- {
ret = true;
- emit dataChanged(createIndex(idx,1),createIndex(idx,4));
- }
idx++;
}
return ret;
diff -uNr ktorrent-3.1.1+dfsg.1/plugins/infowidget/peerviewmodel.cpp ktorrent-3.1.2+dfsg.1/plugins/infowidget/peerviewmodel.cpp
--- ktorrent-3.1.1+dfsg.1/plugins/infowidget/peerviewmodel.cpp 2008-07-12 14:53:24.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/plugins/infowidget/peerviewmodel.cpp 2008-08-05 18:59:45.000000000 +0300
@@ -230,10 +230,7 @@
foreach (const Item & i,items)
{
if (i.changed())
- {
ret = true;
- emit dataChanged(createIndex(idx,3),createIndex(idx,13));
- }
idx++;
}
return ret;
diff -uNr ktorrent-3.1.1+dfsg.1/plugins/search/searchtoolbar.cpp ktorrent-3.1.2+dfsg.1/plugins/search/searchtoolbar.cpp
--- ktorrent-3.1.1+dfsg.1/plugins/search/searchtoolbar.cpp 2008-07-12 14:53:24.000000000 +0300
+++ ktorrent-3.1.2+dfsg.1/plugins/search/searchtoolbar.cpp 2008-08-05 18:59:46.000000000 +0300
@@ -187,7 +187,7 @@
void SearchToolBar::clearHistory()
{
- bt::Delete(kt::DataDir() + "search_history");
+ bt::Delete(kt::DataDir() + "search_history",true);
KCompletion *comp = m_search_text->completionObject();
m_search_text->clear();
comp->clear();
Attachment:
signature.asc
Description: This is a digitally signed message part.