vmchooser-src-changes

* patch from Sebastian for GCC-4.2 compatibility
* changes to Makefile: 
  linker takes now /usr/lib/libboost_regex.a

* new vmchooser (compiled on debian-4.0)
  older debian was not able to install libxml2-dev
* changes to default session (if it is not already in svn)


git-svn-id: http://svn.openslx.org/svn/openslx/openslx-src-tools/vmchooser/trunk@2245 95ad53e4-c205-0410-b2fa-d234c58c8868

24 files changed, 42 insertions, 42 deletions

diff --git a/vmchooser/Makefile b/vmchooser/Makefile
index 282c451..19aa6ba 100644
--- a/vmchooser/Makefile
+++ b/vmchooser/Makefile
@@ -5,9 +5,9 @@ DEPS    := ${SRCS:.cxx=.dep}
 XDEPS   := $(wildcard ${DEPS}) 
 
 CC	= g++
-CCFLAGS = -O2 -Wall -Werror -ggdb -I/usr/include -I../fltk-2/include/ -I. `xml2-config --cflags`
+CCFLAGS = -O2 -Wall -I/usr/include -I../fltk-2/include/ -I. `xml2-config --cflags` #-ggdb #-Werror
 LDFLAGS = -L../fltk-2/lib/ -L/usr/lib 
-LIBS    = -lpng ../fltk-2/lib/libfltk2_images.a -ljpeg -lz -lXi -lXinerama -lpthread -lm -lXext -lsupc++ -lXrender -lfontconfig -lxml2 -lXft -lXdmcp -lXau -ldl -lz -lfreetype -lX11 ../fltk-2/lib/libfltk2.a -lboost_regex-s 
+LIBS    = -lpng ../fltk-2/lib/libfltk2_images.a -ljpeg -lz -lXi -lXinerama -lpthread -lm -lXext -lsupc++ -lXrender -lfontconfig -lxml2 -lXft -lXdmcp -lXau -ldl -lz -lfreetype -lX11 ../fltk-2/lib/libfltk2.a /usr/lib/libboost_regex.a
 
 .PHONY: all clean distclean 
 all:: ${TARGET} 
@@ -30,6 +30,6 @@ clean::
 	rm -f *~ *.o ${TARGET} 
 
 install:
-	cp vmchooser ../../../../../../openslx/trunk/os-plugins/plugins/vmchooser/files/
+	cp vmchooser ../../../../openslx/trunk/os-plugins/plugins/vmchooser/files/
 
 distclean:: clean
