[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdeui/kernel
From:       Benjamin Reed <ranger () befunk ! com>
Date:       2007-07-02 16:42:29
Message-ID: 1183394549.601118.7665.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 682420 by reed:

learn something new every day, turns out this is completely
unnecessary because of /etc/kderc:

  [Directories]
  prefixes=/opt/kde4-deps,/opt/kde4


> P   If only I actually *read* my e-mail, I would have known
this *before* I wrote that junk.  ;)


 M  +8 -22     kapplication_mac.cpp  


--- trunk/KDE/kdelibs/kdeui/kernel/kapplication_mac.cpp #682419:682420
@@ -37,39 +37,25 @@
  * @internal
 */
 
-bool mac_initialized;
+bool dbus_initialized;
 
 void KApplication_early_init_mac()
 {
-    if (mac_initialized)
+    if (dbus_initialized)
         return;
 
-    KConfigGroup g( KGlobal::config(), "General" );
-    QStringList envVars, envAppend, path, newPath;
-    envVars << "XDG_DATA_DIRS" << "XDG_CONFIG_DIRS" << "PATH";
-    envAppend << "AddDirectoriesToXdgDataDirs" << "AddDirectoriesToXdgConfigDirs" << \
                "AddDirectoriesToPath";
-
-    for (int i = 0; i < envVars.size(); ++i) {
-        newPath = g.readPathListEntry(envAppend.at(i));
-        path = QFile::decodeName(getenv(envVars.at(i).toLocal8Bit())).split(":");
-        for (int j = 0; j < path.size(); ++j) {
-            newPath.append(path.at(j));
-        }
-        ::setenv(envVars.at(i).toLocal8Bit(), newPath.join(":").toLocal8Bit(), 1);
-        kDebug() << envVars.at(i) << "=" << newPath.join(":") << endl;
-    }
-
     /* temporary until we implement autolaunch for dbus  on Mac OS X */
     QString dbusSession;
-    for (int i = 0; i < newPath.size(); ++i) {
-        QString testSession = \
QString(newPath.at(i)).append("/start-session-bus.sh"); +    // for (int i = 0; i < \
newPath.size(); ++i) { +        // QString testSession = \
QString(newPath.at(i)).append("/start-session-bus.sh"); +        QString testSession \
= "/opt/kde4-deps/bin/start-session-bus.sh";  kDebug() << "trying " << testSession << \
endl;  if (QFile(testSession).exists()) {
             kDebug() << "found " << testSession << endl;
             dbusSession = testSession;
-            break;
+            // break;
         }
-    }
+    // }
 
     if (!dbusSession.isEmpty()) {
         kDebug() << "running " << dbusSession << " --kde-mac" << endl;
@@ -99,5 +85,5 @@
             qp.waitForFinished(-1);
         }
     }
-    mac_initialized = true;
+    dbus_initialized = true;
 }


[prev in list] [next in list] [prev in thread] [next in thread]