Awkward's private repo sync

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

5 files changed, 21 insertions, 19 deletions

diff --git a/plugins/Watrack/docs/sampledll.dpr b/plugins/Watrack/docs/sampledll.dpr
index 908fe60597..d9c6839060 100644
--- a/plugins/Watrack/docs/sampledll.dpr
+++ b/plugins/Watrack/docs/sampledll.dpr
@@ -16,11 +16,8 @@ const
     copyright  :'(c) 2003 J. Random Hacker';

     homepage   :'http://miranda-icq.sourceforge.net/';

     flags      :UNICODE_AWARE;

-    replacesDefaultModule:0;

     uuid:'{00000000-0000-0000-0000-000000000000}'

   );

-var

-  PluginInterfaces:array [0..1] of MUUID;

 

 var

   hook:integer;

@@ -58,7 +55,19 @@ end;
 function GetInfo(var SongInfo:tSongInfo;flags:integer):integer;cdecl;

 begin

   PluginLink^.CallService(MS_WAT_WINAMPINFO,integer(@SongInfo),flags);

-  SongInfo.plyver:=$1234;

+  // static player data

+  if (flags and WAT_OPT_PLAYERDATA)<>0 then

+  begin

+    SongInfo.plyver:=$1234;

+  end

+  // changing during playing data

+  else if (flags and WAT_OPT_CHANGES)<>0 then

+  begin

+  end

+  // track info static data

+  else

+  begin

+  end;

   result:=0;

 end;

 

@@ -98,13 +107,13 @@ begin
   result:=0;

 end;

 

-function MirandaPluginInfo(mirandaVersion:DWORD):PPLUGININFO; cdecl;

+function MirandaPluginInfo(mirandaVersion:dword):PPLUGININFO; cdecl;

 begin

   result:=@PluginInfo;

   PluginInfo.cbSize:=SizeOf(TPLUGININFO);

 end;

 

-function MirandaPluginInfoEx(mirandaVersion:DWORD):PPLUGININFOEX; cdecl;

+function MirandaPluginInfoEx(mirandaVersion:dword):PPLUGININFOEX; cdecl;

 begin

   result:=@PluginInfo;

   PluginInfo.cbSize:=SizeOf(TPLUGININFOEX);

@@ -112,7 +121,7 @@ end;
 

 function Load(link: PPLUGINLINK): int; cdecl;

 begin

-  PLUGINLINK := Pointer(link);

+  PLUGINLINK := pointer(link);

   InitMMI;

   Result:=0;

   hook:=HookEvent(ME_SYSTEM_MODULESLOADED,@OnModuleLoaded);

@@ -123,17 +132,9 @@ begin
   Result:=0;

 end;

 

-function MirandaPluginInterfaces:PMUUID; cdecl;

-begin

-  PluginInterfaces[0]:=PluginInfo.uuid;

-  PluginInterfaces[1]:=MIID_LAST;

-  result:=@PluginInterfaces;

-end;

-

 exports

   Load, Unload,

-  MirandaPluginInfo

-  ,MirandaPluginInterfaces,MirandaPluginInfoEx;

+  MirandaPluginInfoEx;

 

 begin

 end.

diff --git a/plugins/Watrack/myshows/i_myshows_api.inc b/plugins/Watrack/myshows/i_myshows_api.inc
index 5290620b1c..6341793016 100644
--- a/plugins/Watrack/myshows/i_myshows_api.inc
+++ b/plugins/Watrack/myshows/i_myshows_api.inc
@@ -208,7 +208,7 @@ begin
       end;

 }        

       //!! add option to show it??

-      if ServiceExists(MS_POPUP_SHOWMESSAGE)<>0 then

+      if ServiceExists(MS_POPUP_SHOWMESSAGEW)<>0 then

       begin

         json_free(shId);

         json_free(epId);

diff --git a/plugins/Watrack/proto/proto.pas b/plugins/Watrack/proto/proto.pas
index ec7c9bc84e..60ea40031c 100644
--- a/plugins/Watrack/proto/proto.pas
+++ b/plugins/Watrack/proto/proto.pas
@@ -7,7 +7,7 @@ implementation
 

 uses

   windows,messages,commctrl,

-  common,m_api,mirutils,dbsettings,wrapper,

+  common,m_api,mirutils,mircontacts,dbsettings,wrapper,

   global,wat_api;

 

 {$include i_proto_rc.inc}

diff --git a/plugins/Watrack/status/status.pas b/plugins/Watrack/status/status.pas
index 6348ecbb72..7eef03bb14 100644
--- a/plugins/Watrack/status/status.pas
+++ b/plugins/Watrack/status/status.pas
@@ -7,7 +7,7 @@ implementation
 

 uses

   windows,messages,commctrl,

-  common,m_api,mirutils,protocols,dbsettings,wrapper,

+  common,m_api,mirutils,mircontacts,protocols,dbsettings,wrapper,

   global,wat_api,hlpdlg,CBEx,myRTF,Tmpl;

 

 const

diff --git a/plugins/Watrack/watrack.dpr b/plugins/Watrack/watrack.dpr
index 64128af477..7bd1de326b 100644
--- a/plugins/Watrack/watrack.dpr
+++ b/plugins/Watrack/watrack.dpr
@@ -549,6 +549,7 @@ begin
   dbetd.textService:=nil;

   dbetd.iconService:=nil;

   p:='WATrack_Info';

+  dbetd.eventIcon  :=CallService(MS_SKIN2_GETICON,0,tlparam(p)); //!! from popups

 

   for i:=0 to HIGH(cdbetd) do

   begin