Sametime protocol:

- Support the Sametime 'in meeting' status (linked with Miranda 'Occupied' status)
- New protocol icons from oryginal client
Patch by pepinlebref

git-svn-id: http://svn.miranda-ng.org/main/trunk@10976 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

6 files changed, 10 insertions, 8 deletions

diff --git a/protocols/Sametime/proto_sametime/res/Away.ico b/protocols/Sametime/proto_sametime/res/Away.ico
index 6204baa145..9f89cc0175 100644
--- a/protocols/Sametime/proto_sametime/res/Away.ico
+++ b/protocols/Sametime/proto_sametime/res/Away.ico
diff --git a/protocols/Sametime/proto_sametime/res/DND.ico b/protocols/Sametime/proto_sametime/res/DND.ico
index f198b121f5..57c5aa3221 100644
--- a/protocols/Sametime/proto_sametime/res/DND.ico
+++ b/protocols/Sametime/proto_sametime/res/DND.ico
diff --git a/protocols/Sametime/proto_sametime/res/Occupied.ico b/protocols/Sametime/proto_sametime/res/Occupied.ico
new file mode 100644
index 0000000000..4a09a93cfb
--- /dev/null
+++ b/protocols/Sametime/proto_sametime/res/Occupied.ico
diff --git a/protocols/Sametime/proto_sametime/res/Offline.ico b/protocols/Sametime/proto_sametime/res/Offline.ico
index 323f880ce5..e2912b633e 100644
--- a/protocols/Sametime/proto_sametime/res/Offline.ico
+++ b/protocols/Sametime/proto_sametime/res/Offline.ico
diff --git a/protocols/Sametime/proto_sametime/res/Online.ico b/protocols/Sametime/proto_sametime/res/Online.ico
index 839e79c9f7..18e6e820c2 100644
--- a/protocols/Sametime/proto_sametime/res/Online.ico
+++ b/protocols/Sametime/proto_sametime/res/Online.ico
diff --git a/protocols/Sametime/proto_sametime/res/Proto_Sametime.rc b/protocols/Sametime/proto_sametime/res/Proto_Sametime.rc
index 2553b55145..f2aa97435a 100644
--- a/protocols/Sametime/proto_sametime/res/Proto_Sametime.rc
+++ b/protocols/Sametime/proto_sametime/res/Proto_Sametime.rc
@@ -13,10 +13,11 @@
 #undef APSTUDIO_READONLY_SYMBOLS

 

 /////////////////////////////////////////////////////////////////////////////

-// Russian (Russia) resources

+// Neutral resources

 

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)

-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)

+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

+#pragma code_page(1252)

 

 #ifdef APSTUDIO_INVOKED

 /////////////////////////////////////////////////////////////////////////////

@@ -51,11 +52,12 @@ END
 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

-IDI_ICON1               ICON                    "Offline.ico"

-IDI_ICON2               ICON                    "Online.ico"

-IDI_ICON3               ICON                    "Away.ico"

-IDI_ICON4               ICON                    "DND.ico"

-#endif    // Russian (Russia) resources

+IDI_ONLINE              ICON                    "Online.ico"

+IDI_AWAY                ICON                    "Away.ico"

+IDI_DND                 ICON                    "DND.ico"

+IDI_OFFLINE             ICON                    "Offline.ico"

+IDI_OCCUPIED            ICON                    "Occupied.ico"

+#endif    // Neutral resources

 /////////////////////////////////////////////////////////////////////////////