![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package kdebase4-workspace checked in at Sun Apr 20 16:28:19 CEST 2008. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-04-16 18:34:18.000000000 +0200 +++ kdebase4-workspace/kdebase4-wallpapers.changes 2008-04-20 16:27:13.565728000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 18 17:08:06 CEST 2008 - dmueller@suse.de + +- update 4_0_BRANCH.diff + * memleak fixes in kwin and ksplashsimple + +------------------------------------------------------------------- kdebase4-workspace.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.Yb8434/_old 2008-04-20 16:27:30.000000000 +0200 +++ /var/tmp/diff_new_pack.Yb8434/_new 2008-04-20 16:27:30.000000000 +0200 @@ -22,7 +22,7 @@ Summary: KDE 4 Wallpapers Url: http://www.kde.org/ Version: 4.0.3 -Release: 12 +Release: 15 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -59,6 +59,9 @@ /usr/share/wallpapers %changelog +* Fri Apr 18 2008 dmueller@suse.de +- update 4_0_BRANCH.diff + * memleak fixes in kwin and ksplashsimple * Wed Apr 16 2008 stbinner@suse.de - remove self conflict (bnc#379338) * Mon Apr 14 2008 dmueller@suse.de ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.Yb8434/_old 2008-04-20 16:27:30.000000000 +0200 +++ /var/tmp/diff_new_pack.Yb8434/_new 2008-04-20 16:27:30.000000000 +0200 @@ -27,7 +27,7 @@ Summary: The KDE Workspace Components Url: http://www.kde.org/ Version: 4.0.3 -Release: 12 +Release: 15 %define rversion 4.0.3 Source0: kdebase-workspace-%rversion.tar.bz2 Source2: titlebar_decor.png @@ -192,12 +192,14 @@ %package ksysguardd License: GPL v2 or later Group: System/GUI/KDE -Summary: The KDE Workspace Components +Summary: KDE base package: ksysguard daemon Conflicts: kdebase3-ksysguardd %description ksysguardd -This package contains the basic packages for a K Desktop Environment -workspace. +This package contains the ksysguard daemon. It is needed for ksysguard. + +This package can be installed on servers without any other KDE packages +to guard the system from remote computers. @@ -242,6 +244,7 @@ %doc COPYING COPYING-DOCS README %dir /usr/share/kde4/services/kwin %exclude /usr/share/kde4/apps/kwin/titlebar_decor.png +/usr/share/kde4/apps/kwin/default_rules/plasma_desktop_containment.kwinrules %package devel License: GPL v2 or later @@ -635,6 +638,9 @@ /usr/%_lib/kde4/kgreet_*.so %changelog +* Fri Apr 18 2008 dmueller@suse.de +- update 4_0_BRANCH.diff + * memleak fixes in kwin and ksplashsimple * Wed Apr 16 2008 stbinner@suse.de - remove self conflict (bnc#379338) * Mon Apr 14 2008 dmueller@suse.de ++++++ 4_0_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.Yb8434/_old 2008-04-20 16:27:31.000000000 +0200 +++ /var/tmp/diff_new_pack.Yb8434/_new 2008-04-20 16:27:31.000000000 +0200 @@ -3,7 +3,7 @@ --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: 795774 ++current HEAD: 798531 +svn di between //tags/KDE/4.0.3/kdebase/workspace and //branches/KDE/4.0/kdebase/workspace --- ksmserver/startup.cpp +++ ksmserver/startup.cpp @@ -28,8 +28,46 @@ } cg.writeEntry( "count", count ); +--- kcontrol/kfontinst/kcmfontinst/fontinst.desktop ++++ kcontrol/kfontinst/kcmfontinst/fontinst.desktop +@@ -29,7 +29,7 @@ + Name[fa]=نصبکنندۀ قلم + Name[fi]=Kirjasinasentaja + Name[fr]=Installateur de polices +-Name[fy]=Lettertype-Ynstalaasje ++Name[fy]=Lettertype-Ynstallaasje + Name[ga]=Suiteálaí Clónna + Name[gl]=Instalador de fontes tipográficas + Name[he]=מתקין הגופנים --- kcontrol/access/kaccess.notifyrc +++ kcontrol/access/kaccess.notifyrc +@@ -130,7 +130,7 @@ + Comment[hu]=Egy módosító billentyű (pl. a Shift vagy a Ctrl) aktívvá vált + Comment[is]=Breytilykill (t.d. Shift eða Ctrl) hefur breytt um stöðu og er nú virkur + Comment[it]=Un tasto modificatore (come Shift o Ctrl) ha cambiato stato ed è ora attivo +-Comment[ja]=修飾キー (Shift や Control) の状態が変更され、アクティブになりました ++Comment[ja]=修飾キー (Shift や Ctrl) の状態が変更され、アクティブになりました + Comment[km]=គ្រាប់ចុចកែប្រែ (ឧ. ប្ដូរ (Shift) ឬ ជំនួស (Control)) បានផ្លាស់ប្ដូរសភាពរបស់វា ឥឡូវនេះសកម្ម + Comment[ko]=Shift나 Control 키 같은 수정자 키의 상태가 바뀌었고 현재 사용 가능함 + Comment[lv]=Modifikatora taustiņš (piem. Shift vai Control) ir mainījis stāvokli un tad ir aktīvs +@@ -227,7 +227,7 @@ + Comment[hu]=Egy módosító billentyű (pl. a Shift vagy a Ctrl) inaktívvá vált + Comment[is]=Breytilykill (t.d. Shift eða Ctrl) hefur breytt um stöðu og er nú óvirkur + Comment[it]=Un tasto modificatore (come Shift o Ctrl) ha cambiato stato ed è ora inattivo +-Comment[ja]=修飾キー (Shift や Control) の状態が変更され、非アクティブになりました ++Comment[ja]=修飾キー (Shift や Ctrl) の状態が変更され、非アクティブになりました + Comment[km]=គ្រាប់ចុចកែប្រែ (ឧ. ប្ដូរ (Shift) ឬ បញ្ជា (Control)) បានផ្លាស់ប្ដូរសភាពរបស់វា ហើយឥឡូវនេះអសកម្ម + Comment[ko]=Shift나 Control 키 같은 수정자 키의 상태가 바뀌었고 현재 사용 불가능함 + Comment[lv]=Modifikatora taustiņš (piem. Shift vai Control) ir mainījis stāvokli un tad ir neaktīvs +@@ -324,7 +324,7 @@ + Comment[hu]=Egy módosító billentyű (pl. a Shift vagy a Ctrl) zárolódott, és ezután minden billentyűlenyomásnál aktív lesz + Comment[is]=Breytilykli (t.d. Shift eða Ctrl) hefur verið læst og er nú virkur fyrir eftirfarandi lyklaborðsaðgerðir + Comment[it]=Un tasto modificatore (come Shift o Ctrl) è stato bloccato ed è ora attivo per tutte le pressioni di tasto successive +-Comment[ja]=修飾キー (Shift や Control) がロックされ、続くキー押下のすべてに対してアクティブになりました ++Comment[ja]=修飾キー (Shift や Ctrl) がロックされ、続くキー押下のすべてに対してアクティブになりました + Comment[km]=គ្រាប់ចុចកែប្រែ (ឧ. ប្ដូរ (Shift) ឬ បញ្ជា (Control)) ត្រូវបានចាក់សោ ហើយឥឡូវនេះសកម្មសម្រាប់ការចុចគ្រាប់ចុចខាងក្រោម + Comment[ko]=Shift나 Control 키 같은 수정자 키의 상태가 바뀌었고 현재 모든 키 입력에 대해서 활성화됨 + Comment[lv]=Modifikatora taustiņš (piem. Shift vai Control) tika fiksēts un ir aktīvs visiem nākamajiem taustiņu nospiedieniem @@ -607,7 +607,7 @@ Comment[et]=Kleepuvad klahvid on keelatud või lubatud Comment[eu]=Tekla itsakorrak gaitu edo desgaitu dira @@ -62,6 +100,38 @@ echo 'startkde: Running shutdown scripts...' 1>&2 +--- klipper/urlgrabber.cpp ++++ klipper/urlgrabber.cpp +@@ -83,8 +83,7 @@ + + URLGrabber::~URLGrabber() + { +- if (myMenu) +- delete myMenu; ++ delete myMenu; + delete myActions; + qDeleteAll(myMatches); + } +@@ -280,7 +279,8 @@ + } + else + { +- delete myMenu; ++ myMenu->deleteLater(); ++ myMenu = 0; + } + delete dlg; + } +@@ -380,7 +380,8 @@ + } + } + +- delete myMenu; ++ myMenu->deleteLater(); ++ myMenu = 0; + } + + /////////////////////////////////////////////////////////////////////////// --- kmenuedit/khotkeys.cpp +++ kmenuedit/khotkeys.cpp @@ -40,7 +40,7 @@ @@ -233,6 +303,32 @@ Name[nb]=Forhåndsdefinerte handlinger Name[nds]=Vörinstellt Akschonen Name[ne]=कार्य प्रिसेट गर्नुहोस् +--- ksplash/simple/main.cpp ++++ ksplash/simple/main.cpp +@@ -171,10 +171,9 @@ + } + if( ev.type == ConfigureNotify && ev.xconfigure.event == DefaultRootWindow( dpy )) + { +- for( int i = 0; +- i < wins_count; +- ++i ) +- XRaiseWindow( dpy, wins[ i ] ); ++ XRaiseWindow( dpy, wins[ 0 ] ); ++ if( wins_count > 1 ) ++ XRestackWindows( dpy, wins, wins_count ); + } + if( ev.type == ClientMessage && ev.xclient.window == DefaultRootWindow( dpy ) + && ev.xclient.message_type == kde_splash_progress ) +--- ksplash/kcm/installer.cpp ++++ ksplash/kcm/installer.cpp +@@ -125,6 +125,7 @@ + leftbox->addWidget(mThemesList); + + mBtnAdd = new KPushButton( i18n("Add..."), this ); ++ mBtnAdd->setEnabled(false); + leftbox->addWidget( mBtnAdd ); + connect(mBtnAdd, SIGNAL(clicked()), SLOT(slotAdd())); + --- kwin/effects/sharpen.desktop +++ kwin/effects/sharpen.desktop @@ -61,7 +61,7 @@ @@ -291,6 +387,19 @@ Comment[fy]=Fisueel effekt by it ynloggen Comment[ga]=Maisíocht físe ag am logála isteach Comment[gl]=Efeito visual de aceso +--- kwin/workspace.h ++++ kwin/workspace.h +@@ -699,8 +699,8 @@ + + Placement *initPositioning; + +- QRect* workarea; // array of workareas for virtual desktops +- QRect** screenarea; // array of workareas per xinerama screen for all virtual desktops ++ QVector< QRect > workarea; // array of workareas for virtual desktops ++ QVector< QVector< QRect > > screenarea; // array of workareas per xinerama screen for all virtual desktops + + bool managing_topmenus; + KSelectionOwner* topmenu_selection; --- kwin/kwin.notifyrc +++ kwin/kwin.notifyrc @@ -4005,6 +4005,7 @@ @@ -301,6 +410,71 @@ Comment[eo]=Provizora fenestro (dialogo) aperas Comment[es]=Aparece la ventana de transición (un diálogo) Comment[et]=Avaneb ajutine aken (dialoog) +--- kwin/geometry.cpp ++++ kwin/geometry.cpp +@@ -87,9 +87,9 @@ + QDesktopWidget *desktopwidget = KApplication::desktop(); + int nscreens = desktopwidget -> numScreens (); + // kDebug () << "screens: " << nscreens; +- QRect* new_wareas = new QRect[ numberOfDesktops() + 1 ]; +- QRect** new_sareas = new QRect*[ numberOfDesktops() + 1]; +- QRect* screens = new QRect [ nscreens ]; ++ QVector< QRect > new_wareas( numberOfDesktops() + 1 ); ++ QVector< QVector< QRect > > new_sareas( numberOfDesktops() + 1 ); ++ QVector< QRect > screens( nscreens ); + QRect desktopArea = desktopwidget -> geometry (); + for( int iS = 0; + iS < nscreens; +@@ -102,7 +102,7 @@ + ++i ) + { + new_wareas[ i ] = desktopArea; +- new_sareas[ i ] = new QRect [ nscreens ]; ++ new_sareas[ i ].resize( nscreens ); + for( int iS = 0; + iS < nscreens; + iS ++ ) +@@ -166,7 +166,7 @@ + + bool changed = force; + +- if (! screenarea) ++ if(screenarea.isEmpty()) + changed = true; + + for( int i = 1; +@@ -184,12 +184,8 @@ + + if ( changed ) + { +- delete[] workarea; + workarea = new_wareas; +- new_wareas = NULL; +- delete[] screenarea; + screenarea = new_sareas; +- new_sareas = NULL; + NETRect r; + for( int i = 1; i <= numberOfDesktops(); i++) + { +@@ -210,9 +206,6 @@ + ++it) + (*it)->checkWorkspacePosition(); + } +- delete[] screens; +- delete[] new_sareas; +- delete[] new_wareas; + } + + void Workspace::updateClientArea() +@@ -233,7 +226,7 @@ + if( desktop == NETWinInfo::OnAllDesktops || desktop == 0 ) + desktop = currentDesktop(); + QDesktopWidget *desktopwidget = KApplication::desktop(); +- QRect sarea = screenarea // may be NULL during KWin initialization ++ QRect sarea = !screenarea.isEmpty() // may be empty during KWin initialization + ? screenarea[ desktop ][ screen ] + : desktopwidget->screenGeometry( screen ); + QRect warea = workarea[ desktop ].isNull() --- kwin/main.cpp +++ kwin/main.cpp @@ -490,6 +490,8 @@ @@ -312,6 +486,54 @@ KWin::Application a; KWin::SessionManager weAreIndeed; KWin::SessionSaveDoneHelper helper; +--- kwin/workspace.cpp ++++ kwin/workspace.cpp +@@ -124,8 +124,6 @@ + layoutOrientation(Qt::Vertical), + layoutX(-1), + layoutY(2), +- workarea(NULL), +- screenarea(NULL), + managing_topmenus( false ), + topmenu_selection( NULL ), + topmenu_watcher( NULL ), +@@ -467,8 +465,6 @@ + delete rootInfo; + delete supportWindow; + delete mgr; +- delete[] workarea; +- delete[] screenarea; + delete startup; + delete initPositioning; + delete topmenu_watcher; +@@ -1085,10 +1081,9 @@ + + int n = group.readEntry("Number", 4); + number_of_desktops = n; +- delete workarea; +- workarea = new QRect[ n + 1 ]; +- delete screenarea; +- screenarea = NULL; ++ workarea.clear(); ++ workarea.resize( n + 1 ); ++ screenarea.clear(); + rootInfo->setNumberOfDesktops( number_of_desktops ); + desktop_focus_chain.resize( n ); + // make it +1, so that it can be accessed as [1..numberofdesktops] +--- kwin/utils.cpp ++++ kwin/utils.cpp +@@ -298,7 +298,10 @@ + + void ungrabXKeyboard() + { +- assert( keyboard_grabbed ); ++ if( !keyboard_grabbed ) ++ { // grabXKeyboard() may fail sometimes, so don't fail, but at least warn anyway ++ kDebug() << "ungrabXKeyboard() called but keyboard not grabbed!"; ++ } + keyboard_grabbed = false; + XUngrabKeyboard( display(), xTime()); + } --- kdm/kfrontend/sessions/wmaker.desktop +++ kdm/kfrontend/sessions/wmaker.desktop @@ -31,7 +31,7 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de