Hello community, here is the log from the commit of package kdebase3 checked in at Fri Oct 27 18:56:53 CEST 2006. -------- --- KDE/kdebase3/kdebase3.changes 2006-10-24 18:21:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2006-10-27 11:30:13.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Oct 27 10:30:11 CEST 2006 - dmueller@suse.de + +- update 3_5_BRANCH to fix accessibility beeping +- fix Home not showing up in kickoff favourites +- disable accessibility without kdeaccessibility3 (#213622) +- resort some patches +- KDM provides suspend to disk/RAM (fate #300629) +- umount partitions from USB when suspending (fate #300647) +- beagle support in khelpcenter (fate #301208) + +------------------------------------------------------------------- @@ -5 +15,0 @@ - Old: ---- disable-kcmaccess.diff home-url-desktop.diff New: ---- kdm-suspend-hal.diff suspend-unmount.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.tTjdDa/_old 2006-10-27 18:54:21.000000000 +0200 +++ /var/tmp/diff_new_pack.tTjdDa/_new 2006-10-27 18:54:21.000000000 +0200 @@ -33,6 +33,7 @@ Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) Requires: xorg-x11 %if %suse_version > 1010 +Requires: python Recommends: kdebase3-beagle %endif %if %suse_version > 1000 @@ -45,13 +46,13 @@ %endif Conflicts: kdebase3-SuSE <= 9.0 PreReq: /bin/sh fileutils permissions -License: Other License(s), see package +License: GNU General Public License (GPL) - all versions Group: System/GUI/KDE Summary: The KDE Core Components BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.5 -Release: 25 +Release: 26 %define kde_version 3.5.5 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -86,7 +87,6 @@ Patch10: kdesud-security.diff Patch11: clock-applet-style.diff Patch12: dont-always-start-kaccess.diff -Patch13: disable-kcmaccess.diff Patch14: autorun.patch Patch15: artwork.diff # TODO @@ -107,7 +107,10 @@ Patch61: kmenu-search-fs20050503-fixed.diff Patch62: fix-kcontrol-yast.diff Patch63: quick_browser_menu.diff -Patch66: default_fonts.diff +Patch64: default_fonts.diff +#kdm +Patch65: kdm-path.diff +Patch69: kdm-cope-with-new-grub.diff Patch70: kdm-aliasing.diff Patch71: kdm-mark_autologin.diff Patch72: kdm-all-users-nopass.diff @@ -116,6 +119,7 @@ # svn diff $BASE/branches/KDE/3.5/kdebase/kdm@583746 $BASE/branches/work/coolos_kdm Patch75: kdm-make_it_cool.diff Patch76: kdm-admin-mode.diff +Patch77: kdm-suspend-hal.diff Patch78: kdm-relaxed-auth.diff Patch79: kdm-wordbreak.diff Patch80: non-fast-malloc.diff @@ -138,7 +142,6 @@ Patch104: locale-dont-show-flag.diff Patch105: kscreensaver-random-NG.diff Patch111: fix_default_theme_reset.diff -Patch112: kdm-cope-with-new-grub.diff Patch114: improve-panelservicemenu-geticonset.diff Patch115: remove-gdm-support.diff Patch116: teach-minicli-lock.diff @@ -159,22 +162,22 @@ Patch157: kcmsamba_log.diff Patch160: khelpcenter-localindices.patch Patch161: applet-lock-logout.diff -# svn branches/KDE/3.5/kdebase/kicker@594132 branches/work/suse_kickoff/kicker@HEAD +# svn branches/KDE/3.5/kdebase/kicker@594132 branches/work/suse_kickoff/kicker Patch162: kickoff.diff -# svn diff -r 551296:HEAD kcontrol +# svn diff branches/KDE/3.5/kdebase/kcontrol@599309 branches/work/suse_kickoff/kcontrol +# 599309 Patch158: kickoff-kcm.diff # svn diff -r 551296:HEAD khelpcenter Patch159: khelpcenter-beagle.diff Patch163: xinerama.patch -Patch164: kdm-path.diff Patch165: optional-compmgr.diff Patch166: lowdiskspace.patch Patch167: ksmserver-timed.diff -Patch168: home-url-desktop.diff Patch169: systray_order.diff Patch170: khotkeys-multimedia-action.diff Patch171: khotkeys-multimedia-action2.diff Patch172: optional-kwin.diff +Patch173: suspend-unmount.diff Provides: kdebase %description @@ -364,7 +367,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 154 +Release: 155 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -390,7 +393,6 @@ %patch10 %patch11 %patch12 -%patch13 %patch14 # do we really still need it ? #%patch16 @@ -410,7 +412,7 @@ %patch51 %patch63 %patch60 -%patch66 +%patch64 %if %suse_version > 1000 %patch94 %else @@ -428,7 +430,7 @@ %patch74 %endif %if %suse_version <1010 -%patch164 +%patch65 %endif %patch76 %patch78 @@ -445,6 +447,7 @@ %endif %if %suse_version > 1010 %patch83 +%patch77 %endif %endif %patch84 @@ -466,7 +469,7 @@ %endif %patch62 %if %suse_version > 930 -%patch112 +%patch69 %endif %patch104 %patch105 @@ -498,15 +501,13 @@ %patch161 cd kicker %patch162 +cd ../kcontrol +#%patch158 cd .. -%patch158 %patch159 %patch165 %patch166 %patch167 -%if %suse_version > 1010 -%patch168 -%endif tar xvfj %SOURCE20 %endif %patch163 -p1 @@ -517,6 +518,7 @@ %patch170 %patch171 %patch172 +%patch173 cp %SOURCE17 l10n/tw/flag.png . /etc/opt/kde3/common_options cd ../fileshareset2 @@ -829,6 +831,7 @@ /opt/kde3/bin/keditfiletype /opt/kde3/bin/kfind /opt/kde3/bin/khelpcenter +/opt/kde3/bin/khc_beagle_index.py /opt/kde3/bin/kicker /opt/kde3/bin/kjobviewer /opt/kde3/bin/klipper @@ -1472,6 +1475,14 @@ %endif %changelog -n kdebase3 +* Fri Oct 27 2006 - dmueller@suse.de +- update 3_5_BRANCH to fix accessibility beeping +- fix Home not showing up in kickoff favourites +- disable accessibility without kdeaccessibility3 (#213622) +- resort some patches +- KDM provides suspend to disk/RAM (fate #300629) +- umount partitions from USB when suspending (fate #300647) +- beagle support in khelpcenter (fate #301208) * Tue Oct 24 2006 - dmueller@suse.de - update WM configuration patch * Tue Oct 24 2006 - coolo@suse.de ++++++ 3_5_BRANCH.diff ++++++ ++++ 4764 lines (skipped) ++++ between KDE/kdebase3/3_5_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdebase3/3_5_BRANCH.diff ++++++ access.diff ++++++ --- /var/tmp/diff_new_pack.tTjdDa/_old 2006-10-27 18:54:22.000000000 +0200 +++ /var/tmp/diff_new_pack.tTjdDa/_new 2006-10-27 18:54:22.000000000 +0200 @@ -1,8 +1,15 @@ -Index: kcontrol/access/kaccess.cpp -================================================================================ --- kcontrol/access/kaccess.cpp +++ kcontrol/access/kaccess.cpp -@@ -263,7 +263,7 @@ +@@ -216,7 +216,7 @@ + xkb->ctrls->debounce_delay = config->readNumEntry("BounceKeysDelay", 500); + + // gestures for enabling the other features +- _gestures = config->readBoolEntry("Gestures", true); ++ _gestures = config->readBoolEntry("Gestures", ::access("/opt/kde3/bin/kmag", X_OK) == 0); + if (_gestures) + xkb->ctrls->enabled_ctrls |= XkbAccessXKeysMask; + else +@@ -241,7 +241,7 @@ else xkb->ctrls->ax_options &= ~(XkbAX_FeatureFBMask | XkbAX_SlowWarnFBMask); @@ -11,3 +18,30 @@ _kNotifyModifiers = config->readBoolEntry("kNotifyModifiers", false); _kNotifyAccessX = config->readBoolEntry("kNotifyAccessX", false); +--- kcontrol/access/kcmaccess.cpp ++++ kcontrol/access/kcmaccess.cpp +@@ -7,6 +7,7 @@ + + + #include <stdlib.h> ++#include <unistd.h> + #include <math.h> + + #include <dcopref.h> +@@ -639,12 +640,14 @@ + bounceKeysDelay->setValue(config->readNumEntry("BounceKeysDelay", 500)); + bounceKeysRejectBeep->setChecked(config->readBoolEntry("BounceKeysRejectBeep", true)); + +- gestures->setChecked(config->readBoolEntry("Gestures", true)); ++ gestures->setChecked(config->readBoolEntry("Gestures", ++ ::access("/opt/kde3/bin/kmag", X_OK) == 0)); + timeout->setChecked(config->readBoolEntry("AccessXTimeout", false)); + timeoutDelay->setValue(config->readNumEntry("AccessXTimeoutDelay", 30)); + + accessxBeep->setChecked(config->readBoolEntry("AccessXBeep", true)); +- gestureConfirmation->setChecked(config->readBoolEntry("GestureConfirmation", false)); ++ gestureConfirmation->setChecked(config->readBoolEntry("GestureConfirmation", ++ ::access("/opt/kde3/bin/kmag", X_OK) == 0)); + kNotifyAccessX->setChecked(config->readBoolEntry("kNotifyAccessX", false)); + + delete config; ++++++ kdm-suspend-hal.diff ++++++ --- kdm/backend/ctrl.c +++ kdm/backend/ctrl.c @@ -483,6 +483,10 @@ Reply( "nuke\t" ); } } + if (d->allowSuspend != SHUT_NONE) { + Reply( "suspend\t" ); + } + if ((d->displayType & d_location) == dLocal && AnyReserveDisplays()) Writer( fd, cbuf, sprintf( cbuf, "reserve %d\t", --- kdm/backend/greet.h +++ kdm/backend/greet.h @@ -125,6 +125,7 @@ # define SHUT_REBOOT 1 /* how */ # define SHUT_HALT 2 # define SHUT_CONSOLE -1 /* pseudo-code */ +# define SHUT_SUSPEND -2 /* pseudo-code */ # define SHUT_SCHEDULE 0 /* when; config only */ # define SHUT_TRYNOW 1 # define SHUT_FORCENOW 2 --- kdm/config.def +++ kdm/config.def @@ -1798,6 +1798,19 @@ Who is allowed to shut down the system. This applies both to the greeter and to the command <acronym>FiFo</acronym>. +Key: AllowSuspend +Type: enum + None/SHUT_NONE: no <guilabel>Suspend...</guilabel> menu entry is shown at all + Root/SHUT_ROOT: the <systemitem class="username">root</systemitem> password must be entered to suspend + All/SHUT_ALL: everybody can suspend the machine +Default: Root +User: greeter +User: core +Instance: #:0/All +Comment: & +Description: + If the user should have an option to suspend the system if configured to (also in the desktop) + Key: AllowSdForceNow Type: enum None: no forced shutdown is allowed at all --- kdm/kfrontend/kdmshutdown.cpp +++ kdm/kfrontend/kdmshutdown.cpp @@ -22,6 +22,7 @@ */ +#include <liblazy.h> #include "kdmshutdown.h" #include "kdm_greet.h" @@ -34,6 +35,7 @@ #include <kdialog.h> #include <kstandarddirs.h> #include <kuser.h> +#include <kdebug.h> #include <qcombobox.h> #include <qvbuttongroup.h> @@ -57,6 +59,10 @@ int KDMShutdownBase::curPlugin = -1; PluginList KDMShutdownBase::pluginList; +#define DBUS_HAL_INTERFACE "org.freedesktop.Hal" +#define DBUS_HAL_SYSTEM_POWER_INTERFACE "org.freedesktop.Hal.Device.SystemPowerManagement" +#define HAL_UDI_COMPUTER "/org/freedesktop/Hal/devices/computer" + KDMShutdownBase::KDMShutdownBase( int _uid, QWidget *_parent ) : inherited( _parent ) , box( new QVBoxLayout( this, KDmh, KDsh ) ) @@ -71,6 +77,7 @@ , verify( 0 ) , needRoot( -1 ) , uid( _uid ) + , willSuspend( false ) { } @@ -87,6 +94,7 @@ if (uid && ((willShut && _allowShutdown == SHUT_ROOT) || + ( willSuspend && _allowSuspend == SHUT_ROOT ) || (mayNuke && _allowNuke == SHUT_ROOT))) { rootlab = new QLabel( i18n("Root authorization required."), this ); @@ -169,6 +177,7 @@ { int nNeedRoot = uid && (((willShut && _allowShutdown == SHUT_ROOT) || + ( willSuspend && _allowSuspend == SHUT_ROOT ) || (_allowNuke == SHUT_ROOT && doesNuke))); if (verify && nNeedRoot != needRoot) { if (needRoot == 1) @@ -425,7 +434,7 @@ KDMDelayedPushButton::KDMDelayedPushButton( const KGuiItem &item, - QWidget *parent, + QWidget *parent, const char *name ) : inherited( item, parent, name ) , pop( 0 ) @@ -490,6 +499,57 @@ buttonlay->addWidget( btnReboot ); connect( btnReboot, SIGNAL(clicked()), SLOT(slotReboot()) ); + if ( _allowSuspend != SHUT_NONE ) + { + int supported = -1; + liblazy_hal_get_property_bool(HAL_UDI_COMPUTER, "power_management.can_suspend", &supported); + if (supported == 1) + suspend_ram = true; + else + suspend_ram = false; + + liblazy_hal_get_property_bool(HAL_UDI_COMPUTER, "power_management.can_standby", &supported); + if (supported == 1) + standby = true; + else + standby = false; + liblazy_hal_get_property_bool(HAL_UDI_COMPUTER, "power_management.can_hibernate", &supported); + if (supported == 1) + suspend_disk = true; + else + suspend_disk = false; + +/* if (liblazy_polkit_is_user_allowed_by_uid(0, "hal-power-hibernate", NULL) != 1) + suspend_disk = false; + if (liblazy_polkit_is_user_allowed_by_uid(0, "hal-power-suspend", NULL) != 1) + suspend_ram = false; + if (liblazy_polkit_is_user_allowed_by_uid(0, "hal-power-standby", NULL) != 1) + standby = false; +*/ + int sum = standby + suspend_ram + suspend_disk; + if ( sum ) { + buttonlay->addSpacing( KDialog::spacingHint() ); + + QButton *btnSuspend; + if (sum > 1) { + btnSuspend = new KDMDelayedPushButton( KGuiItem( i18n("&Suspend Computer"), "player_pause"), this ); + QPopupMenu *suspends = new QPopupMenu(this); + if (suspend_disk) + suspends->insertItem(i18n("Suspend to Disk"), 1); + if (suspend_ram) + suspends->insertItem(i18n("Suspend to RAM"), 2); + if (standby) + suspends->insertItem(i18n("Standby"), 3); + connect(suspends, SIGNAL(activated(int)), SLOT(slotSuspend(int))); + static_cast<KDMDelayedPushButton*>(btnSuspend)->setPopup(suspends); + } else { + btnSuspend = new KPushButton( KGuiItem( i18n("&Suspend Computer"), "player_pause"), this ); + } + buttonlay->addWidget( btnSuspend ); + connect(btnSuspend, SIGNAL(clicked()), SLOT(slotSuspend())); + } + } + GSet( 1 ); GSendInt( G_ListBootOpts ); if (GRecvInt() == BO_OK) { @@ -536,6 +596,65 @@ freeStrArr( targetList ); } +void KDMSlimShutdown::slotSuspend() +{ + if (suspend_disk) + slotSuspend( 1 ); + else if (suspend_ram) + slotSuspend( 2 ); + else if ( standby ) + slotSuspend( 3 ); + else + reject(); +} + +void KDMSlimShutdown::slotSuspend(int id) +{ + reject(); + // dpySpec *sess = fetchSessions( lstRemote | lstTTY ); + // it would be nice to show the sessions to suspend, but it + // would require string changes (coolo) + dpySpec *sess = 0; + kdDebug() << "slotSuspend " << _allowSuspend << endl; + if (sess || _allowSuspend == SHUT_ROOT) + { + int ret = KDMConfShutdown( -1, sess, SHUT_SUSPEND, 0 ).exec(); + if ( !ret ) + return; + } + + int error = 0; + int wake = 0; + DBusMessage *reply; + + if (suspend_disk && id == 1) { + error = liblazy_dbus_system_send_method_call(DBUS_HAL_INTERFACE, + HAL_UDI_COMPUTER, + DBUS_HAL_SYSTEM_POWER_INTERFACE, + "Hibernate", + &reply, + DBUS_TYPE_INVALID); + } else if (suspend_ram && id == 2) + error = liblazy_dbus_system_send_method_call(DBUS_HAL_INTERFACE, + HAL_UDI_COMPUTER, + DBUS_HAL_SYSTEM_POWER_INTERFACE, + "Suspend", + &reply, + DBUS_TYPE_INT32, + &wake, + DBUS_TYPE_INVALID); + else if (standby && id == 3) + error = liblazy_dbus_system_send_method_call(DBUS_HAL_INTERFACE, + HAL_UDI_COMPUTER, + DBUS_HAL_SYSTEM_POWER_INTERFACE, + "Standby", + &reply, + DBUS_TYPE_INVALID); + else { + return; + } +} + void KDMSlimShutdown::slotSched() { @@ -601,16 +720,27 @@ if (type == SHUT_CONSOLE) willShut = false; #endif + QString title; + if ( type == SHUT_HALT) + title = i18n("Turn Off Computer"); + else { +#ifdef HAVE_VTS + if ( type == SHUT_CONSOLE) + title = i18n("Switch to Console"); + else +#endif + if ( type == SHUT_SUSPEND ) { + willSuspend = true; + title = i18n( "Suspend Computer" ); + } + else + title = i18n("Restart Computer"); + } + box->addWidget( new QLabel( QString( "<qt><center><b><nobr>" "%1%2" "</nobr></b></center><br></qt>" ) - .arg( (type == SHUT_HALT) ? - i18n("Turn Off Computer") : -#ifdef HAVE_VTS - (type == SHUT_CONSOLE) ? - i18n("Switch to Console") : -#endif - i18n("Restart Computer") ) + .arg( title ) .arg( os ? i18n("<br>(Next boot: %1)") .arg( QString::fromLocal8Bit( os ) ) : --- kdm/kfrontend/kdmshutdown.h +++ kdm/kfrontend/kdmshutdown.h @@ -67,7 +67,7 @@ #else static const bool willShut = true; #endif - bool mayNuke, doesNuke, mayOk, maySched; + bool mayNuke, doesNuke, mayOk, maySched, willSuspend; private slots: void slotSched(); @@ -118,7 +118,6 @@ QComboBox *targets; int oldTarget; int sch_st, sch_to; - }; class KDMRadioButton : public QRadioButton { @@ -168,10 +167,13 @@ void slotReboot(); void slotReboot( int ); void slotSched(); + void slotSuspend(); + void slotSuspend(int); private: bool checkShutdown( int type, const char *os ); char **targetList; + bool suspend_disk, suspend_ram, standby; }; --- kdm/kfrontend/Makefile.am +++ kdm/kfrontend/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = themer themes pics sessions AM_CPPFLAGS = -I$(srcdir)/../backend -I.. -I$(top_srcdir)/kcontrol/background \ - -I$(top_srcdir)/kdmlib $(all_includes) + -I$(top_srcdir)/kdmlib $(all_includes) $(DBUS_INCS) bin_PROGRAMS = kdm_config kdm_greet krootimage genkdmconf kdmctl @@ -25,7 +25,7 @@ kgreeter.cpp \ kgapp.cpp kdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kdm_greet_LDADD = themer/libkdmthemer.a $(LIB_KDEUI) $(XTESTLIB) $(LIBPOSIX4) +kdm_greet_LDADD = themer/libkdmthemer.a $(LIB_KDEUI) $(XTESTLIB) $(LIBPOSIX4) -llazy $(DBUS_LIBS) krootimage_SOURCES = krootimage.cpp krootimage_LDFLAGS = $(all_libraries) $(KDE_RPATH) ++++++ khelpcenter-beagle.diff ++++++ --- /var/tmp/diff_new_pack.tTjdDa/_old 2006-10-27 18:54:24.000000000 +0200 +++ /var/tmp/diff_new_pack.tTjdDa/_new 2006-10-27 18:54:24.000000000 +0200 @@ -1,8 +1,6 @@ -Index: khelpcenter/searchhandlers/khc_beagle_search.py -=================================================================== ---- khelpcenter/searchhandlers/khc_beagle_search.py (.../KDE/3.5/kdebase/khelpcenter) (revision 0) -+++ khelpcenter/searchhandlers/khc_beagle_search.py (.../work/suse_kickoff/khelpcenter) (revision 595959) -@@ -0,0 +1,97 @@ +--- khelpcenter/searchhandlers/khc_beagle_search.py ++++ khelpcenter/searchhandlers/khc_beagle_search.py +@@ -0,0 +1,98 @@ +#!/usr/bin/env python + +import sys, os @@ -79,7 +77,8 @@ + + method = 'and' + maxnum = 100 -+ docid, words = None ++ docid = None ++ words = None + + for o, a in opts: + if o == "--method": @@ -101,15 +100,58 @@ +if __name__ == '__main__': + main() -Property changes on: khelpcenter/searchhandlers/khc_beagle_search.py +Property changes on: khc_beagle_search.py ___________________________________________________________________ Name: svn:executable + * -Index: khelpcenter/searchhandlers/docbook.desktop -=================================================================== ---- khelpcenter/searchhandlers/docbook.desktop (.../KDE/3.5/kdebase/khelpcenter) (revision 551296) -+++ khelpcenter/searchhandlers/docbook.desktop (.../work/suse_kickoff/khelpcenter) (revision 595959) +--- khelpcenter/searchhandlers/khc_beagle_index.py ++++ khelpcenter/searchhandlers/khc_beagle_index.py +@@ -0,0 +1,36 @@ ++#!/usr/bin/env python ++ ++import sys, os ++ ++def getKDEDocDir(): ++ prefix = os.popen("kde-config --prefix", "r").read().strip() ++ if not prefix: ++ prefix = "/opt/kde3" ++ return prefix + "/share/doc" ++ ++def addRoot(): ++ output = os.popen("beagle-config indexing ListRoots", "r").readlines() ++ if not output: ++ return False ++ ++ kdedocdir = getKDEDocDir() ++ for line in output: ++ if line.find(kdedocdir) != -1: ++ break ++ else: ++ os.system("beagle-config indexing AddRoot %s" % kdedocdir) ++ ++ return True ++ ++def createExistsFile(idir, ident): ++ import os.path ++ filename = os.path.join(idir, ident + ".exists") ++ print filename ++ f = open(filename, "w") ++ f.close() ++ ++if __name__ == '__main__': ++ idir = sys.argv[1] ++ ident = sys.argv[2] ++ if addRoot(): ++ createExistsFile(idir, ident) + +Property changes on: khc_beagle_index.py +___________________________________________________________________ +Name: svn:executable + + * + +--- khelpcenter/searchhandlers/docbook.desktop ++++ khelpcenter/searchhandlers/docbook.desktop @@ -2,5 +2,5 @@ DocumentTypes=text/docbook @@ -117,17 +159,15 @@ -SearchCommand=khc_htsearch.pl --docbook --indexdir=%d --config=%i --words=%w --method=%o --maxnum=%m --lang=en -IndexCommand=khc_docbookdig.pl --indexdir=%d --docpath=%p --identifier=%i +SearchCommand=khc_beagle_search.py --method=%o --maxnum=%m %w -+#IndexCommand=khc_docbookdig.pl --indexdir=%d --docpath=%p --identifier=%i -Index: khelpcenter/searchhandlers/Makefile.am -=================================================================== ---- khelpcenter/searchhandlers/Makefile.am (.../KDE/3.5/kdebase/khelpcenter) (revision 551296) -+++ khelpcenter/searchhandlers/Makefile.am (.../work/suse_kickoff/khelpcenter) (revision 595959) ++IndexCommand=khc_beagle_index.py %d %i +--- khelpcenter/searchhandlers/Makefile.am ++++ khelpcenter/searchhandlers/Makefile.am @@ -3,7 +3,7 @@ searchhandlersdir = $(kde_datadir)/khelpcenter/searchhandlers kde_bin_SCRIPTS = khc_htdig.pl khc_htsearch.pl khc_mansearch.pl \ - khc_docbookdig.pl -+ khc_docbookdig.pl khc_beagle_search.py ++ khc_docbookdig.pl khc_beagle_search.py khc_beagle_index.py htdigdata_DATA = htdig_long.html ++++++ kickoff-kcm.diff ++++++ ++++ 12226 lines (skipped) ++++ between KDE/kdebase3/kickoff-kcm.diff ++++ and /mounts/work_src_done/STABLE/kdebase3/kickoff-kcm.diff ++++++ kickoff.diff ++++++ ++++ 1671 lines (skipped) ++++ between KDE/kdebase3/kickoff.diff ++++ and /mounts/work_src_done/STABLE/kdebase3/kickoff.diff ++++++ ksmserver-timed.diff ++++++ --- /var/tmp/diff_new_pack.tTjdDa/_old 2006-10-27 18:54:24.000000000 +0200 +++ /var/tmp/diff_new_pack.tTjdDa/_new 2006-10-27 18:54:24.000000000 +0200 @@ -185,8 +185,8 @@ + if ( sdtype == KApplication::ShutdownTypeHalt ) + { + m_title->setText( i18n( "Would you like to turn off your computer?" ) ); -+ m_template = i18n( "If you do not act, your computer will turn off\n" -+ "after %1 seconds automatically." ); ++ m_template = i18n( "This computer will turn off automatically\n" ++ "after %1 seconds." ); + m_logo->setPixmap( BarIcon( "exit", 48 ) ); + m_remaining = 120; + } else if ( sdtype == KApplication::ShutdownTypeReboot ) @@ -195,13 +195,13 @@ + m_title->setText( i18n( "Would you like to reboot your computer?" ) ); + else + m_title->setText( i18n( "Would you like to reboot to \"%1\"?" ).arg(bootOption) ); -+ m_template = i18n( "If you do not act, your computer will reboot\n" -+ "after %1 seconds automatically." ); ++ m_template = i18n( "This computer will reboot automatically\n" ++ "after %1 seconds." ); + m_logo->setPixmap( BarIcon( "reload", 48 ) ); + m_remaining = 60; + } else { + m_title->setText( i18n( "Would you like to end your current session?" ) ); -+ m_template = i18n( "If you do not act, your session will be stopped\n" ++ m_template = i18n( "This session will end\n" + "after %1 seconds automatically." ); + m_logo->setPixmap( BarIcon( "previous", 48 ) ); + m_remaining = 30; ++++++ lock-xvkbd.diff ++++++ --- /var/tmp/diff_new_pack.tTjdDa/_old 2006-10-27 18:54:25.000000000 +0200 +++ /var/tmp/diff_new_pack.tTjdDa/_new 2006-10-27 18:54:25.000000000 +0200 @@ -1,5 +1,7 @@ ---- kdesktop/lock/lockprocess.cc.sav 2006-10-13 17:15:38.000000000 +0200 -+++ kdesktop/lock/lockprocess.cc 2006-10-19 18:13:52.000000000 +0200 +Index: kdesktop/lock/lockprocess.cc +=================================================================== +--- kdesktop/lock/lockprocess.cc.orig ++++ kdesktop/lock/lockprocess.cc @@ -36,6 +36,8 @@ #include <kstdguiitem.h> #include <kpixmapeffect.h> @@ -319,8 +321,10 @@ +} + #include "lockprocess.moc" ---- kdesktop/lock/lockprocess.h.sav 2006-10-10 13:00:33.000000000 +0200 -+++ kdesktop/lock/lockprocess.h 2006-10-19 18:06:47.000000000 +0200 +Index: kdesktop/lock/lockprocess.h +=================================================================== +--- kdesktop/lock/lockprocess.h.orig ++++ kdesktop/lock/lockprocess.h @@ -23,6 +23,7 @@ #include <X11/Xlib.h> @@ -329,6 +333,15 @@ struct GreeterPluginHandle { KLibrary *library; +@@ -53,7 +54,7 @@ public: + + void msgBox( QMessageBox::Icon type, const QString &txt ); + int execDialog( QDialog* dlg ); +- ++ + public slots: + void quitSaver(); + void preparePopup(); @@ -70,6 +71,7 @@ private slots: void suspend(); void checkDPMSActive(); @@ -337,7 +350,7 @@ private: void configure(); -@@ -94,6 +96,11 @@ private: +@@ -93,6 +95,11 @@ private: void stayOnTop(); void lockXF86(); void unlockXF86(); @@ -346,9 +359,9 @@ + bool forwardVkbdEvent( XEvent* event ); + void sendVkbdFocusInOut( WId window, Time t ); + void windowAdded( WId window, bool managed ); + void resume( bool force ); static QVariant getConf(void *ctx, const char *key, const QVariant &dflt); - bool mLocked; @@ -125,6 +132,15 @@ private: int mAutoLogoutTimerId; int mAutoLogoutTimeout; ++++++ startkde.diff ++++++ --- /var/tmp/diff_new_pack.tTjdDa/_old 2006-10-27 18:54:25.000000000 +0200 +++ /var/tmp/diff_new_pack.tTjdDa/_new 2006-10-27 18:54:25.000000000 +0200 @@ -18,8 +18,8 @@ kcmrandrrc Display ApplyOnStartup false kcmrandrrc [Screen0] kcmrandrrc [Screen1] -@@ -146,6 +146,16 @@ - esac +@@ -160,6 +160,16 @@ + EOF fi +case "$ksplashrc_ksplash_theme" in @@ -35,7 +35,7 @@ # Source scripts found in <localprefix>/env/*.sh and <prefixes>/env/*.sh # (where <localprefix> is $KDEHOME or ~/.kde, and <prefixes> is where KDE is installed) # -@@ -269,7 +279,7 @@ +@@ -283,7 +293,7 @@ echo 'startkde: Starting up...' 1>&2 # run KPersonalizer before the session, if this is the first login @@ -44,16 +44,16 @@ # start only dcopserver, don't start whole kdeinit (takes too long) echo 'startkde: Running kpersonalizer...' 1>&2 dcopserver -@@ -287,6 +297,8 @@ - case "$ksplashrc_ksplash_theme" in - None) - ;; # nothing -+ ksplashx-*) -+ ;; # started earlier - Simple) - if test "$kpersonalizerrc_general_firstlogin" = "true"; then - ksplashsimple -@@ -362,7 +374,9 @@ +@@ -302,6 +312,8 @@ + case "$ksplashrc_ksplash_theme" in + None) + ;; # nothing ++ ksplashx-*) ++ ;; # started earlier + Simple) + if test "$kpersonalizerrc_general_firstlogin" = "true"; then + ksplashsimple +@@ -377,7 +389,9 @@ # Clean up kdeinit_shutdown dcopserver_shutdown --wait ++++++ suspend-unmount.diff ++++++ --- kioslave/media/mediamanager/mediamanager.cpp +++ kioslave/media/mediamanager/mediamanager.cpp @@ -326,7 +326,29 @@ emit mediumChanged(name); } +QString MediaManager::unmountAllManual() +{ + QPtrList<Medium> list = m_mediaList.list(); + QPtrList<Medium>::const_iterator it = list.begin(); + QPtrList<Medium>::const_iterator end = list.end(); + + QString result; + + for (; it!=end; ++it) + { + if ( (*it)->isMounted() ) + { + QString tmp = unmount( (*it)->id() ); + if ( !tmp.isEmpty() ) + result = tmp; + } + } + + // return last error + return result; +} + extern "C" { KDE_EXPORT KDEDModule *create_mediamanager(const QCString &obj) { --- kioslave/media/mediamanager/mediamanager.h +++ kioslave/media/mediamanager/mediamanager.h @@ -57,6 +57,8 @@ bool removablePlug(const QString &devNode, const QString &label); bool removableUnplug(const QString &devNode); bool removableCamera(const QString &devNode); + + QString unmountAllManual(); k_dcop_signals: void mediumAdded(const QString &name, bool allowNotification); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org