tagging ychat-0.7.9.1ychat-0.7.9.1

3 files changed, 13 insertions, 6 deletions

diff --git a/src/conf/conf.cpp b/src/conf/conf.cpp
index 2e5893b..38c29c4 100755
--- a/src/conf/conf.cpp
+++ b/src/conf/conf.cpp
@@ -36,6 +36,7 @@ conf::conf( string s_conf, map<string,string>* p_start_params ) : name::name( s_
     cout << CFILEFA << endl;
     exit(1);
   }
+
   else
   {
     cout << CFILEOK << "..." << endl;
@@ -76,12 +77,18 @@ conf::parse_xml(TiXmlNode* p_node, vector<string>* p_vec)
   {
     //cout << p_vec->size() << ": (Value:" << p_child->Value() << ") (Type:" << p_child->Type() << ")" << endl;
 
-    if ( strcmp(p_child->Value(),"category") == 0 )
+    if ( strcmp(p_child->Value(),"config") == 0 )
+    {
+      parse_xml(p_child, p_vec);
+    }
+
+    else if ( strcmp(p_child->Value(),"category") == 0 )
     {
       p_vec->push_back(p_child->ToElement()->Attribute("name"));
       parse_xml(p_child, p_vec);
       p_vec->pop_back();
     }
+
     else if ( strcmp(p_child->Value(),"option") == 0 )
     {
       string s_option_name = "";
diff --git a/src/glob.h b/src/glob.h
index 7d64126..60526fb 100755
--- a/src/glob.h
+++ b/src/glob.h
@@ -22,7 +22,7 @@
  Should yChat get compiled with database support? Currently MyS-
  QL only is a supported database. 
 */
-//#define DATABASE
+#define DATABASE
 
 #ifdef DATABASE
 #define USE_MYSQL 
diff --git a/src/msgs.h b/src/msgs.h
index 04cfa5c..7fb4a98 100755
--- a/src/msgs.h
+++ b/src/msgs.h
@@ -112,10 +112,10 @@
 #define XMLREAD "XML: Reading "
 #define XMLERR "XML Error: "
 #define XMLER1 "XML Error: Unable to load file "
-#define VERSION "0.7.9"
+#define VERSION "0.7.9.1"
 #define BRANCH "RELEASE"
-#define BUILDNR 3624
-#define UNAME "FreeBSD 5.3-RELEASE-p5 i386"
+#define BUILDNR 3632
+#define UNAME "FreeBSD 5.3-RELEASE-p6 i386"
 #define COMPOPT "Using built-in specs.; Configured with: FreeBSD/i386 system compiler; Thread model: posix; gcc version 3.4.2 [FreeBSD] 20040728; 3.4; g++"
 #define YCUSAGE "Usage: ./ychat {h|v}|{o confkey confvalue}\n"
 
@@ -127,6 +127,6 @@
 #define HEADER6 "Connection: keep-alive\r\n"
 #define HEADER7 "Content-Length: ";
 #define HEADER8 "Content-Type: ";
-#define HEADER9 "Allow: GET\n";
+#define HEADER9 "Allow: GET\r\n";
 
 #endif