summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2012-07-30 11:49:10 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2012-08-02 18:00:55 +0200
commitbc21b49a464ae153341ee8d836993ca89b1a6919 (patch)
tree1187539ac5a405c02ef858cfba6624d5e8023a16 /scp2
parent4311938f7e838c6263b0e5774e611ec213cb02c6 (diff)
tubes: move sc/source/ui/collab/contacts.* to tubes
- sc no longer directly links against telepathy - there is new class ScCollaboration derived from abstract Collaboration describing collaboration functionality for apps used in tubes/ - also added resource manager into tubes/ Change-Id: Ic89ae955f5b47490f4f4b8781bcee5dea5336bae
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/file_resource_ooo.scp3
-rw-r--r--scp2/source/ooo/module_lang_template.scp1
2 files changed, 4 insertions, 0 deletions
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index 8526d9791bdb..a065312a719d 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -124,3 +124,6 @@ STD_RES_FILE( gid_File_Res_T602Filter, t602filter )
STD_RES_FILE( gid_File_Res_Forui, forui )
STD_RES_FILE( gid_File_Res_For, for )
+#ifdef ENABLE_TELEPATHY
+STD_RES_FILE( gid_File_Res_Tubes, tubes )
+#endif
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index c1235ffe1d22..aa34608e6c20 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -88,6 +88,7 @@ Module gid_Module_Langpack_Resource_Template
gid_File_Res_Tk,
gid_File_Res_Acc,
gid_File_Res_Tpl,
+ gid_File_Res_Tubes,
gid_File_Res_Uui,
gid_File_Res_Vcl,
gid_File_Res_Wzi,