[shotwell] Fix dtor names, empty if blocks



commit 8a18a1db584ecb0312583b6a219d5ba31187d963
Author: Jim Nelson <jim yorba org>
Date:   Fri Sep 26 12:11:39 2014 -0700

    Fix dtor names, empty if blocks
    
    Detected by latest build of Vala.  Correcting empty if blocks seems
    to correct harmless bugs.

 plugins/common/RESTSupport.vala        |    2 +-
 src/Commands.vala                      |    2 +-
 src/SearchFilter.vala                  |    2 +-
 src/Tag.vala                           |    2 +-
 src/searches/SavedSearchDialog.vala    |    2 +-
 src/tags/HierarchicalTagUtilities.vala |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/plugins/common/RESTSupport.vala b/plugins/common/RESTSupport.vala
index 6a64025..7334de6 100644
--- a/plugins/common/RESTSupport.vala
+++ b/plugins/common/RESTSupport.vala
@@ -463,7 +463,7 @@ public class XmlDocument {
         document = doc;
     }
 
-    ~RESTXmlDocument() {
+    ~XmlDocument() {
         delete document;
     }
 
diff --git a/src/Commands.vala b/src/Commands.vala
index 0ad8ecb..feaf0e1 100644
--- a/src/Commands.vala
+++ b/src/Commands.vala
@@ -211,7 +211,7 @@ public abstract class GenericPhotoTransformationCommand : SingleDataSourceComman
         base(photo, name, explanation);
     }
     
-    ~GenericPhotoTransformationState() {
+    ~GenericPhotoTransformationCommand() {
         if (original_state != null)
             original_state.broken.disconnect(on_state_broken);
         
diff --git a/src/SearchFilter.vala b/src/SearchFilter.vala
index 9769195..e8f0986 100644
--- a/src/SearchFilter.vala
+++ b/src/SearchFilter.vala
@@ -694,7 +694,7 @@ public class SearchFilterToolbar : Gtk.Toolbar {
             this.add(button);
         }
         
-        ~ToggleActionButton() {
+        ~ToggleActionToolButton() {
             button.clicked.disconnect(on_button_activate);
         }
         
diff --git a/src/Tag.vala b/src/Tag.vala
index 1ae76ba..450af20 100644
--- a/src/Tag.vala
+++ b/src/Tag.vala
@@ -626,7 +626,7 @@ public class Tag : DataSource, ContainerSource, Proxyable, Indexable {
         string built = builder.str;
         
         if (built.length >= separator.length)
-            if (built.substring(built.length - separator.length, separator.length) == separator);
+            if (built.substring(built.length - separator.length, separator.length) == separator)
                 built = built.substring(0, built.length - separator.length);
         
         if (end != null)
diff --git a/src/searches/SavedSearchDialog.vala b/src/searches/SavedSearchDialog.vala
index b425cfb..da7f7db 100644
--- a/src/searches/SavedSearchDialog.vala
+++ b/src/searches/SavedSearchDialog.vala
@@ -522,7 +522,7 @@ public class SavedSearchDialog {
             update_date_labels();
         }
         
-        ~SearchRowRating() {
+        ~SearchRowDate() {
             context.changed.disconnect(on_changed);
         }
         
diff --git a/src/tags/HierarchicalTagUtilities.vala b/src/tags/HierarchicalTagUtilities.vala
index 985491d..dbb7165 100644
--- a/src/tags/HierarchicalTagUtilities.vala
+++ b/src/tags/HierarchicalTagUtilities.vala
@@ -173,7 +173,7 @@ class HierarchicalTagUtilities {
                 return;
 
             Tag? t = null;
-            if (Tag.global.exists(actual_path));
+            if (Tag.global.exists(actual_path))
                 t = Tag.for_path(actual_path);
             
             if (t != null && t.get_hierarchical_children().size == 0)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]