trim EOL (end-of-line) spaces on source files

9 files changed, 54 insertions, 54 deletions

diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
index e8bc7e7..4d69b40 100644
--- a/src/jarabe/desktop/favoritesview.py
+++ b/src/jarabe/desktop/favoritesview.py
@@ -112,7 +112,7 @@ class FavoritesView(hippo.Canvas):
 
     def __settings_changed_cb(self, **kwargs):
         favorites_settings = get_settings()
-        self._set_layout(favorites_settings.layout)        
+        self._set_layout(favorites_settings.layout)
 
     def __connect_to_bundle_registry_cb(self):
         registry = bundleregistry.get_registry()
@@ -169,7 +169,7 @@ class FavoritesView(hippo.Canvas):
             self._add_activity(activity_info)
 
     def do_size_allocate(self, allocation):
-        width = allocation.width        
+        width = allocation.width
         height = allocation.height
 
         min_w_, my_icon_width = self._my_icon.get_width_request()
@@ -213,7 +213,7 @@ class FavoritesView(hippo.Canvas):
     def __motion_notify_event_cb(self, widget, event):
         if not self._pressed_button:
             return False
-        
+
         # if the mouse button is not pressed, no drag should occurr
         if not event.state & gtk.gdk.BUTTON1_MASK:
             self._pressed_button = None
@@ -239,7 +239,7 @@ class FavoritesView(hippo.Canvas):
         icon_file_name = self._last_clicked_icon.props.file_name
         # TODO: we should get the pixbuf from the widget, so it has colors, etc
         pixbuf = gtk.gdk.pixbuf_new_from_file(icon_file_name)
-        
+
         self._hot_x = pixbuf.props.width / 2
         self._hot_y = pixbuf.props.height / 2
         context.set_icon_pixbuf(pixbuf, self._hot_x, self._hot_y)
@@ -322,7 +322,7 @@ class FavoritesView(hippo.Canvas):
         except RegisterError, e:
             alert.props.title = _('Registration Failed')
             alert.props.msg = _('%s') % e
-        else:    
+        else:
             alert.props.title = _('Registration Successful')
             alert.props.msg = _('You are now registered ' \
                                 'with your school server.')
@@ -332,8 +332,8 @@ class FavoritesView(hippo.Canvas):
         alert.add_button(gtk.RESPONSE_OK, _('Ok'), ok_icon)
 
         self.add_alert(alert)
-        alert.connect('response', self.__register_alert_response_cb)            
-            
+        alert.connect('response', self.__register_alert_response_cb)
+
     def __register_alert_response_cb(self, alert, response_id):
         self.remove_alert()
 
@@ -500,7 +500,7 @@ class ActivityIcon(CanvasIcon):
         cr.stroke()
 
     def do_get_content_height_request(self, for_width):
