Hello community,
here is the log from the commit of package konversation
checked in at Tue Sep 16 17:40:26 CEST 2008.
--------
--- KDE/konversation/konversation.changes 2008-08-13 14:53:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/konversation/konversation.changes 2008-09-16 16:53:08.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Sep 16 16:52:57 CEST 2008 - stbinner@suse.de
+
+- add branch diff, fixes kde#171066
+
+-------------------------------------------------------------------
New:
----
1_1_BRANCH.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ konversation.spec ++++++
--- /var/tmp/diff_new_pack.d13893/_old 2008-09-16 17:39:33.000000000 +0200
+++ /var/tmp/diff_new_pack.d13893/_new 2008-09-16 17:39:33.000000000 +0200
@@ -26,7 +26,7 @@
Group: Productivity/Networking/IRC
AutoReqProv: on
Version: 1.1
-Release: 1
+Release: 17
Summary: A User-Friendly IRC Client for KDE 3
Source: konversation-%version.tar.bz2
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`)
@@ -34,6 +34,8 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Patch1: default-channel-suse.diff
Patch2: bnc-autoreplace.diff
+# svn diff svn://anonsvn.kde.org/home/kde/tags/konversation/1.1 svn://anonsvn.kde.org/home/kde/branches/extragear/kde3/network/konversation
+Patch3: 1_1_BRANCH.diff
%description
Konversation is a user-friendly IRC client for KDE 3.x.
@@ -59,6 +61,7 @@
%setup -q
%patch1
%patch2
+%patch3
. /etc/opt/kde3/common_options
update_admin
@@ -95,6 +98,8 @@
/usr/share/kde4/services/*
%changelog
+* Tue Sep 16 2008 stbinner@suse.de
+- add branch diff, fixes kde#171066
* Wed Aug 13 2008 jreuter@suse.de
- Update to version 1.1
* Rewritten connection handling (robustness and correctness impro-
++++++ 1_1_BRANCH.diff ++++++
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,23 @@
+Changes since 1.1:
+* Enabled the (experimental, hackish) Amarok 2 support in the 'media' script.
+* Fixed a bug that could cause channel notifications to be lost across recon-
+ nects.
+* Removed the code to recreate hidden-to-tray state across application re-
+ starts. It was broken after the shutdown procedures were moved to a point
+ in time after after the main window is hidden to cover quit-by-DCOP, and
+ Konversation 1.1 features an explicit hidden startup option that fulfills
+ user demands more accurately anyhow. This fixes a bug that made Konversa-
+ tion always hide to tray on startup regardless of the aforementioned op-
+ tion when the system tray icon was enabled.
+* Added a network settings lookup fallback to retrieving the key of a channel.
+ Previously, this relied solely on the channel's mode map. Closes the brief
+ gap between a channel join and the server's reply to MODE where possible,
+ so that e.g. reconnecting directly after auto-joining a channel with a key
+ doesn't result in a failed rejoin due to not having the key by way of the
+ MODE reply yet.
+* Fixed opening URLs from the channel topic context menu in Channel List tabs.
+
+
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
--- konversation/scripts/media
+++ konversation/scripts/media
@@ -44,7 +44,7 @@
## If you add a new player, you must add it here or it won't get checked when in audio-only or video-only modes.
playerRankings= {
'video' :['kaffeine','kmplayer', 'kplayer', 'noatun', 'kdetv'],
- 'audio' :['amarok', 'MPD' 'juk', 'noatun', 'kscd', 'kaffeine', 'kmplayer', 'Audacious', 'xmms', 'yammi']
+ 'audio' :['amarok', 'juk', 'noatun', 'kscd', 'kaffeine', 'kmplayer', 'amarok2', 'yammi', 'Audacious', 'xmms', 'MPD']
}
## Title, album and artist fields to be quoted depending on contents
@@ -244,36 +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
+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):
@@ -439,8 +439,9 @@
StupidPlayer("KPlayer","kplayer","kplayer-mainwindow#1 caption",playerType="video audio"),
DCOPPlayer("KsCD","kscd","CDPlayer currentTrackTitle","CDPlayer currentArtist","CDPlayer currentAlbum"),
DCOPPlayer("kdetv","kdetv","KdetvIface channelName",playerType='video'),
+Amarok2Player(),
+DCOPPlayer("Yammi","yammi","YammiPlayer songTitle","YammiPlayer songArtist","YammiPlayer songAlbum"),
AudaciousPlayer('Audacious'), XmmsPlayer('XMMS'),
-DCOPPlayer("Yammi","yammi","YammiPlayer songTitle","YammiPlayer songArtist","YammiPlayer songAlbum"),
MPD('MPD')
]
--- konversation/src/channellistpanel.h
+++ konversation/src/channellistpanel.h
@@ -73,6 +73,7 @@
void regExpClicked();
void contextMenu (KListView* l, QListViewItem* i, const QPoint& p);
+ void openURL();
//Used to disable functions when not connected
virtual void serverOnline(bool online);
--- konversation/src/version.h
+++ konversation/src/version.h
@@ -1,3 +1,3 @@
#ifndef KONVI_VERSION
-#define KONVI_VERSION "1.1"
+#define KONVI_VERSION "1.1+"
#endif
--- konversation/src/konversationapplication.cpp
+++ konversation/src/konversationapplication.cpp
@@ -139,7 +139,7 @@
// apply GUI settings
emit appearanceChanged();
- if (Preferences::showTrayIcon() && (Preferences::hiddenToTray() || Preferences::hideToTrayOnStartup()))
+ if (Preferences::showTrayIcon() && Preferences::hideToTrayOnStartup())
mainWindow->hide();
else
mainWindow->show();
@@ -212,11 +212,6 @@
void KonversationApplication::prepareShutdown()
{
- if (mainWindow->isHidden() && Preferences::showTrayIcon())
- Preferences::setHiddenToTray(true);
- else
- Preferences::setHiddenToTray(false);
-
mainWindow->getViewContainer()->prepareShutdown();
m_awayManager->blockSignals(true);
--- konversation/src/channellistpanel.cpp
+++ konversation/src/channellistpanel.cpp
@@ -18,6 +18,7 @@
#include "server.h"
#include "common.h"
+#include