summaryrefslogtreecommitdiff
authordrw <drw>2005-03-05 23:41:40 (UTC)
committer drw <drw>2005-03-05 23:41:40 (UTC)
commit0baadaef5a3da4fda08df75394475f577af58828 (patch) (side-by-side diff)
treea8d5d8afaeafa921bc2374e4525768a809cb7f80
parenta287cf7aad0660d4c7a573ff4da8ef35c78bb712 (diff)
downloadopie-0baadaef5a3da4fda08df75394475f577af58828.zip
opie-0baadaef5a3da4fda08df75394475f577af58828.tar.gz
opie-0baadaef5a3da4fda08df75394475f577af58828.tar.bz2
Change loadIconSet to loadPixmap to prevent search for new_disabled icon (which doesn't exist
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/tools/quicklauncher/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/tools/quicklauncher/main.cpp b/core/tools/quicklauncher/main.cpp
index 59dd17e..72f574a 100644
--- a/core/tools/quicklauncher/main.cpp
+++ b/core/tools/quicklauncher/main.cpp
@@ -213,65 +213,65 @@ int main( int argc, char** argv )
char **envp = environ;
/* Move the environment so we can reuse the memory.
* (Code borrowed from sendmail.) */
for (i = 0; envp[i] != NULL; i++)
continue;
environ = (char **) malloc(sizeof(char *) * (i + 1));
if (environ == NULL)
return -1;
for (i = 0; envp[i] != NULL; i++)
if ((environ[i] = strdup(envp[i])) == NULL)
return -1;
environ[i] = NULL;
argv0 = argv;
if (i > 0)
argv_lth = envp[i-1] + strlen(envp[i-1]) - argv0[0];
else
argv_lth = argv0[argc-1] + strlen(argv0[argc-1]) - argv0[0];
#endif
(void)new QuickLauncher();
odebug << "QuickLauncher running" << oendl;
// Pre-load default fonts
QFontMetrics fm( QApplication::font() );
fm.ascent(); // causes font load.
QFont f( QApplication::font() );
f.setWeight( QFont::Bold );
QFontMetrics fmb( f );
fmb.ascent(); // causes font load.
// Each of the following force internal structures/internal
// initialization to be performed. This may mean allocating
// memory that is not needed by all applications.
- Resource::loadIconSet("new"); // do internal init
+ Resource::loadPixmap("new"); // do internal init
/* make sure libopie gets lined in */
{
Opie::Ui::OWait item;
}
// Create a widget to force initialization of title bar images, etc.
QObject::disconnect(app, SIGNAL(lastWindowClosed()), app, SLOT(hideOrQuit()));
QWidget *w = new QWidget(0,0,Qt::WDestructiveClose|Qt::WStyle_ContextHelp|Qt::WStyle_Tool);
w->setGeometry( -100, -100, 10, 10 );
w->show();
QTimer::singleShot( 0, w, SLOT(close()) );
app->enter_loop();
}
int rv = app->exec();
if ( mainWindow )
delete (QWidget*)mainWindow;
delete app;
if ( appIface )
loader->releaseInterface( appIface );
delete loader;
// Neither QLibrary nor my Dropin is a QObject and they don't depend
// on a qApp so we destroy QWidget::destroyMapper() without
// crashing the app
//
// The problem is there are some 'static' resources not freed