diff options
| -rw-r--r-- | lib/data/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/data/mime.types | 1 | ||||
| -rw-r--r-- | lib/src/sugar-browser.cpp | 2 | ||||
| -rw-r--r-- | services/clipboard/typeregistry.py | 21 | ||||
| -rwxr-xr-x | tools/build-snapshot.sh | 2 |
5 files changed, 26 insertions, 2 deletions
diff --git a/lib/data/Makefile.am b/lib/data/Makefile.am index f850cfd..122cf2e 100644 --- a/lib/data/Makefile.am +++ b/lib/data/Makefile.am @@ -1,4 +1,4 @@ geckoconfdir = $(pkgdatadir) -geckoconf_DATA = gecko-prefs.js +geckoconf_DATA = gecko-prefs.js mime.types EXTRA_DIST = $(geckoconf_DATA) diff --git a/lib/data/mime.types b/lib/data/mime.types new file mode 100644 index 0000000..27adff1 --- /dev/null +++ b/lib/data/mime.types @@ -0,0 +1 @@ +application/x-squeak-project pr diff --git a/lib/src/sugar-browser.cpp b/lib/src/sugar-browser.cpp index 2f3c0b5..b2152a5 100644 --- a/lib/src/sugar-browser.cpp +++ b/lib/src/sugar-browser.cpp @@ -135,6 +135,8 @@ sugar_browser_startup(const char *profile_path, const char *profile_name) prefService->GetBranch ("", getter_AddRefs(pref)); NS_ENSURE_TRUE(pref, FALSE); + pref->SetCharPref ("helpers.private_mime_types_file", SHARE_DIR"/mime.types"); + rv = prefService->ReadUserPrefs (nsnull); if (NS_FAILED(rv)) { g_warning ("failed to read user preferences, error: %x", rv); diff --git a/services/clipboard/typeregistry.py b/services/clipboard/typeregistry.py index 3e46895..dedf95e 100644 --- a/services/clipboard/typeregistry.py +++ b/services/clipboard/typeregistry.py @@ -146,6 +146,26 @@ class RtfFileType(TextFileType): return mime_type in cls._types matches_mime_type = classmethod(matches_mime_type) +class SqueakProjectFileType(FileType): + + _types = set(['application/x-squeak-project']) + + def get_name(self): + return _('Squeak project') + + def get_icon(self): + return 'theme:object-squeak-project' + + def get_preview(self): + return '' + + def get_activity(self): + return 'org.vpri.EtoysActivity' + + def matches_mime_type(cls, mime_type): + return mime_type in cls._types + matches_mime_type = classmethod(matches_mime_type) + class OOTextFileType(FileType): _types = set(['application/vnd.oasis.opendocument.text']) @@ -193,6 +213,7 @@ class TypeRegistry: self._types.append(UriFileType) self._types.append(ImageFileType) self._types.append(TextFileType) + self._types.append(SqueakProjectFileType) def get_type(self, formats): for file_type in self._types: diff --git a/tools/build-snapshot.sh b/tools/build-snapshot.sh index 0407c73..5b10e49 100755 --- a/tools/build-snapshot.sh +++ b/tools/build-snapshot.sh @@ -1,6 +1,6 @@ VERSION=0.63 DATE=`date +%Y%m%d` -RELEASE=2.57 +RELEASE=2.58 TARBALL=sugar-$VERSION-$RELEASE.${DATE}git.tar.bz2 rm sugar-$VERSION.tar.bz2 |