[Initng-svn] r3682 - in initng-gui/initconf: . src

[svn at initng.thinktux.net]

Author: danne
Date: Wed Apr  5 12:08:13 2006
New Revision: 3682

Modified:
   initng-gui/initconf/TODO
   initng-gui/initconf/src/ngehandler.c
   initng-gui/initconf/src/ngehandler.h
   initng-gui/initconf/src/serviceparser.c
Log:
Added support for new .virtual files


Modified: initng-gui/initconf/TODO
==============================================================================
--- initng-gui/initconf/TODO	(original)
+++ initng-gui/initconf/TODO	Wed Apr  5 12:08:13 2006
@@ -4,3 +4,4 @@
 * Nice way of editing service files, and also a way of creating new ones
 * Code commenting
 * Clean up stuff on quit, free memory etc.
+* Change sort order by clicking column headers

Modified: initng-gui/initconf/src/ngehandler.c
==============================================================================
--- initng-gui/initconf/src/ngehandler.c	(original)
+++ initng-gui/initconf/src/ngehandler.c	Wed Apr  5 12:08:13 2006
@@ -45,8 +45,6 @@
   }
 
   if(!valid) {
-    fprintf(stderr, "Service %s not found in service list!\n", service);
-    
     struct s_info *serviceinfo = malloc(sizeof(struct s_info));
     serviceinfo->startline = NULL;
     gtk_list_store_append (GTK_LIST_STORE(service_model), &iter);
@@ -89,7 +87,7 @@
   gdk_threads_leave();
 }
 
-void *nge_thread(const void *args) {
+void *nge_thread(void *args) {
   nge_event e;
 
   /* Always null this, to reset it */

Modified: initng-gui/initconf/src/ngehandler.h
==============================================================================
--- initng-gui/initconf/src/ngehandler.h	(original)
+++ initng-gui/initconf/src/ngehandler.h	Wed Apr  5 12:08:13 2006
@@ -26,6 +26,6 @@
 
 void service_change(nge_event *e, char *service, e_is is, char *state);
 
-void *nge_thread(const void *args);
+void *nge_thread(void *args);
 
 #endif

Modified: initng-gui/initconf/src/serviceparser.c
==============================================================================
--- initng-gui/initconf/src/serviceparser.c	(original)
+++ initng-gui/initconf/src/serviceparser.c	Wed Apr  5 12:08:13 2006
@@ -148,6 +148,17 @@
         serviceinfo->type = RUNLEVEL;
         serviceinfo->path = fullpath;
         serviceinfo->startline = NULL;
+      } else if(!fnmatch("*.virtual", namelist[n]->d_name, 0)) {
+	fprintf(stderr, "Found virtual %s\n", namelist[n]->d_name);
+        serviceinfo = malloc(sizeof(struct s_info));
+        namelist[n]->d_name[strlen(namelist[n]->d_name)-8] = 0;
+        gtk_list_store_prepend (store, &iter);
+        gtk_list_store_set(store, &iter, 0, namelist[n]->d_name, 1, "virtual", 
+			   2, NULL, 4, serviceinfo, -1);
+        serviceinfo->name = namelist[n]->d_name;
+        serviceinfo->type = VIRTUAL;
+        serviceinfo->path = fullpath;
+        serviceinfo->startline = NULL;
       }
       free(namelist[n]);
     }