sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2007-04-19 18:58:19 +02:00
commit 8a54707dc5
3 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
browser/sugar-browser.cpp
View File

@ -65,6 +65,8 @@
#include <nsICommandManager.h> #include <nsICommandManager.h>
#include <nsIClipboardDragDropHooks.h> #include <nsIClipboardDragDropHooks.h>
#define SUGAR_PATH "SUGAR_PATH"
enum { enum {
PROP_0, PROP_0,
PROP_PROGRESS, PROP_PROGRESS,
@ -161,9 +163,11 @@ sugar_browser_startup(const char *profile_path, const char *profile_name)
NS_ENSURE_TRUE(prefService, FALSE); NS_ENSURE_TRUE(prefService, FALSE);
/* Read our predefined default prefs */ /* Read our predefined default prefs */
nsCString pathToPrefs(g_getenv(SUGAR_PATH));
pathToPrefs.Append("/data/gecko-prefs.js");
nsCOMPtr<nsILocalFile> file; nsCOMPtr<nsILocalFile> file;
NS_NewNativeLocalFile(nsCString(SHARE_DIR"/gecko-prefs.js"), NS_NewNativeLocalFile(pathToPrefs, PR_TRUE, getter_AddRefs(file));
PR_TRUE, getter_AddRefs(file));
NS_ENSURE_TRUE(file, FALSE); NS_ENSURE_TRUE(file, FALSE);
rv = prefService->ReadUserPrefs (file); rv = prefService->ReadUserPrefs (file);
@ -176,7 +180,10 @@ sugar_browser_startup(const char *profile_path, const char *profile_name)
prefService->GetBranch ("", getter_AddRefs(pref)); prefService->GetBranch ("", getter_AddRefs(pref));
NS_ENSURE_TRUE(pref, FALSE); NS_ENSURE_TRUE(pref, FALSE);
pref->SetCharPref ("helpers.private_mime_types_file", SHARE_DIR"/mime.types"); nsCString pathToMimeTypes(g_getenv(SUGAR_PATH));
pathToMimeTypes.Append("/data/mime.types");
pref->SetCharPref ("helpers.private_mime_types_file", pathToMimeTypes.get());
rv = prefService->ReadUserPrefs (nsnull); rv = prefService->ReadUserPrefs (nsnull);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {

1
data/mime.types
View File

@ -1,2 +1,3 @@
application/x-squeak-project pr application/x-squeak-project pr
application/x-abiword abw application/x-abiword abw
application/vnd.olpc-x-sugar xo

21
services/clipboard/typeregistry.py
View File

@ -237,6 +237,26 @@ class UriListFileType(FileType):
return mime_type in cls._types return mime_type in cls._types
matches_mime_type = classmethod(matches_mime_type) matches_mime_type = classmethod(matches_mime_type)
class XoFileType(FileType):
_types = set(['application/vnd.olpc-x-sugar'])
def get_name(self):
return _('Activity package')
def get_icon(self):
return 'theme:stock-missing'
def get_preview(self):
return ''
def get_activity(self):
return ''
def matches_mime_type(cls, mime_type):
return mime_type in cls._types
matches_mime_type = classmethod(matches_mime_type)
class UnknownFileType(FileType): class UnknownFileType(FileType):
def get_name(self): def get_name(self):
return _('Object') return _('Object')
@ -267,6 +287,7 @@ class TypeRegistry:
self._types.append(AbiwordFileType) self._types.append(AbiwordFileType)
self._types.append(TextFileType) self._types.append(TextFileType)
self._types.append(SqueakProjectFileType) self._types.append(SqueakProjectFileType)
self._types.append(XoFileType)
def get_type(self, formats): def get_type(self, formats):
for file_type in self._types: for file_type in self._types: