Merge lp:~midori/midori/datacenter into lp:midori

[Cris Dywan]

Don't declare sorting doubles are nullable and print values when database tracing is enabled

[André Stösel (ivaldi)]

looks good

review: Approve

=== modified file 'extensions/tabby.vala'
--- extensions/tabby.vala	2014-03-16 22:53:49 +0000
+++ extensions/tabby.vala	2014-03-25 21:59:18 +0000
@@ -107,7 +107,7 @@
             public abstract void remove ();
 
             public abstract Katze.Array get_tabs ();
-            public abstract double? get_max_sorting ();
+            public abstract double get_max_sorting ();
 
             public void attach (Midori.Browser browser) {
                 this.browser = browser;
@@ -234,14 +234,14 @@
 
             }
 
-            protected double? get_tab_sorting (Midori.View view) {
+            protected double get_tab_sorting (Midori.View view) {
                 int this_pos = this.browser.notebook.page_num (view);
                 Midori.View prev_view = this.browser.notebook.get_nth_page (this_pos - 1) as Midori.View;
                 Midori.View next_view = this.browser.notebook.get_nth_page (this_pos + 1) as Midori.View;
 
-                string? prev_meta_sorting = null;
-                string? next_meta_sorting = null;
-                double? prev_sorting, next_sorting, this_sorting;
+                string prev_meta_sorting = null;
+                string next_meta_sorting = null;
+                double prev_sorting, next_sorting, this_sorting;
 
                 if (prev_view != null) {
                     unowned Katze.Item prev_item = prev_view.get_proxy_item ();
@@ -317,7 +317,7 @@
 
                     unowned Katze.Item item = tab.get_proxy_item ();
 
-                    double? sorting;
+                    double sorting;
                     string? sorting_string = item.get_meta_string ("sorting");
                     if (sorting_string != null) { /* we have to use a seperate if condition to avoid a `possibly unassigned local variable` error */
                         if (double.try_parse (item.get_meta_string ("sorting"), out sorting)) {
@@ -406,7 +406,7 @@
                 unowned Katze.Item item = view.get_proxy_item ();
                 int64 tab_id = item.get_meta_integer ("tabby-id");
                 if (tab_id < 1) {
-                    double? sorting = this.get_tab_sorting (view);
+                    double sorting = this.get_tab_sorting (view);
                     item.set_meta_string ("sorting", sorting.to_string ());
                     this.add_item (item);
                 }
@@ -444,7 +444,7 @@
             protected override void tab_reordered (Gtk.Widget tab, uint pos) {
                 Midori.View view = tab as Midori.View;
 
-                double? sorting = this.get_tab_sorting (view);
+                double sorting = this.get_tab_sorting (view);
                 unowned Katze.Item item = view.get_proxy_item ();
                 int64 tab_id = item.get_meta_integer ("tabby-id");
                 string sqlcmd = "UPDATE `tabs` SET sorting = :sorting WHERE session_id = :session_id AND id = :tab_id;";
@@ -528,13 +528,13 @@
                 return tabs;
             }
 
-            public override double? get_max_sorting () {
+            public override double get_max_sorting () {
                 string sqlcmd = "SELECT MAX(sorting) FROM tabs WHERE session_id = :session_id";
                 try {
                     var statement = database.prepare (sqlcmd,
                         ":session_id", typeof (int64), this.id);
                     statement.step ();
-                    double? sorting;
+                    double sorting;
                     string? sorting_string = statement.get_int64 ("MAX(sorting)").to_string ();
                     if (sorting_string != null) {
                         /* we have to use a seperate if condition to avoid

=== modified file 'midori/midori-database.vala'
--- midori/midori-database.vala	2014-03-16 21:00:41 +0000
+++ midori/midori-database.vala	2014-03-25 21:59:18 +0000
@@ -59,13 +59,22 @@
             int pindex = stmt.bind_parameter_index (pname);
             var args = va_list ();
             Type ptype = args.arg ();
-            if (ptype == typeof (string))
-                stmt.bind_text (pindex, args.arg ());
-            else if (ptype == typeof (int64))
-                stmt.bind_int64 (pindex, args.arg ());
-            else if (ptype == typeof (double))
-                stmt.bind_double (pindex, args.arg ());
-            else
+            if (ptype == typeof (string)) {
+                string text = args.arg ();
+                stmt.bind_text (pindex, text);
+                if (database.trace)
+                    stdout.printf ("%s=%s ", pname, text);
+            } else if (ptype == typeof (int64)) {
+                int64 integer = args.arg ();
+                stmt.bind_int64 (pindex, integer);
+                if (database.trace)
+                    stdout.printf ("%s=%s ", pname, integer.to_string ());
+            } else if (ptype == typeof (double)) {
+                double stuntman = args.arg ();
+                stmt.bind_double (pindex, stuntman);
+                if (database.trace)
+                    stdout.printf ("%s=%s ", pname, stuntman.to_string ());
+            } else
                 throw new DatabaseError.TYPE ("Invalid type '%s' for '%s' in statement: %s".printf (ptype.name (), pname, query));
         }
 
@@ -146,7 +155,7 @@
      * Since: 0.5.6
      */
     public class Database : GLib.Object, GLib.Initable {
-        bool trace = false;
+        internal bool trace = false;
         public Sqlite.Database? db { get { return _db; } }
         protected Sqlite.Database? _db = null;
         public string? path { get; protected set; default = null; }
@@ -292,6 +301,8 @@
                     throw new DatabaseError.TYPE ("Invalid type '%s' in statement: %s".printf (ptype.name (), query));
                 pname = args.arg ();
             }
+            if (trace)
+                stdout.printf ("\n");
             return statement;
         }
     }