-rw-r--r-- | core/launcher/startmenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp index b84eed8..c199063 100644 --- a/core/launcher/startmenu.cpp +++ b/core/launcher/startmenu.cpp | |||
@@ -345,25 +345,24 @@ void StartMenu::loadApplets() | |||
345 | delete trans; | 345 | delete trans; |
346 | } else { | 346 | } else { |
347 | exclude += *it; | 347 | exclude += *it; |
348 | delete lib; | 348 | delete lib; |
349 | } | 349 | } |
350 | } | 350 | } |
351 | cfg.writeEntry( "ExcludeApplets", exclude, ',' ); | 351 | cfg.writeEntry( "ExcludeApplets", exclude, ',' ); |
352 | qsort(xapplets, napplets, sizeof(menuApplets[0]), compareAppletPositions); | 352 | qsort(xapplets, napplets, sizeof(menuApplets[0]), compareAppletPositions); |
353 | 353 | ||
354 | 354 | ||
355 | while ( napplets-- ) { | 355 | while ( napplets-- ) { |
356 | MenuApplet *applet = xapplets[napplets]; | 356 | MenuApplet *applet = xapplets[napplets]; |
357 | |||
358 | applet->popup = applet->iface->popup( this ); | 357 | applet->popup = applet->iface->popup( this ); |
359 | 358 | ||
360 | // menuApplets got an id < -1 | 359 | // menuApplets got an id < -1 |
361 | menuApplets.insert( -( currentItem + 2 ), new MenuApplet( *applet ) ); | 360 | menuApplets.insert( -( currentItem + 2 ), new MenuApplet( *applet ) ); |
362 | currentItem++; | 361 | currentItem++; |
363 | } | 362 | } |
364 | delete [] xapplets; | 363 | delete [] xapplets; |
365 | 364 | ||
366 | addApplets( launchMenu ); | 365 | addApplets( launchMenu ); |
367 | } | 366 | } |
368 | 367 | ||
369 | 368 | ||
@@ -375,20 +374,21 @@ void StartMenu::addApplets(QPopupMenu* pop) { | |||
375 | if( pop-> count ( )) | 374 | if( pop-> count ( )) |
376 | pop-> insertSeparator ( ); | 375 | pop-> insertSeparator ( ); |
377 | 376 | ||
378 | for ( QIntDictIterator<MenuApplet> it( menuApplets ); it.current(); ++it ) { | 377 | for ( QIntDictIterator<MenuApplet> it( menuApplets ); it.current(); ++it ) { |
379 | MenuApplet *applet = it.current(); | 378 | MenuApplet *applet = it.current(); |
380 | if ( applet->popup ) | 379 | if ( applet->popup ) |
381 | applet->id = pop->insertItem( applet->iface->icon(), | 380 | applet->id = pop->insertItem( applet->iface->icon(), |
382 | applet->iface->text(), applet->popup ); | 381 | applet->iface->text(), applet->popup ); |
383 | else | 382 | else |
384 | applet->id = pop->insertItem( applet->iface->icon(), | 383 | applet->id = pop->insertItem( applet->iface->icon(), |
385 | applet->iface->text() ); | 384 | applet->iface->text() ); |
386 | 385 | ||
386 | |||
387 | dict.insert( applet->id, new MenuApplet( *applet ) ); | 387 | dict.insert( applet->id, new MenuApplet( *applet ) ); |
388 | } | 388 | } |
389 | /* need to update the key */ | 389 | /* need to update the key */ |
390 | menuApplets.setAutoDelete( true ); | 390 | menuApplets.setAutoDelete( true ); |
391 | menuApplets.clear(); | 391 | menuApplets.clear(); |
392 | menuApplets.setAutoDelete( false ); | 392 | menuApplets.setAutoDelete( false ); |
393 | menuApplets = dict; | 393 | menuApplets = dict; |
394 | } | 394 | } |