enhanced favorites: remove activities.defaults

Remove the "activities.defaults" file because is no longer
used with the new approach.

Remove "self._last_defaults_mtime" from BundleRegistry
because is also no longer used either.

Signed-off-by: Martin Abente Lahaye <tch@sugarlabs.org>

bin/sugar.in

@@ -28,10 +28,6 @@ if test -z "$SUGAR_MIME_DEFAULTS"; then
     export SUGAR_MIME_DEFAULTS="$sugardatadir/mime.defaults"
 fi
 
-if test -z "$SUGAR_ACTIVITIES_DEFAULTS"; then
-    export SUGAR_ACTIVITIES_DEFAULTS="$sugardatadir/activities.defaults"
-fi
-
 export GTK2_RC_FILES="@prefix@/share/sugar/data/sugar-$SUGAR_SCALING.gtkrc"
 
 if ! test -f "$GTK2_RC_FILES"; then

data/Makefile.am

@@ -10,7 +10,6 @@ sugar-100.gtkrc: gtkrc.em
 
 sugardir = $(pkgdatadir)/data
 sugar_DATA =			\
-	activities.defaults	\
 	group-labels.defaults	\
 	ISO-639-2_utf-8.txt	\
 	kbdconfig		\

src/jarabe/model/bundleregistry.py

@@ -101,11 +101,9 @@ def __init__(self):
             monitor.connect('changed', self.__file_monitor_changed_cb)
             self._gio_monitors.append(monitor)
 
-        self._last_defaults_mtime = []
         self._favorite_bundles = []
         for i in range(desktop.get_number_of_views()):
             self._favorite_bundles.append({})
-            self._last_defaults_mtime.append(-1)
 
         settings = Gio.Settings('org.sugarlabs')
         self._protected_activities = settings.get_strv('protected-activities')
@@ -124,9 +122,6 @@ def __init__(self):
 
     def __desktop_view_icons_changed_cb(self, model):
         number_of_views = desktop.get_number_of_views()
-        if len(self._last_defaults_mtime) < number_of_views:
-            for i in range(number_of_views - len(self._last_defaults_mtime)):
-                self._last_defaults_mtime.append(-1)
         if len(self._favorite_bundles) < number_of_views:
             for i in range(number_of_views - len(self._favorite_bundles)):
                 self._favorite_bundles.append({})
@@ -192,8 +187,6 @@ def _load_favorites(self):
                         raise ValueError('Invalid format in %s.' %
                                          favorites_path)
 
-                self._last_defaults_mtime[i] = \
-                    float(favorites_data['defaults-mtime'])
                 self._favorite_bundles[i] = favorite_bundles
 
     def _convert_old_favorites(self):
@@ -422,7 +415,6 @@ def _write_favorites_file(self, favorite_view):
             path = env.get_profile_path('favorite_activities_%d' %
                                         (favorite_view))
         favorites_data = {
-            'defaults-mtime': self._last_defaults_mtime[favorite_view],
             'favorites': self._favorite_bundles[favorite_view]}
         json.dump(favorites_data, open(path, 'w'), indent=1)
 

tests/test_bundleregistry.py

@@ -29,8 +29,6 @@
 data_dir = os.path.join(tests_dir, "data")
 base_dir = os.path.dirname(tests_dir)
 
-os.environ["SUGAR_ACTIVITIES_DEFAULTS"] = \
-    os.path.join(base_dir, "data", "activities.defaults")
 os.environ["SUGAR_MIME_DEFAULTS"] = \
     os.path.join(base_dir, "data", "mime.defaults")
 

tests/views/activitieslist.py

@@ -51,8 +51,6 @@ def is_user_activity(self):
         return True
 
 
-os.environ["SUGAR_ACTIVITIES_DEFAULTS"] = \
-    os.path.join(base_dir, "data", "activities.defaults")
 os.environ["SUGAR_MIME_DEFAULTS"] = \
     os.path.join(base_dir, "data", "mime.defaults")