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

List:       kde-commits
Subject:    KDE/kdelibs/dcop
From:       Benjamin Reed <ranger () befunk ! com>
Date:       2006-04-12 20:04:04
Message-ID: 1144872244.688427.30273.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 529225 by reed:

do this in a more uniform way

 M  +6 -2      CMakeLists.txt  
 M  +7 -1      dcopserver_shutdown.c  


--- trunk/KDE/kdelibs/dcop/CMakeLists.txt #529224:529225
@@ -32,9 +32,13 @@
   ${CMAKE_SOURCE_DIR}/dcop/KDE-ICE/globals.c
 )
 
-if (WIN32)
+if (NOT Q_WS_X11 AND NOT Q_WS_QWS)
+add_definitions(-DNO_DISPLAY)
+endif (NOT Q_WS_X11 AND NOT Q_WS_QWS)
+
+if (WIN32 OR APPLE)
    add_subdirectory( iceauth )
-endif (WIN32)
+endif (WIN32 OR APPLE)
 
 add_subdirectory( dcopidlng )
 add_subdirectory( dcopidl2cpp )
--- trunk/KDE/kdelibs/dcop/dcopserver_shutdown.c #529224:529225
@@ -54,6 +54,12 @@
    char *result;
    char *screen;
    char *colon;
+
+#if defined(NO_DISPLAY)
+	/* no such thing as a display on these systems */
+	return "NODISPLAY";
+#endif
+
 /*
  don't test for a value from qglobal.h but instead distinguish
  Qt/X11 from Qt/Embedded by the fact that Qt/E apps have -DQWS
@@ -119,7 +125,7 @@
   display = getDisplay();
   if (display == NULL)
   {
-#if _WIN32
+#if defined(NO_DISPLAY)
   	 strcat(dcop_file,"NODISPLAY");
 #else 
      dcop_file[0] = '\0';
[prev in list] [next in list] [prev in thread] [next in thread]