Merge lp:~ricotz/pantheon-files/timeout-uint into lp:~elementary-apps/pantheon-files/trunk

[Rico Tzschichholz]

Respect that timeout-ids are typed as uint

[Jeremy Wootten (jeremywootten)]

review: Approve

=== modified file 'libwidgets/LocationBar.vala'
--- libwidgets/LocationBar.vala	2015-05-23 12:18:59 +0000
+++ libwidgets/LocationBar.vala	2015-05-27 09:54:56 +0000
@@ -116,7 +116,7 @@
     public signal void up ();
     public signal void down ();
 
-    private int timeout = -1;
+    private uint timeout = 0;
 
     private Granite.Services.IconFactory icon_factory;
 
@@ -211,10 +211,10 @@
 
         queue_draw ();
 
-        if (timeout == -1 && event.button == 1) {
-            timeout = (int) Timeout.add (150, () => {
+        if (timeout == 0 && event.button == 1) {
+            timeout = Timeout.add (150, () => {
                 select_bread_from_coord (event);
-                timeout = -1;
+                timeout = 0;
                 return false;
             });
         }
@@ -243,9 +243,9 @@
 
         reset_elements_states ();
 
-        if (timeout != -1) {
-            Source.remove ((uint) timeout);
-            timeout = -1;
+        if (timeout > 0) {
+            Source.remove (timeout);
+            timeout = 0;
         }
 
         if (is_focus)
 
=== modified file 'src/View/Chrome/ButtonWithMenu.vala'
--- src/View/Chrome/ButtonWithMenu.vala	2015-05-03 06:44:42 +0000
+++ src/View/Chrome/ButtonWithMenu.vala	2015-05-27 09:54:56 +0000
@@ -114,8 +114,8 @@
         }
 
         private int LONG_PRESS_TIME = Gtk.Settings.get_default ().gtk_double_click_time * 2;
-        private int timeout = -1;
-        private uint last_click_time = -1;
+        private uint timeout = 0;
+        private uint last_click_time = 0;
         private bool has_fetcher = false;
 
         private unowned MenuFetcher _fetcher;
@@ -164,9 +164,9 @@
                 active = false;
             }
 
-            if (timeout != -1) {
-                Source.remove ((uint) timeout);
-                timeout = -1;
+            if (timeout > 0) {
+                Source.remove (timeout);
+                timeout = 0;
             }
 
             return false;
@@ -178,11 +178,11 @@
             if (ev.button == 1 || ev.button == 3)
                 active = true;
 
-            if (timeout == -1 && ev.button == 1) {
+            if (timeout == 0 && ev.button == 1) {
                 last_click_time = ev.time;
-                timeout = (int) Timeout.add(max_press_time, () => {
+                timeout = Timeout.add (max_press_time, () => {
                     /* long click */
-                    timeout = -1;
+                    timeout = 0;
                     popup_menu (ev);
                     return false;
                 });