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

List:       kde-commits
Subject:    kdebase/kdm/kfrontend
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2004-11-26 22:30:29
Message-ID: 20041126223029.724DC1B909 () office ! kde ! org
[Download RAW message or body]

CVS commit by ossi: 

make --with-kdm-xconsole work again


  M +1 -0      kchooser.cpp   1.16
  M +4 -1      kdm_greet.h   1.23
  M +1 -1      kgreeter.cpp   1.130


--- kdebase/kdm/kfrontend/kchooser.cpp  #1.15:1.16
@@ -25,4 +25,5 @@
 
 #include "kchooser.h"
+#include "kconsole.h"
 #include "kdmconfig.h"
 #include "kdm_greet.h"

--- kdebase/kdm/kfrontend/kdm_greet.h  #1.22:1.23
@@ -28,5 +28,8 @@
 
 #include <greet.h>      /* for the ATTR_ defines */
-#include <config.ci>    /* for the HAVE_VTS define */
+#ifndef RCVERMAJOR
+# include <config.h>
+# include <config.ci>   /* for the HAVE_VTS define */
+#endif
 
 #ifdef __cplusplus

--- kdebase/kdm/kfrontend/kgreeter.cpp  #1.129:1.130
@@ -587,5 +587,5 @@ KStdGreeter::KStdGreeter()
     if (consoleView) {
         QBoxLayout *ex_box = new QVBoxLayout( this, 10, 10 );
-        main_box = new QHBoxLayout( main_box, 10 );
+        main_box = new QHBoxLayout( ex_box, 10 );
         ex_box->addWidget( consoleView );
     } else


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