Mailinglist Archive: opensuse-commit (1500 mails)
| < Previous | Next > |
commit kdebase3-SuSE
- From: root@xxxxxxx (h_root)
- Date: Thu, 16 Nov 2006 01:03:23 +0100 (CET)
- Message-id: <20061116000323.71A0919AB0A@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package kdebase3-SuSE
checked in at Thu Nov 16 01:03:23 CET 2006.
--------
--- KDE/kdebase3-SuSE/kdebase3-SuSE.changes 2006-11-15 17:31:11.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdebase3-SuSE/kdebase3-SuSE.changes 2006-11-15 21:45:08.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 15 21:45:01 CET 2006 - dmueller@xxxxxxx
+
+- start kmix if sound hardware is there (#204751)
+
+-------------------------------------------------------------------
Old:
----
suseplugger-safeproperties.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3-SuSE.spec ++++++
--- /var/tmp/diff_new_pack.pwE7Dm/_old 2006-11-16 01:03:02.000000000 +0100
+++ /var/tmp/diff_new_pack.pwE7Dm/_new 2006-11-16 01:03:02.000000000 +0100
@@ -34,11 +34,10 @@
PreReq: %fillup_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Version: 10.2
-Release: 67
+Release: 68
Source0: kdebase-SuSE-%{version}.tar.bz2
Source2: kdebase3-SuSE-displaymanager.fillup
Source3: kdebase3-SuSE-windowmanager.fillup
-Patch: suseplugger-safeproperties.diff
%description
This package contains the standard SUSE desktop and menu extensions for
@@ -61,7 +60,6 @@
%prep
%setup -q -n kdebase-SuSE
-%patch
. /etc/opt/kde3/common_options
update_admin
@@ -142,6 +140,7 @@
/opt/kde3/bin/*
/opt/kde3/env
/usr/share/wallpapers
+/opt/kde3/share/autostart
/opt/kde3/share/applications/kde/*.desktop
/opt/kde3/share/apps/suseplugger
/opt/kde3/share/apps/SUSEgreeter
@@ -179,6 +178,8 @@
/var/lib/kde-profiles
%changelog -n kdebase3-SuSE
+* Wed Nov 15 2006 - dmueller@xxxxxxx
+- start kmix if sound hardware is there (#204751)
* Wed Nov 15 2006 - wstephenson@xxxxxxx
- further work to protect suseplugger against non existing
HAL properties on some hardware (#219356)
++++++ kdebase-SuSE-10.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/suseplugger/susehwitem.cpp new/kdebase-SuSE/suseplugger/susehwitem.cpp
--- old/kdebase-SuSE/suseplugger/susehwitem.cpp 2006-11-10 12:13:36.000000000 +0100
+++ new/kdebase-SuSE/suseplugger/susehwitem.cpp 2006-11-15 21:44:06.000000000 +0100
@@ -81,8 +81,15 @@
char* _ppt_string;
QString _ppt_QString;
+ kdDebug() << "libhal_device_get_property_QString() with udi=" << udi << ", and key=" << key << endl;
DBusError error;
- _ppt_string = libhal_device_get_property_string(ctx, udi, key, &error);
+ dbus_error_init (&error);
+ if (!libhal_device_property_exists( ctx, udi, key, &error ))
+ return QString();
+
+ DBusError anotherError;
+ dbus_error_init (&anotherError);
+ _ppt_string = libhal_device_get_property_string(ctx, udi, key, &anotherError);
if (_ppt_string)
_ppt_QString = _ppt_string;
libhal_free_string(_ppt_string);
@@ -169,6 +176,7 @@
QString parent_udi = libhal_device_get_property_QString(m_halContext, m_udi, "input.physical_device");
if (parent_udi.isNull())
return false;
+ Q_ASSERT( !parent_udi.isEmpty() );
model = libhal_device_get_property_QString(m_halContext, parent_udi, "info.product");
return newHardwarePopup();
}
@@ -236,7 +244,6 @@
return newHardwarePopup();
}
-
if (libhal_device_get_property_QString(m_halContext, m_udi, "linux.subsystem") == "usb")
{
type_string = i18n("USB");
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |