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

List:       kde-commits
Subject:    branches/KDE/4.2/kdelibs
From:       Benjamin Reed <ranger () befunk ! com>
Date:       2009-03-25 4:22:54
Message-ID: 1237954974.638834.6419.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 944115 by reed:

X11 on OSX does not use "normal" DISPLAY syntax, it is a path to a socket file \
instead; handle / in display nicely

 M  +2 -0      kdeui/util/kcrash.cpp  
 M  +2 -1      kinit/kinit.cpp  
 M  +2 -0      kinit/wrapper.c  


--- branches/KDE/4.2/kdelibs/kdeui/util/kcrash.cpp #944114:944115
@@ -478,6 +478,8 @@
       *screen = '\0';
    while((i = strchr(result, ':')))
      *i = '_';
+   while((i = strchr(result, '/')))
+     *i = '_';
    return result;
 }
 
--- branches/KDE/4.2/kdelibs/kinit/kinit.cpp #944114:944115
@@ -643,7 +643,7 @@
 
         QByteArray executable = execpath.data();
 #ifdef Q_WS_MAC
-        QString bundlepath = s_instance->dirs()->findExe( execpath.data() );
+        QString bundlepath = \
s_instance->dirs()->findExe(QString::fromLatin1(execpath.data()));  if \
(!bundlepath.isEmpty())  executable = QFile::encodeName(bundlepath);
 #endif
@@ -1560,6 +1560,7 @@
 #endif
 
    display.replace(':','_');
+   display.replace('/','_');
    // WARNING, if you change the socket name, adjust kwrapper too
    const QString socketFileName = \
QString::fromLatin1("kdeinit4_%1").arg(QLatin1String(display));  QByteArray \
socketName = QFile::encodeName(KStandardDirs::locateLocal("socket", socketFileName, \
                *s_instance));
--- branches/KDE/4.2/kdelibs/kinit/wrapper.c #944114:944115
@@ -77,6 +77,8 @@
       *screen = '\0';
    while((i = strchr(result, ':')))
      *i = '_';
+   while((i = strchr(result, '/')))
+     *i = '_';
    return result;
 }
 


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