diff options
| -rw-r--r-- | Protocols/IAX/Docs/iax_changelog.txt | 4 | ||||
| -rw-r--r-- | Protocols/IAX/Docs/iax_version.txt | 2 | ||||
| -rw-r--r-- | Protocols/IAX/IAXProto.cpp | 22 | ||||
| -rw-r--r-- | Protocols/IAX/IAXProto.h | 2 | ||||
| -rw-r--r-- | Protocols/IAX/build/rakefile | 2 | ||||
| -rw-r--r-- | Protocols/IAX/iax.cpp | 2 | ||||
| -rw-r--r-- | Protocols/IAX/iax.dsp | 4 | ||||
| -rw-r--r-- | Protocols/IAX/res/Logo.ico | bin | 0 -> 2038 bytes | |||
| -rw-r--r-- | Protocols/IAX/resource.h | 3 | ||||
| -rw-r--r-- | Protocols/IAX/resource.rc | 9 |
10 files changed, 46 insertions, 4 deletions
diff --git a/Protocols/IAX/Docs/iax_changelog.txt b/Protocols/IAX/Docs/iax_changelog.txt index 338da46..9cae522 100644 --- a/Protocols/IAX/Docs/iax_changelog.txt +++ b/Protocols/IAX/Docs/iax_changelog.txt @@ -2,6 +2,10 @@ IAX protocol Changelog:
+. 0.1.2.0
+ * Fix for wrong voiceservice version
+ + Added protocol icon (thanks Angeli-Ka)
+
. 0.1.1.0
* Small fixes
* Compatibility with new voice service
diff --git a/Protocols/IAX/Docs/iax_version.txt b/Protocols/IAX/Docs/iax_version.txt index 1d74099..037b044 100644 --- a/Protocols/IAX/Docs/iax_version.txt +++ b/Protocols/IAX/Docs/iax_version.txt @@ -1 +1 @@ -IAX protocol 0.1.1.0
\ No newline at end of file +IAX protocol 0.1.2.0
\ No newline at end of file diff --git a/Protocols/IAX/IAXProto.cpp b/Protocols/IAX/IAXProto.cpp index b1f81de..e1d77bc 100644 --- a/Protocols/IAX/IAXProto.cpp +++ b/Protocols/IAX/IAXProto.cpp @@ -90,6 +90,14 @@ IAXProto::IAXProto(const char *aProtoName, const TCHAR *aUserName) hCallStateEvent = CreateProtoEvent(PE_VOICE_CALL_STATE);
+ char icon[512];
+ mir_snprintf(icon, MAX_REGS(icon), "%s_main", m_szModuleName);
+
+ TCHAR section[100];
+ mir_sntprintf(section, MAX_REGS(section), _T("%s/%s"), LPGENT("Protocols"), m_tszUserName);
+
+ IcoLib_Register(icon, section, LPGENT("Protocol icon"), IDI_PROTO);
+
HookProtoEvent(ME_OPT_INITIALISE, &IAXProto::OnOptionsInit);
}
@@ -137,6 +145,20 @@ DWORD_PTR __cdecl IAXProto::GetCaps( int type, HANDLE hContact ) }
+HICON __cdecl IAXProto::GetIcon(int iconIndex)
+{
+ if (LOWORD(iconIndex) == PLI_PROTOCOL)
+ {
+ char icon[512];
+ mir_snprintf(icon, MAX_REGS(icon), "%s_main", m_szModuleName);
+
+ return IcoLib_LoadIcon(icon, TRUE);
+ }
+
+ return NULL;
+}
+
+
INT_PTR __cdecl IAXProto::SetStatus( int iNewStatus )
{
if (m_iStatus == iNewStatus)
diff --git a/Protocols/IAX/IAXProto.h b/Protocols/IAX/IAXProto.h index 584342b..7eaf36b 100644 --- a/Protocols/IAX/IAXProto.h +++ b/Protocols/IAX/IAXProto.h @@ -73,7 +73,7 @@ public: virtual DWORD_PTR __cdecl GetCaps( int type, HANDLE hContact = NULL );
- virtual HICON __cdecl GetIcon( int iconIndex ) { return 0; }
+ virtual HICON __cdecl GetIcon( int iconIndex );
virtual int __cdecl GetInfo( HANDLE hContact, int infoType ) { return 1; }
virtual HANDLE __cdecl SearchBasic( const char* id ) { return 0; }
diff --git a/Protocols/IAX/build/rakefile b/Protocols/IAX/build/rakefile index 6fa6b8d..b84fb6b 100644 --- a/Protocols/IAX/build/rakefile +++ b/Protocols/IAX/build/rakefile @@ -126,6 +126,7 @@ ZIP_FOLDERS=['zip_ansi', 'zip_unicode'] ZIPS=[ "#{PROJECT}", "#{PROJECT}W" ]
VOICE_SERVICE=[ "../../../bin/Release/Plugins/voiceservice.dll", "../../../bin/Release/Plugins/voiceserviceW.dll" ]
+HISTORY_EVENTS=[ "../../../bin/Release/Plugins/aa_historyevents.dll", "../../../bin/Release Unicode/Plugins/aa_historyeventsW.dll" ]
(0..1).each do |i|
type = TYPES[i]
@@ -159,6 +160,7 @@ VOICE_SERVICE=[ "../../../bin/Release/Plugins/voiceservice.dll", "../../../bin/R makedirs target_dir
cp DLL[i], target_dir
cp VOICE_SERVICE[i], target_dir
+ cp HISTORY_EVENTS[i], target_dir
rm zip, :force => true
chdir(ZIP_FOLDERS[i]) do
diff --git a/Protocols/IAX/iax.cpp b/Protocols/IAX/iax.cpp index 7c5ceb4..c35fa14 100644 --- a/Protocols/IAX/iax.cpp +++ b/Protocols/IAX/iax.cpp @@ -30,7 +30,7 @@ PLUGININFOEX pluginInfo={ #else
"IAX protocol (Ansi)",
#endif
- PLUGIN_MAKE_VERSION(0,1,1,0),
+ PLUGIN_MAKE_VERSION(0,1,2,0),
"Provides support for Inter-Asterisk eXchange (IAX) protocol",
"Ricardo Pescuma Domenecci",
"pescuma@miranda-im.org",
diff --git a/Protocols/IAX/iax.dsp b/Protocols/IAX/iax.dsp index f257ed9..985722c 100644 --- a/Protocols/IAX/iax.dsp +++ b/Protocols/IAX/iax.dsp @@ -192,6 +192,10 @@ SOURCE=.\resource.h # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# Begin Source File
+SOURCE=.\res\Logo.ico
+# End Source File
+# Begin Source File
+
SOURCE=.\resource.rc
# End Source File
# End Group
diff --git a/Protocols/IAX/res/Logo.ico b/Protocols/IAX/res/Logo.ico Binary files differnew file mode 100644 index 0000000..fa5168a --- /dev/null +++ b/Protocols/IAX/res/Logo.ico diff --git a/Protocols/IAX/resource.h b/Protocols/IAX/resource.h index 4d26f4c..20143d6 100644 --- a/Protocols/IAX/resource.h +++ b/Protocols/IAX/resource.h @@ -5,6 +5,7 @@ #define IDD_OPTIONS 119
#define IDD_OPTIONS_OLD 120
#define IDD_EMOTICON_SELECTION 126
+#define IDI_PROTO 128
#define IDD_ACCMGRUI 227
#define IDC_USERNAME 1000
#define IDC_PASSWORD 1001
@@ -32,7 +33,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NO_MFC 1
#define _APS_3D_CONTROLS 1
-#define _APS_NEXT_RESOURCE_VALUE 128
+#define _APS_NEXT_RESOURCE_VALUE 129
#define _APS_NEXT_COMMAND_VALUE 40005
#define _APS_NEXT_CONTROL_VALUE 1087
#define _APS_NEXT_SYMED_VALUE 101
diff --git a/Protocols/IAX/resource.rc b/Protocols/IAX/resource.rc index 9cc6426..e1e30f2 100644 --- a/Protocols/IAX/resource.rc +++ b/Protocols/IAX/resource.rc @@ -85,6 +85,15 @@ BEGIN END
#endif // APSTUDIO_INVOKED
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_PROTO ICON DISCARDABLE "res\\Logo.ico"
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
|