← Back to team overview

diodon-team team mailing list archive

[Merge] lp:~odd-rationale/diodon/odd-branch into lp:diodon

 

Odd-rationale has proposed merging lp:~odd-rationale/diodon/odd-branch into lp:diodon.

Requested reviews:
  Diodon Team (diodon-team)


Actually clear the clipboard when "clear" is clicked.
-- 
https://code.launchpad.net/~odd-rationale/diodon/odd-branch/+merge/38690
Your team Diodon Team is requested to review the proposed merge of lp:~odd-rationale/diodon/odd-branch into lp:diodon.
=== modified file 'src/clipboard-item.vala'
--- src/clipboard-item.vala	2010-09-04 13:19:23 +0000
+++ src/clipboard-item.vala	2010-10-18 04:06:49 +0000
@@ -22,7 +22,7 @@
      * Represents an immutable item in the clipboard with all its information.
      * 
      * TODO; consider using a interface for a clipboard item to implement
-     * the represantation of coping files or buffers.
+     * the representation of coping files or buffers.
      *
      * @author Oliver Sauder <os@xxxxxxxx>
      */
@@ -31,7 +31,7 @@
         private string text;
        
         /**
-         * Simple text constrcutor
+         * Simple text constructor
          * 
          * @param text plain text
          */ 
@@ -52,12 +52,12 @@
          * equal func helper comparing two clipboard items.
          *
          * TODO:
-         * in future releases of libgee (currenlty in development version 0.7.0)
+         * in future releases of libgee (currently in development version 0.7.0)
          * there will be a interface called hashable which should be implemented
-         * instead of this inconvinient equal func method.
+         * instead of this inconvenient equal func method.
          * 
          * @param item_a item to be compared
-         * @param item_b other item to be comparted
+         * @param item_b other item to be compared
          * 
          * @return true if equal; otherwise false.
          */
@@ -70,9 +70,9 @@
          * hash func helper creating hash code for clipboard item.
          *
          * TODO:
-         * in future releases of libgee (currenlty in development version 0.7.0)
+         * in future releases of libgee (currently in development version 0.7.0)
          * there will be a interface called hashable which should be implemented
-         * instead of this inconvinient hash func method.
+         * instead of this inconvenient hash func method.
          * 
          * @param item item to create hash from
          * 

=== modified file 'src/clipboard-menu-item.vala'
--- src/clipboard-menu-item.vala	2010-09-04 12:46:15 +0000
+++ src/clipboard-menu-item.vala	2010-10-18 04:06:49 +0000
@@ -46,7 +46,7 @@
         }
         
         /**
-         * Get encapsualted clipboard item
+         * Get encapsulated clipboard item
          */
         public ClipboardItem get_clipboard_item()
         {

=== modified file 'src/clipboard-storage.vala'
--- src/clipboard-storage.vala	2010-09-04 10:22:21 +0000
+++ src/clipboard-storage.vala	2010-10-18 04:06:49 +0000
@@ -37,7 +37,7 @@
         public abstract ArrayList<ClipboardItem> get_items();
         
         /**
-         * Add given teim to storage
+         * Add given item to storage
          * 
          * @param item item to be added
          */

=== modified file 'src/controller.vala'
--- src/controller.vala	2010-09-08 21:35:22 +0000
+++ src/controller.vala	2010-10-18 04:06:49 +0000
@@ -116,6 +116,7 @@
                 indicator.remove_item(item);
             }
             
+            clipboard.clear();
             model.clear_items();
         }
         

=== modified file 'src/main.vala'
--- src/main.vala	2010-09-08 20:30:48 +0000
+++ src/main.vala	2010-10-18 04:06:49 +0000
@@ -19,7 +19,7 @@
 namespace Diodon
 {
     /**
-     * Main class is responisble for creating all needed views, controllers
+     * Main class is responsible for creating all needed views, controllers
      * and models and starting the GUI application.
      *
      * @author Oliver Sauder <os@xxxxxxxx>