-        height, height = CanvasIcon.do_get_content_height_request(self, 
+        height, height = CanvasIcon.do_get_content_height_request(self,
                                                                   for_width)
         height += ActivityIcon._BORDER_WIDTH * 2
         return height, height
@@ -689,7 +689,7 @@ class FavoritesSetting(object):
     _FAVORITES_KEY = "/desktop/sugar/desktop/favorites_layout"
 
     def __init__(self):
-        client = gconf.client_get_default() 
+        client = gconf.client_get_default()
         self._layout = client.get_string(self._FAVORITES_KEY)
         logging.debug('FavoritesSetting layout %r', self._layout)
 
diff --git a/src/jarabe/desktop/grid.py b/src/jarabe/desktop/grid.py
index eb7fabc..f3412c9 100644
--- a/src/jarabe/desktop/grid.py
+++ b/src/jarabe/desktop/grid.py
@@ -99,10 +99,10 @@ class Grid(_sugarext.Grid):
 
         if weight > 0:
             self._detect_collisions(child)
-        
+
     def _shift_child(self, child, weight):
         rect = self._child_rects[child]
-        
+
         new_rects = []
 
         # Get rects right, left, bottom and top
@@ -148,7 +148,7 @@ class Grid(_sugarext.Grid):
             if new_weight < weight:
                 best_rect = new_rect
                 weight = new_weight
-        
+
         if best_rect:
             self._child_rects[child] = best_rect
             weight = self._shift_child(child, weight)
diff --git a/src/jarabe/desktop/groupbox.py b/src/jarabe/desktop/groupbox.py
index 1c1dd0c..76c2981 100644
--- a/src/jarabe/desktop/groupbox.py
+++ b/src/jarabe/desktop/groupbox.py
@@ -83,7 +83,7 @@ class GroupBox(hippo.Canvas):
         icon.destroy()
 
     def do_size_allocate(self, allocation):
-        width = allocation.width        
+        width = allocation.width
         height = allocation.height
 
         min_w_, icon_width = self._owner_icon.get_width_request()
diff --git a/src/jarabe/desktop/homebox.py b/src/jarabe/desktop/homebox.py
index 604001e..85279ff 100644
--- a/src/jarabe/desktop/homebox.py
+++ b/src/jarabe/desktop/homebox.py
@@ -53,16 +53,16 @@ class HomeBox(gtk.VBox):
         self._toolbar.show()
 
         self._set_view(_FAVORITES_VIEW)
-            
+
     def show_software_updates_alert(self):
         alert = Alert()
-        updater_icon = Icon(icon_name='module-updater', 
+        updater_icon = Icon(icon_name='module-updater',
                     pixel_size = style.STANDARD_ICON_SIZE)
         alert.props.icon = updater_icon
         updater_icon.show()
         alert.props.title = _('Software Update')
-        alert.props.msg = _('Update your activities to ensure' 
-                            ' compatibility with your new software') 
+        alert.props.msg = _('Update your activities to ensure'
+                            ' compatibility with your new software')
 
         cancel_icon = Icon(icon_name='dialog-cancel')
         alert.add_button(gtk.RESPONSE_CANCEL, _('Cancel'), cancel_icon)
@@ -77,7 +77,7 @@ class HomeBox(gtk.VBox):
         else:
             self._favorites_view.add_alert(alert)
         alert.connect('response', self.__software_update_response_cb)
-        
+
     def __software_update_response_cb(self, alert, response_id):
         if self._list_view in self.get_children():
             self._list_view.remove_alert()
@@ -208,7 +208,7 @@ class HomeToolbar(gtk.Toolbar):
                 self.search_entry.set_sensitive(True)
                 self.search_entry.grab_focus()
                 self.emit('view-changed', view)
-            
+
     def _add_separator(self, expand=False):
         separator = gtk.SeparatorToolItem()
         separator.props.draw = False
@@ -248,7 +248,7 @@ class HomeToolbar(gtk.Toolbar):
 
 class FavoritesButton(RadioToolButton):
     __gtype_name__ = 'SugarFavoritesButton'
-    
+
     def __init__(self):
         RadioToolButton.__init__(self)
 
diff --git a/src/jarabe/desktop/homewindow.py b/src/jarabe/desktop/homewindow.py
index 6212970..c3b18de 100644
--- a/src/jarabe/desktop/homewindow.py
+++ b/src/jarabe/desktop/homewindow.py
@@ -95,28 +95,28 @@ class HomeWindow(gtk.Window):
 
         if old_level != ShellModel.ZOOM_ACTIVITY and \
            new_level != ShellModel.ZOOM_ACTIVITY:
-            self.remove(self.get_child()) 
-            self.add(self._transition_box) 
-            self._transition_box.show() 
-
-            if new_level == ShellModel.ZOOM_HOME: 
-                end_size = style.XLARGE_ICON_SIZE 
-            elif new_level == ShellModel.ZOOM_GROUP: 
-                end_size = style.LARGE_ICON_SIZE 
-            elif new_level == ShellModel.ZOOM_MESH: 
-                end_size = style.STANDARD_ICON_SIZE 
-
-            if old_level == ShellModel.ZOOM_HOME: 
-                start_size = style.XLARGE_ICON_SIZE 
-            elif old_level == ShellModel.ZOOM_GROUP: 
-                start_size = style.LARGE_ICON_SIZE 
-            elif old_level == ShellModel.ZOOM_MESH: 
-                start_size = style.STANDARD_ICON_SIZE 
-
-            self._transition_box.start_transition(start_size, end_size) 
+            self.remove(self.get_child())
+            self.add(self._transition_box)
+            self._transition_box.show()
+
+            if new_level == ShellModel.ZOOM_HOME:
+                end_size = style.XLARGE_ICON_SIZE
+            elif new_level == ShellModel.ZOOM_GROUP:
+                end_size = style.LARGE_ICON_SIZE
+            elif new_level == ShellModel.ZOOM_MESH:
+                end_size = style.STANDARD_ICON_SIZE
+
+            if old_level == ShellModel.ZOOM_HOME:
+                start_size = style.XLARGE_ICON_SIZE
+            elif old_level == ShellModel.ZOOM_GROUP:
+                start_size = style.LARGE_ICON_SIZE
+            elif old_level == ShellModel.ZOOM_MESH:
+                start_size = style.STANDARD_ICON_SIZE
+
+            self._transition_box.start_transition(start_size, end_size)
         else:
             self._update_view(new_level)
-    
+
     def _transition_completed_cb(self, transition_box):
         self._update_view(shell.get_model().zoom_level)
 
@@ -124,7 +124,7 @@ class HomeWindow(gtk.Window):
         if level == ShellModel.ZOOM_ACTIVITY:
             return
 
-        current_child = self.get_child() 
+        current_child = self.get_child()
         self.remove(current_child)
 
         if level == ShellModel.ZOOM_HOME:
diff --git a/src/jarabe/desktop/keydialog.py b/src/jarabe/desktop/keydialog.py
index b9b229b..8b8f0bf 100644
--- a/src/jarabe/desktop/keydialog.py
+++ b/src/jarabe/desktop/keydialog.py
@@ -74,7 +74,7 @@ class KeyDialog(gtk.Dialog):
         self._rsn_flags = rsn_flags
         self._dev_caps = dev_caps
 
-        self.set_has_separator(False)        
+        self.set_has_separator(False)
 
         label = gtk.Label("A wireless encryption key is required for\n" \
                           " the wireless network '%s'." % self._ssid)
diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py
index ba9c103..cde921d 100644
--- a/src/jarabe/desktop/meshbox.py
+++ b/src/jarabe/desktop/meshbox.py
@@ -129,7 +129,7 @@ class AccessPointView(CanvasPulsingIcon):
         self._palette_icon = Icon(icon_name=icon_name,
                                   icon_size=style.STANDARD_ICON_SIZE,
                                   badge_name=self.props.badge_name)
-                                              
+
         p = palette.Palette(primary_text=self._name,
                             icon=self._palette_icon)
 
@@ -185,7 +185,7 @@ class AccessPointView(CanvasPulsingIcon):
                 digest = hash(sha_hash.digest())
                 index = digest % len(xocolor.colors)
 
-                self._color = XoColor('%s,%s' % 
+                self._color = XoColor('%s,%s' %
                                       (xocolor.colors[index][0],
                                        xocolor.colors[index][1]))
         self._update()
@@ -273,7 +273,7 @@ class AccessPointView(CanvasPulsingIcon):
             self._palette.props.secondary_text = None
             self.props.pulsing = False
 
-    def _update_color(self):        
+    def _update_color(self):
         if self._greyed_out:
             self.props.pulsing = False
             self.props.base_color = XoColor('#D5D5D5,#D5D5D5')
@@ -358,7 +358,7 @@ class AccessPointView(CanvasPulsingIcon):
     def _connect(self):
         connection = network.find_connection(self._name)
         if connection is None:
-            settings = Settings()            
+            settings = Settings()
             settings.connection.id = 'Auto ' + self._name
             settings.connection.uuid = unique_id()
             settings.connection.type = '802-11-wireless'
@@ -742,7 +742,7 @@ class MeshBox(gtk.VBox):
         self._suspended = True
         self._query = ''
         self._owner_icon = None
-            
+
         self._toolbar = MeshToolbar()
         self._toolbar.connect('query-changed', self._toolbar_query_changed_cb)
         self.pack_start(self._toolbar, expand=False)
@@ -776,7 +776,7 @@ class MeshBox(gtk.VBox):
         netmgr_observer.listen()
 
     def do_size_allocate(self, allocation):
-        width = allocation.width        
+        width = allocation.width
         height = allocation.height
 
         min_w_, icon_width = self._owner_icon.get_width_request()
@@ -791,7 +791,7 @@ class MeshBox(gtk.VBox):
         self._add_alone_buddy(buddy_model)
 
     def _buddy_removed_cb(self, model, buddy_model):
-        self._remove_buddy(buddy_model) 
+        self._remove_buddy(buddy_model)
 
     def _buddy_moved_cb(self, model, buddy_model, activity_model):
         # Owner doesn't move from the center
@@ -803,7 +803,7 @@ class MeshBox(gtk.VBox):
         self._add_activity(activity_model)
 
     def _activity_removed_cb(self, model, activity_model):
-        self._remove_activity(activity_model) 
+        self._remove_activity(activity_model)
 
     def _add_alone_buddy(self, buddy_model):
         icon = BuddyIcon(buddy_model)
diff --git a/src/jarabe/desktop/schoolserver.py b/src/jarabe/desktop/schoolserver.py
index 2df2a40..f09469f 100644
--- a/src/jarabe/desktop/schoolserver.py
+++ b/src/jarabe/desktop/schoolserver.py
@@ -48,8 +48,8 @@ def register_laptop(url=REGISTER_URL):
         data = server.register(sn, nick, uuid, profile.pubkey)
     except (Error, socket.error):
         logging.exception('Registration: cannot connect to server')
-        raise RegisterError(_('Cannot connect to the server.'))        
-        
+        raise RegisterError(_('Cannot connect to the server.'))
+
     if data['success'] != 'OK':
         logging.error('Registration: server could not complete request: %s',
                       data['error'])
diff --git a/src/jarabe/desktop/transitionbox.py b/src/jarabe/desktop/transitionbox.py
index a554415..af17cfb 100644
--- a/src/jarabe/desktop/transitionbox.py
+++ b/src/jarabe/desktop/transitionbox.py
@@ -61,12 +61,12 @@ class _Layout(gobject.GObject, hippo.CanvasLayout):
 
 class TransitionBox(hippo.Canvas):
     __gtype_name__ = 'SugarTransitionBox'
-    
+
     __gsignals__ = {
         'completed': (gobject.SIGNAL_RUN_FIRST,
                       gobject.TYPE_NONE, ([]))
     }
-    
+
     def __init__(self):
         gobject.GObject.__init__(self)