diff --git a/vmchooser/SWindow.cxx b/vmchooser/SWindow.cxx
index 8179146..247231e 100644
--- a/vmchooser/SWindow.cxx
+++ b/vmchooser/SWindow.cxx
@@ -185,7 +185,7 @@ void SWindow::unfold_entries() {
 /******************************************************
  * Helper function to get symbols for entries
  ******************************************************/
-char** SWindow::get_symbol(DataEntry* dat) {
+const char** SWindow::get_symbol(DataEntry* dat) {
   if(dat->imgtype == VMWARE) {
     if(dat->locked) {
     	return xp_locked_32_xpm;
diff --git a/vmchooser/img/gnome.xpm b/vmchooser/img/gnome.xpm
index 26f45b4..926da09 100644
--- a/vmchooser/img/gnome.xpm
+++ b/vmchooser/img/gnome.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * gnome_xpm[] = {
+static const char * gnome_xpm[] = {
 "64 65 2013 2",
 "  	c None",
 ". 	c #8A8F8B",
diff --git a/vmchooser/img/gnome_32.xpm b/vmchooser/img/gnome_32.xpm
index 35e86d8..bce9075 100644
--- a/vmchooser/img/gnome_32.xpm
+++ b/vmchooser/img/gnome_32.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * gnome_32_xpm[] = {
+static const char * gnome_32_xpm[] = {
 "32 32 606 2",
 "  	c None",
 ". 	c #858886",
diff --git a/vmchooser/img/gnome_48.xpm b/vmchooser/img/gnome_48.xpm
index bc836a3..3462b02 100644
--- a/vmchooser/img/gnome_48.xpm
+++ b/vmchooser/img/gnome_48.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * gnome_48_xpm[] = {
+static const char * gnome_48_xpm[] = {
 "48 48 1230 2",
 "  	c None",
 ". 	c #909291",
diff --git a/vmchooser/img/kde.xpm b/vmchooser/img/kde.xpm
index e85dba1..e7a2f30 100644
--- a/vmchooser/img/kde.xpm
+++ b/vmchooser/img/kde.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * kde_xpm[] = {
+static const char * kde_xpm[] = {
 "64 64 2186 2",
 "  	c None",
 ". 	c #15469F",
diff --git a/vmchooser/img/kde_32.xpm b/vmchooser/img/kde_32.xpm
index a102756..d3f1560 100644
--- a/vmchooser/img/kde_32.xpm
+++ b/vmchooser/img/kde_32.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * kde_32_xpm[] = {
+static const char * kde_32_xpm[] = {
 "32 32 745 2",
 "  	c None",
 ". 	c #13459E",
diff --git a/vmchooser/img/kde_48.xpm b/vmchooser/img/kde_48.xpm
index cf0b675..3bde4fd 100644
--- a/vmchooser/img/kde_48.xpm
+++ b/vmchooser/img/kde_48.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * kde_48_xpm[] = {
+static const char * kde_48_xpm[] = {
 "48 48 1495 2",
 "  	c None",
 ". 	c #15469F",
diff --git a/vmchooser/img/linux.xpm b/vmchooser/img/linux.xpm
index 9f60dd4..a2f4098 100644
--- a/vmchooser/img/linux.xpm
+++ b/vmchooser/img/linux.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * linux_xpm[] = {
+static const char * linux_xpm[] = {
 "64 64 767 2",
 "  	c #FFFFFF",
 ". 	c #FDFDFD",
diff --git a/vmchooser/img/linux_32.xpm b/vmchooser/img/linux_32.xpm
index a62740e..f6ebec4 100644
--- a/vmchooser/img/linux_32.xpm
+++ b/vmchooser/img/linux_32.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * linux_32_xpm[] = {
+static const char * linux_32_xpm[] = {
 "32 32 327 2",
 "  	c #FFFFFF",
 ". 	c #F4F4F4",
diff --git a/vmchooser/img/linux_48.xpm b/vmchooser/img/linux_48.xpm
index d16bea4..bc4c3bd 100644
--- a/vmchooser/img/linux_48.xpm
+++ b/vmchooser/img/linux_48.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * linux_48_xpm[] = {
+static const char * linux_48_xpm[] = {
 "48 48 536 2",
 "  	c #FFFFFF",
 ". 	c #FDFDFD",
diff --git a/vmchooser/img/xfce.xpm b/vmchooser/img/xfce.xpm
index 2346979..b6fd6fd 100644
--- a/vmchooser/img/xfce.xpm
+++ b/vmchooser/img/xfce.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * xfce_xpm[] = {
+static const char * xfce_xpm[] = {
 "64 64 1710 2",
 "  	c #FFFFFF",
 ". 	c #FDFEFF",
diff --git a/vmchooser/img/xfce_32.xpm b/vmchooser/img/xfce_32.xpm
index 832f3f4..46da419 100644
--- a/vmchooser/img/xfce_32.xpm
+++ b/vmchooser/img/xfce_32.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * xfce_32_xpm[] = {
+static const char * xfce_32_xpm[] = {
 "32 32 520 2",
 "  	c #FFFFFF",
 ". 	c #FEFFFE",
diff --git a/vmchooser/img/xfce_48.xpm b/vmchooser/img/xfce_48.xpm
index 9abdb7d..e470da1 100644
--- a/vmchooser/img/xfce_48.xpm
+++ b/vmchooser/img/xfce_48.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * xfce_48_xpm[] = {
+static const char * xfce_48_xpm[] = {
 "48 48 1038 2",
 "  	c #FFFFFF",
 ". 	c #FEFEFF",
diff --git a/vmchooser/img/xp.xpm b/vmchooser/img/xp.xpm
index 40eb673..cda7e91 100644
--- a/vmchooser/img/xp.xpm
+++ b/vmchooser/img/xp.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * xp_xpm[] = {
+static const char * xp_xpm[] = {
 "64 57 1893 2",
 "  	c #FFFFFF",
 ". 	c #FEFFFE",
diff --git a/vmchooser/img/xp_32.xpm b/vmchooser/img/xp_32.xpm
index a376fe7..451c055 100644
--- a/vmchooser/img/xp_32.xpm
+++ b/vmchooser/img/xp_32.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * xp_32_xpm[] = {
+static const char * xp_32_xpm[] = {
 "32 28 620 2",
 "  	c #FFFFFF",
 ". 	c #FEFFFE",
diff --git a/vmchooser/img/xp_48.xpm b/vmchooser/img/xp_48.xpm
index fc8b3d8..864f0f9 100644
--- a/vmchooser/img/xp_48.xpm
+++ b/vmchooser/img/xp_48.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * xp_48_xpm[] = {
+static const char * xp_48_xpm[] = {
 "48 43 1097 2",
 "  	c #FFFFFF",
 ". 	c #FCF7EE",
diff --git a/vmchooser/img/xp_locked.xpm b/vmchooser/img/xp_locked.xpm
index 42d93da..ab19d3e 100644
--- a/vmchooser/img/xp_locked.xpm
+++ b/vmchooser/img/xp_locked.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * xp_locked_xpm[] = {
+static const char * xp_locked_xpm[] = {
 "64 57 2044 2",
 "  	c None",
 ". 	c #FFFFFF",
diff --git a/vmchooser/img/xp_locked_32.xpm b/vmchooser/img/xp_locked_32.xpm
index 2bb24cf..a0f8afc 100644
--- a/vmchooser/img/xp_locked_32.xpm
+++ b/vmchooser/img/xp_locked_32.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * xp_locked_32_xpm[] = {
+static const char * xp_locked_32_xpm[] = {
 "32 28 651 2",
 "  	c None",
 ". 	c #FFFFFF",
diff --git a/vmchooser/img/xp_locked_48.xpm b/vmchooser/img/xp_locked_48.xpm
index 05f6d90..fe0f8ce 100644
--- a/vmchooser/img/xp_locked_48.xpm
+++ b/vmchooser/img/xp_locked_48.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * xp_locked_48_xpm[] = {
+static const char * xp_locked_48_xpm[] = {
 "48 43 1194 2",
 "  	c None",
 ". 	c #FFFFFF",
diff --git a/vmchooser/inc/SWindow.h b/vmchooser/inc/SWindow.h
index 4a8a9f4..052d328 100644
--- a/vmchooser/inc/SWindow.h
+++ b/vmchooser/inc/SWindow.h
@@ -54,7 +54,7 @@ private:
    * ctor with some reasonable default values
    */
   //SWindow(char* p = "Choose your session!");
-  SWindow(int w, int h, char* p = "Choose your session!");
+  SWindow(int w, int h, char* p = (char *) "Choose your session!");
 
 public:
   static SWindow* getInstance(int w, int h) {
@@ -85,7 +85,7 @@ public:
   void set_entries(DataEntry** ent, char* slxgroup);
   void set_lin_entries(DataEntry** ent, char* slxgroup);
   
-  char** get_symbol(DataEntry* dat);
+  const char** get_symbol(DataEntry* dat);
 
   void free_entries();
   void unfold_entries();
diff --git a/vmchooser/main.cxx b/vmchooser/main.cxx
index 97a1502..3d6ff45 100644
--- a/vmchooser/main.cxx
+++ b/vmchooser/main.cxx
@@ -64,7 +64,7 @@ int main(int argc, char** argv) {
   }
   if (xmlpath == NULL) {
     // Default Path comes here
-    xmlpath = "/var/lib/vmware/vmconfigs/";
+    xmlpath = (char *) "/var/lib/vmware/vmconfigs/";
   }
   
   /** SLX GROUP */
@@ -75,7 +75,7 @@ int main(int argc, char** argv) {
     slxgroup = opt->getValue("group");
   }
   if (slxgroup == NULL) {
-    slxgroup = "default";
+    slxgroup = (char *) "default";
   }
   
   /** LINUX SESSION PATH */
@@ -86,7 +86,7 @@ int main(int argc, char** argv) {
     lsesspath = opt->getValue("lpath");
   }
   if (lsesspath == NULL) {
-    lsesspath = "/usr/share/xsessions/";
+    lsesspath = (char *) "/usr/share/xsessions/";
   }
   
   /** Size of Window */
diff --git a/vmchooser/readXmlDir.cxx b/vmchooser/readXmlDir.cxx
index c6a51ff..f53a475 100644
--- a/vmchooser/readXmlDir.cxx
+++ b/vmchooser/readXmlDir.cxx
@@ -102,7 +102,7 @@ DataEntry* get_entry(xmlDoc * doc)
         	de->xml_name = string(doc->name);
         }
 
-        tempc = getAttribute(doc,"short_description");
+        tempc = getAttribute(doc,(char *)"short_description");
         if (tempc != NULL ) {
                 de->short_description = tempc;
 		//printf("%s\n",de->short_description.c_str());
@@ -123,50 +123,50 @@ DataEntry* get_entry(xmlDoc * doc)
                 return NULL;
         }
 
-        tempc = getAttribute(doc,"long_description");
+        tempc = getAttribute(doc,(char *) "long_description");
         if (tempc != NULL ) {
                 de->description = tempc;
         }
         tempc = NULL;
 
-        tempc = getAttribute(doc,"creator");
+        tempc = getAttribute(doc,(char *) "creator");
         if (tempc != NULL ) {
                 de->creator = tempc;
         }
         tempc = NULL;
 
-        tempc = getAttribute(doc,"email");
+        tempc = getAttribute(doc,(char *) "email");
         if (tempc != NULL ) {
                 de->email = tempc;
         }
         tempc = NULL;
 
-        tempc = getAttribute(doc,"phone");
+        tempc = getAttribute(doc,(char *) "phone");
         if (tempc != NULL ) {
                 de->phone = tempc;
         }
         tempc = NULL;
 
-        tempc = getAttribute(doc,"image_name");
+        tempc = getAttribute(doc,(char *) "image_name");
         if (tempc != NULL ) {
                 de->imgname = tempc;
         }
         tempc = NULL;
 
-        tempc = getAttribute(doc,"os");
+        tempc = getAttribute(doc,(char *) "os");
         if (tempc != NULL ) {
                 de->os = tempc;
         }
         tempc = NULL;
 
-        tempc = getAttribute(doc,"network");
+        tempc = getAttribute(doc,(char *) "network");
         if (tempc != NULL ) {
                 de->network = tempc;
         }
         tempc = NULL;
         
 
-        tempc = getAttribute(doc,"virtualmachine");
+        tempc = getAttribute(doc,(char *) "virtualmachine");
         if (tempc != NULL ) {
                 if ( strcmp(tempc,"vmware") == 0 ) {
                         de->imgtype = VMWARE;
@@ -183,13 +183,13 @@ DataEntry* get_entry(xmlDoc * doc)
         }
         tempc = NULL;
 
-        tempc = getAttribute(doc,"active");
+        tempc = getAttribute(doc,(char *) "active");
         if (tempc != NULL ) {
                 de->active = (strstr(tempc,"true")!= NULL?true:false);
         }
         tempc = NULL;
         
-        tempc = getAttribute(doc,"locked");
+        tempc = getAttribute(doc,(char *) "locked");
         if (tempc != NULL ) {
                 de->locked = (strstr(tempc,"true")!= NULL?true:false);
         }
@@ -198,19 +198,19 @@ DataEntry* get_entry(xmlDoc * doc)
         }
         tempc = NULL;
 
-        tempc = getAttribute(doc,"pools");
+        tempc = getAttribute(doc,(char *) "pools");
         if (tempc != NULL ) {
                 de->pools = tempc;
         }
         tempc = NULL;
 
-        tempc = getAttribute(doc,"xdm");
+        tempc = getAttribute(doc,(char *) "xdm");
         if (tempc != NULL ) {
                 de->xdm = tempc;
         }
         tempc = NULL;
 
-        tempc = getAttribute(doc,"priority");
+        tempc = getAttribute(doc,(char *) "priority");
         if (tempc != NULL ) {
                 de->priority = atoi(tempc);
         }
diff --git a/vmchooser/runImage.cxx b/vmchooser/runImage.cxx
index 95bb99f..eba99a6 100644
--- a/vmchooser/runImage.cxx
+++ b/vmchooser/runImage.cxx
@@ -62,7 +62,7 @@ string runImage(DataEntry& dat, string confxml)
   //cout << dat.imgtype << endl << VMWARE << endl;
   if (dat.imgtype == VMWARE) {
     //cout << confxml << endl;
-    char* arg[] = { "/var/X11R6/bin/run-vmware.sh",
+    char* arg[] = { (char *) "/var/X11R6/bin/run-vmware.sh",
             (char*)confxml.c_str(),
             NULL };