src/Builder4/ProjectSettings.bjs
authorAlan Knowles <alan@roojs.com>
Mon, 20 Apr 2015 08:56:25 +0000 (16:56 +0800)
committerAlan Knowles <alan@roojs.com>
Mon, 20 Apr 2015 08:56:25 +0000 (16:56 +0800)
src/Builder4/ProjectSettings.vala

src/Builder4/ProjectSettings.bjs
src/Builder4/ProjectSettings.vala

index b3c2646..9657584 100644 (file)
         },
         {
          "listeners" : {
-          "clicked" : "() => {\n\n\n  _this.database_ERROR.el.label    = \"\";\n    \n    try {\n        // assumes localhost...\n         var cnc = Gda.Connection.open_from_string (\n\t\t\t_this.database_DBTYPE.el.get_text(),\n\t\t\t\"DB_NAME=\" + _this.database_DBNAME.el.get_text(), \n\t\t\t\"USERNAME=\" + _this.database_DBUSERNAME.el.get_text() + \n\t\t\t\";PASSWORD=\" + _this.database_DBPASSWORD.el.get_text(),\n\t\t\tGda.ConnectionOptions.NONE\n\t\t);\n   } catch (ConnectionError ce) { \n      _this.database_ERROR.el.label = ce.message;        \n   } catch(Error ue) {\n      _this.database_ERROR.el.label = ue.message;\n        return;\n   }\n _this.database_ERROR.el.label = \"Connection Succeeded\";\n   cnc.close();\n}"
+          "clicked" : "() => {\n\n\n  _this.database_ERROR.el.label    = \"\";\n    Gda.Connection cnc;\n    try {\n        // assumes localhost...\n         cnc = Gda.Connection.open_from_string (\n\t\t\t_this.database_DBTYPE.el.get_text(),\n\t\t\t\"DB_NAME=\" + _this.database_DBNAME.el.get_text(), \n\t\t\t\"USERNAME=\" + _this.database_DBUSERNAME.el.get_text() + \n\t\t\t\";PASSWORD=\" + _this.database_DBPASSWORD.el.get_text(),\n\t\t\tGda.ConnectionOptions.NONE\n\t\t);\n   //} catch (Gda.ConnectionError ce) { \n   //   _this.database_ERROR.el.label = ce.message;        \n   } catch(Error ue) {\n      _this.database_ERROR.el.label = ue.message;\n        return;\n   }\n  _this.database_ERROR.el.label = \"Connection Succeeded\";\n   cnc.close();\n}"
          },
          "* pack" : "pack_start,false,false,0",
          "xtype" : "Button",
index a1b0ea4..6e37ca6 100644 (file)
@@ -797,23 +797,23 @@ public class Xcls_ProjectSettings : Object
             
             
               _this.database_ERROR.el.label    = "";
-                
+                Gda.Connection cnc;
                 try {
                     // assumes localhost...
-                     var cnc = Gda.Connection.open_from_string (
+                     cnc = Gda.Connection.open_from_string (
                                _this.database_DBTYPE.el.get_text(),
                                "DB_NAME=" + _this.database_DBNAME.el.get_text(), 
                                "USERNAME=" + _this.database_DBUSERNAME.el.get_text() + 
                                ";PASSWORD=" + _this.database_DBPASSWORD.el.get_text(),
                                Gda.ConnectionOptions.NONE
                        );
-               } catch (ConnectionError ce) { 
-                  _this.database_ERROR.el.label = ce.message;        
+               //} catch (Gda.ConnectionError ce) { 
+               //   _this.database_ERROR.el.label = ce.message;        
                } catch(Error ue) {
                   _this.database_ERROR.el.label = ue.message;
                     return;
                }
-             _this.database_ERROR.el.label = "Connection Succeeded";
+              _this.database_ERROR.el.label = "Connection Succeeded";
                cnc.close();
             });
         }