Hello community,
here is the log from the commit of package kdemultimedia3
checked in at Wed Nov 15 17:33:12 CET 2006.
--------
--- KDE/kdemultimedia3/kdemultimedia3.changes 2006-11-08 16:56:49.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdemultimedia3/kdemultimedia3.changes 2006-11-14 23:49:15.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Nov 14 23:48:27 CET 2006 - dmueller@suse.de
+
+- autostart kmix only once (#159352, #204751)
+
+-------------------------------------------------------------------
New:
----
kmix-autostart.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdemultimedia3.spec ++++++
--- /var/tmp/diff_new_pack.kTUA6m/_old 2006-11-15 17:30:45.000000000 +0100
+++ /var/tmp/diff_new_pack.kTUA6m/_new 2006-11-15 17:30:45.000000000 +0100
@@ -16,11 +16,11 @@
%else
BuildRequires: lame mad-devel mpg321
%endif
-License: GNU General Public License (GPL) - all versions
+License: GNU General Public License (GPL)
Group: System/GUI/KDE
Summary: KDE Multimedia Libraries
Version: 3.5.5
-Release: 20
+Release: 24
Url: http://www.kde.org
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -33,6 +33,7 @@
Patch3: autorun-kmix.diff
Patch9: initial-preferences.diff
Patch11: fix-aliasing.diff
+Patch12: kmix-autostart.diff
Patch14: disable-cddb-usage-by-default.diff
Patch50: juk-kdemm-support.diff
Patch51: kdemmbackends-3.4.diff
@@ -273,6 +274,7 @@
#%patch3
%patch9
%patch11
+%patch12
%patch14
%if %suse_version > 930
tar xfj %SOURCE5
@@ -652,6 +654,8 @@
/opt/kde3/share/services/videothumbnail.desktop
%changelog -n kdemultimedia3
+* Tue Nov 14 2006 - dmueller@suse.de
+- autostart kmix only once (#159352, #204751)
* Wed Nov 08 2006 - stbinner@suse.de
- remove historic "Provides:" (#218798)
* Tue Oct 31 2006 - coolo@suse.de
++++++ kmix-autostart.diff ++++++
--- kmix/kmixprefdlg.h
+++ kmix/kmixprefdlg.h
@@ -57,6 +57,7 @@
QCheckBox *m_showTicks;
QCheckBox *m_showLabels;
QCheckBox *m_onLogin;
+ QCheckBox *m_disableAutoStart;
QRadioButton *_rbVertical;
QRadioButton *_rbHorizontal;
QRadioButton *_rbNone;
--- kmix/kmix.cpp
+++ kmix/kmix.cpp
@@ -29,6 +29,7 @@
#include
// include files for KDE
+#include
#include
#include
#include
@@ -81,6 +82,9 @@
initPrefDlg();
updateDocking();
+ if (KCmdLineArgs::parsedArgs()->isSet("autostart") && ! Mixer::mixers().first())
+ QTimer::singleShot(0, kapp, SLOT(quit()));
+
if ( m_startVisible )
{
/* Started visible: We should do probably do:
@@ -249,6 +253,7 @@
config->writeEntry( "Tickmarks", m_showTicks );
config->writeEntry( "Labels", m_showLabels );
config->writeEntry( "startkdeRestore", m_onLogin );
+ config->writeEntry( "AutoStart", m_autoStart);
Mixer* mixerMasterCard = Mixer::masterCard();
if ( mixerMasterCard != 0 ) {
config->writeEntry( "MasterMixer", mixerMasterCard->id() );
@@ -296,6 +301,7 @@
const QString& valueStyleString = config->readEntry("ValueStyle", "None");
m_onLogin = config->readBoolEntry("startkdeRestore", true );
m_startVisible = config->readBoolEntry("Visible", true);
+ m_autoStart = config->readBoolEntry("AutoStart", true);
m_multiDriverMode = config->readBoolEntry("MultiDriver", false);
m_surroundView = config->readBoolEntry("Experimental-ViewSurround", false );
m_gridView = config->readBoolEntry("Experimental-ViewGrid", false );
@@ -425,6 +431,7 @@
m_prefDlg->m_showTicks->setChecked( m_showTicks );
m_prefDlg->m_showLabels->setChecked( m_showLabels );
m_prefDlg->m_onLogin->setChecked( m_onLogin );
+ m_prefDlg->m_disableAutoStart->setChecked( !m_autoStart);
m_prefDlg->_rbVertical ->setChecked( m_toplevelOrientation == Qt::Vertical );
m_prefDlg->_rbHorizontal->setChecked( m_toplevelOrientation == Qt::Horizontal );
m_prefDlg->_rbNone->setChecked( m_valueStyle == MixDeviceWidget::NNONE );
@@ -492,6 +499,7 @@
m_showTicks = prefDlg->m_showTicks->isChecked();
m_showLabels = prefDlg->m_showLabels->isChecked();
m_onLogin = prefDlg->m_onLogin->isChecked();
+ m_autoStart = !prefDlg->m_disableAutoStart->isChecked();
if ( prefDlg->_rbNone->isChecked() ) {
m_valueStyle = MixDeviceWidget::NNONE;
--- kmix/KMixApp.cpp
+++ kmix/KMixApp.cpp
@@ -23,6 +23,7 @@
#include "KMixApp.h"
#include "kmix.h"
#include
+#include
KMixApp::KMixApp()
@@ -40,9 +41,19 @@
int
KMixApp::newInstance()
{
+ KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+
+ if (args->isSet("autostart"))
+ {
+ kapp->disableSessionManagement();
+
+ if ( m_kmix )
+ return 0;
+ }
+
if ( m_kmix )
{
- m_kmix->show();
+ m_kmix->show();
}
else
{
@@ -69,3 +80,4 @@
}
#include "KMixApp.moc"
+// vim: sw=8:noet:
--- kmix/kmix.h
+++ kmix/kmix.h
@@ -99,6 +99,7 @@
bool m_showDockWidget;
bool m_volumeWidget;
bool m_hideOnClose;
+ bool m_autoStart;
bool m_showTicks;
bool m_showLabels;
MixDeviceWidget::ValueStyle m_valueStyle; // No numbers by default
--- kmix/main.cpp
+++ kmix/main.cpp
@@ -33,8 +33,8 @@
static KCmdLineOptions options[] =
{
+ { "autostart", "", 0 },
KCmdLineLastOption
- // INSERT YOUR COMMANDLINE OPTIONS HERE
};
extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
--- kmix/kmixprefdlg.cpp
+++ kmix/kmixprefdlg.cpp
@@ -68,6 +68,10 @@
m_onLogin = new QCheckBox( i18n("Restore volumes on login"), m_generalTab );
layout->addWidget( m_onLogin );
+ m_disableAutoStart = new QCheckBox(
+ i18n("Disable automatic startup on login"), m_generalTab);
+ layout->addWidget(m_disableAutoStart);
+
QBoxLayout *numbersLayout = new QHBoxLayout( layout );
QButtonGroup *numbersGroup = new QButtonGroup( 3, Qt::Horizontal, i18n("Numbers"), m_generalTab );
numbersGroup->setRadioButtonExclusive(true);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org