author | kergoth <kergoth> | 2002-03-18 23:13:24 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-03-18 23:13:24 (UTC) |
commit | 35d040816fd59e247efbe9727ecd810bcba7c2b9 (patch) (unidiff) | |
tree | bd8af7644f6ff0bfa4c1a14b3e66306ad06b9e46 /core | |
parent | 2a6b7129c74b7769c6a61a2dcdebce69e8756f62 (diff) | |
download | opie-35d040816fd59e247efbe9727ecd810bcba7c2b9.zip opie-35d040816fd59e247efbe9727ecd810bcba7c2b9.tar.gz opie-35d040816fd59e247efbe9727ecd810bcba7c2b9.tar.bz2 |
Fixing package conflicts.
-rw-r--r-- | core/launcher/launcherview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp index 538ad79..cd336d2 100644 --- a/core/launcher/launcherview.cpp +++ b/core/launcher/launcherview.cpp | |||
@@ -130,9 +130,9 @@ public: | |||
130 | Config config("qpe"); | 130 | Config config("qpe"); |
131 | config.setGroup("Appearance"); | 131 | config.setGroup("Appearance"); |
132 | QString backgroundImage = config.readEntry("BackgroundImage"); | 132 | QString backgroundImage = config.readEntry("BackgroundImage"); |
133 | 133 | ||
134 | if (backgroundImage.isNull()) backgroundImage="qpe-background"; | 134 | if (backgroundImage.isNull()) backgroundImage="opie-background"; |
135 | int backgroundMode = QPixmap::defaultDepth() >= 12 ? 1 : 0; | 135 | int backgroundMode = QPixmap::defaultDepth() >= 12 ? 1 : 0; |
136 | //int backgroundMode = 2; | 136 | //int backgroundMode = 2; |
137 | 137 | ||
138 | if ( backgroundMode == 1 ) { | 138 | if ( backgroundMode == 1 ) { |