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

List:       kde-commits
Subject:    kdebase/kdm/backend
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2005-02-05 11:15:40
Message-ID: 20050205111540.5A5931BA60 () office ! kde ! org
[Download RAW message or body]

CVS commit by ossi: 

make "shutdown status" announce bootoption.
allow unsetting bootoption.


  M +5 -7      ctrl.c   2.35


--- kdebase/kdm/backend/ctrl.c  #2.34:2.35
@@ -321,5 +321,5 @@ str_cat( char **bp, const char *str )
 
 static void
-sd_cat( char **bp, SdRec *sdr )
+sd_cat( char **bp, SdRec *sdr, BoRec *bor )
 {
         if (sdr->how == SHUT_HALT)
@@ -343,5 +343,5 @@ sd_cat( char **bp, SdRec *sdr )
         else
                 str_cat( bp, "cancel" );
-        *bp += sprintf( *bp, ",%d", sdr->uid );
+        *bp += sprintf( *bp, ",%d,%s", sdr->uid, bor->name ? bor->name : "-" );
 }
 
@@ -537,9 +537,9 @@ processCtrl( const char *string, int len
                                 if (sdRec.how) {
                                         str_cat( &bp, "\tglobal," );
-                                        sd_cat( &bp, &sdRec );
+                                        sd_cat( &bp, &sdRec, &boRec );
                                 }
                                 if (d && d->hstent->sdRec.how) {
                                         str_cat( &bp, "\tlocal," );
-                                        sd_cat( &bp, &d->hstent->sdRec );
+                                        sd_cat( &bp, &d->hstent->sdRec, &d->hstent->boRec );
                                 }
                                 *bp++ = '\n';
@@ -713,7 +713,5 @@ processCtrl( const char *string, int len
                         goto bust;
                 } else if (!strcmp( ar[0], "setbootoption" )) {
-                        if (!ar[1])
-                                goto miss;
-                        if (ar[2])
+                        if (ar[1] && ar[2])
                                 goto exce;
                         if (d && sdRec.how && sdRec.uid != -1) {


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