summaryrefslogtreecommitdiff
authorcniehaus <cniehaus>2002-11-21 10:41:31 (UTC)
committer cniehaus <cniehaus>2002-11-21 10:41:31 (UTC)
commita098d09ef14e4b41a0120dd431ef4777fd420042 (patch) (unidiff)
tree0c428827e9f4b02c5c78d1037feb741d227edfc9
parent354951c2751663e0a2f4fffe3fd3be71908df8b7 (diff)
downloadopie-a098d09ef14e4b41a0120dd431ef4777fd420042.zip
opie-a098d09ef14e4b41a0120dd431ef4777fd420042.tar.gz
opie-a098d09ef14e4b41a0120dd431ef4777fd420042.tar.bz2
applied one of Simons patches.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/startmenu.cpp2
-rw-r--r--core/launcher/systray.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp
index 7373ea8..d9382d2 100644
--- a/core/launcher/startmenu.cpp
+++ b/core/launcher/startmenu.cpp
@@ -355,17 +355,17 @@ void StartMenu::loadApplets()
355 applet-> popup = applet-> iface-> popup ( this ); 355 applet-> popup = applet-> iface-> popup ( this );
356 356
357 if ( applet-> popup ) 357 if ( applet-> popup )
358 applet-> id = launchMenu-> insertItem ( applet-> iface-> icon ( ), applet-> iface-> text ( ), applet-> popup ); 358 applet-> id = launchMenu-> insertItem ( applet-> iface-> icon ( ), applet-> iface-> text ( ), applet-> popup );
359 else 359 else
360 applet-> id = launchMenu-> insertItem ( applet-> iface-> icon ( ), applet-> iface-> text ( ) ); 360 applet-> id = launchMenu-> insertItem ( applet-> iface-> icon ( ), applet-> iface-> text ( ) );
361 applets.insert ( applet-> id, new MenuApplet(*applet)); 361 applets.insert ( applet-> id, new MenuApplet(*applet));
362 } 362 }
363 delete xapplets; 363 delete [] xapplets;
364 364
365 if ( sepId && ( launchMenu-> idAt ( launchMenu-> count ( ) - 1 ) == sepId )) { // no applets 365 if ( sepId && ( launchMenu-> idAt ( launchMenu-> count ( ) - 1 ) == sepId )) { // no applets
366 launchMenu-> removeItem ( sepId ); 366 launchMenu-> removeItem ( sepId );
367 sepId = 0; 367 sepId = 0;
368 } 368 }
369 if ( !launchMenu-> count ( )) // if we don't do this QPopupMenu will insert a dummy Separator, which won't go away later 369 if ( !launchMenu-> count ( )) // if we don't do this QPopupMenu will insert a dummy Separator, which won't go away later
370 sepId = launchMenu-> insertSeparator ( ); 370 sepId = launchMenu-> insertSeparator ( );
371 371
diff --git a/core/launcher/systray.cpp b/core/launcher/systray.cpp
index 4859e48..be55791 100644
--- a/core/launcher/systray.cpp
+++ b/core/launcher/systray.cpp
@@ -123,17 +123,17 @@ void SysTray::addApplets()
123 } 123 }
124 cfg.writeEntry( "ExcludeApplets", exclude, ',' ); 124 cfg.writeEntry( "ExcludeApplets", exclude, ',' );
125 qsort(applets,napplets,sizeof(applets[0]),compareAppletPositions); 125 qsort(applets,napplets,sizeof(applets[0]),compareAppletPositions);
126 while (napplets--) { 126 while (napplets--) {
127 TaskbarApplet *applet = applets[napplets]; 127 TaskbarApplet *applet = applets[napplets];
128 applet->applet = applet->iface->applet( this ); 128 applet->applet = applet->iface->applet( this );
129 appletList.append(*applet); 129 appletList.append(*applet);
130 } 130 }
131 delete applets; 131 delete [] applets;
132#else 132#else
133 TaskbarApplet applet; 133 TaskbarApplet applet;
134 applet.iface = new ClockAppletImpl(); 134 applet.iface = new ClockAppletImpl();
135 applet.applet = applet.iface->applet( this ); 135 applet.applet = applet.iface->applet( this );
136 appletList.append( a ); 136 appletList.append( a );
137#endif 137#endif
138 show(); 138 show();
139 139