soc.2009.transport: e57dbfc5: Changed [mysql] header to [database] hea...

[hanzz at soc.pidgin.im]

-----------------------------------------------------------------
Revision: e57dbfc55599f243a2185a268826f080d6a62bfc
Ancestor: 18d7ac229999438305ba16a23dc0f64350780009
Author: hanzz at soc.pidgin.im
Date: 2009-07-26T12:25:34
Branch: im.pidgin.soc.2009.transport
URL: http://d.pidgin.im/viewmtn/revision/info/e57dbfc55599f243a2185a268826f080d6a62bfc

Modified files:
        highflyer.cfg main.cpp main.h

ChangeLog: 

Changed [mysql] header to [database] header in config file (thanks to Johnny)

-------------- next part --------------
============================================================
--- highflyer.cfg	c45c3f34952d054beff72c8c79c283b098b26cdd
+++ highflyer.cfg	cad7044aae89ec56fa6ef4b17fb1284107a59aed
@@ -50,7 +50,8 @@ vip_features = avatars,chatstate,filetra
 # if commented, all features will be used
 vip_features = avatars,chatstate,filetransfer
 
-[mysql]
+[database]
+type=mysql
 host=localhost
 user=user
 password=password
============================================================
--- main.cpp	3170f758221e5378ac6de4e38760ea4fb7c83a80
+++ main.cpp	9d69471f3c73c3017421205f7951fc56c4ba3a6d
@@ -828,11 +828,12 @@ void GlooxMessageHandler::loadConfigFile
 	m_configuration.port = (int)g_key_file_get_integer(keyfile, "service","port", NULL);
 	m_configuration.filetransferCache = (std::string)g_key_file_get_string(keyfile, "service","filetransfer_cache", NULL);
 	
-	m_configuration.sqlHost = (std::string)g_key_file_get_string(keyfile, "mysql","host", NULL);
-	m_configuration.sqlPassword = (std::string)g_key_file_get_string(keyfile, "mysql","password", NULL);
-	m_configuration.sqlUser = (std::string)g_key_file_get_string(keyfile, "mysql","user", NULL);
-	m_configuration.sqlDb = (std::string)g_key_file_get_string(keyfile, "mysql","database", NULL);
-	m_configuration.sqlPrefix = (std::string)g_key_file_get_string(keyfile, "mysql","prefix", NULL);
+	m_configuration.sqlType = (std::string)g_key_file_get_string(keyfile, "database","type", NULL);
+	m_configuration.sqlHost = (std::string)g_key_file_get_string(keyfile, "database","host", NULL);
+	m_configuration.sqlPassword = (std::string)g_key_file_get_string(keyfile, "database","password", NULL);
+	m_configuration.sqlUser = (std::string)g_key_file_get_string(keyfile, "database","user", NULL);
+	m_configuration.sqlDb = (std::string)g_key_file_get_string(keyfile, "database","database", NULL);
+	m_configuration.sqlPrefix = (std::string)g_key_file_get_string(keyfile, "database","prefix", NULL);
 	
 // 	features0 = (int)g_key_file_get_integer(keyfile, "category0","features", NULL);
 // 	features1 = (int)g_key_file_get_integer(keyfile, "category1","features", NULL);
============================================================
--- main.h	0bf5e83531a63bae74107496f5d4cf859d34b8e7
+++ main.h	3fe64e732da79ea76c5fd34a9fe5848aad9d6ef5
@@ -147,11 +147,12 @@ struct Configuration {
 	std::string filetransferCache;	// directory where files are saved
 	std::string base64Dir;	// TODO: I'm depracted, remove me
 
-	std::string sqlHost;	// mysql host
-	std::string sqlPassword;	// mysql password
-	std::string sqlUser;	// mysql user
-	std::string sqlDb;		// mysql database
-	std::string sqlPrefix;	// mysql prefix used for tables
+	std::string sqlHost;	// database host
+	std::string sqlPassword;	// database password
+	std::string sqlUser;	// database user
+	std::string sqlDb;		// database database
+	std::string sqlPrefix;	// database prefix used for tables
+	std::string sqlType;	// database type
 };
 
 class GlooxMessageHandler : public MessageHandler,ConnectionListener,PresenceHandler,SubscriptionHandler